public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #593 from dosiecki/master

Browse source 
Android: Bugfixes
This commit is contained in:
Samuel Clay 2014-10-03 16:00:11 -07:00
commit 5023a7fafe
7 changed files with 61 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabase.java
View file

@ -30,7 +30,7 @@ public class BlurDatabase extends SQLiteOpenHelper {
db.execSQL(DatabaseConstants.ACTION_SQL);
}
public void dropAndRecreateTables() {
void dropAndRecreateTables() {
SQLiteDatabase db = getWritableDatabase();
String drop = "DROP TABLE IF EXISTS ";
db.execSQL(drop + DatabaseConstants.FEED_TABLE);
@ -48,8 +48,6 @@ public class BlurDatabase extends SQLiteOpenHelper {
db.execSQL(drop + DatabaseConstants.ACTION_TABLE);
onCreate(db);
db.close();
}
@Override

59
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
View file

@ -41,6 +41,9 @@ import java.util.Set;
*/
public class BlurDatabaseHelper {
// manual synchro isn't needed if you only use one DBHelper, but at present the app uses several
private final static Object RW_MUTEX = new Object();
private Context context;
private final BlurDatabase dbWrapper;
private SQLiteDatabase dbRO;
@ -69,6 +72,10 @@ public class BlurDatabaseHelper {
return dbRW.isOpen();
}
public void dropAndRecreateTables() {
synchronized (RW_MUTEX) {dbWrapper.dropAndRecreateTables();}
}
private List<String> getAllFeeds() {
String q1 = "SELECT " + DatabaseConstants.FEED_ID +
" FROM " + DatabaseConstants.FEED_TABLE;
@ -103,7 +110,7 @@ public class BlurDatabaseHelper {
" ORDER BY " + DatabaseConstants.STORY_TIMESTAMP + " DESC" +
" LIMIT -1 OFFSET " + (keepOldStories ? AppConstants.MAX_READ_STORIES_STORED : 0) +
")";
dbRW.execSQL(q);
synchronized (RW_MUTEX) {dbRW.execSQL(q);}
}
}
@ -112,25 +119,27 @@ public class BlurDatabaseHelper {
" WHERE " + DatabaseConstants.STORY_TEXT_STORY_HASH + " NOT IN " +
"( SELECT " + DatabaseConstants.STORY_HASH + " FROM " + DatabaseConstants.STORY_TABLE +
")";
dbRW.execSQL(q);
synchronized (RW_MUTEX) {dbRW.execSQL(q);}
}
public void cleanupFeedsFolders() {
dbRW.delete(DatabaseConstants.FEED_TABLE, null, null);
dbRW.delete(DatabaseConstants.FOLDER_TABLE, null, null);
dbRW.delete(DatabaseConstants.FEED_FOLDER_MAP_TABLE, null, null);
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.FEED_TABLE, null, null);}
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.FOLDER_TABLE, null, null);}
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.FEED_FOLDER_MAP_TABLE, null, null);}
}
private void bulkInsertValues(String table, List<ContentValues> valuesList) {
if (valuesList.size() < 1) return;
dbRW.beginTransaction();
try {
for(ContentValues values: valuesList) {
dbRW.insertWithOnConflict(table, null, values, SQLiteDatabase.CONFLICT_REPLACE);
synchronized (RW_MUTEX) {
dbRW.beginTransaction();
try {
for(ContentValues values: valuesList) {
dbRW.insertWithOnConflict(table, null, values, SQLiteDatabase.CONFLICT_REPLACE);
}
dbRW.setTransactionSuccessful();
} finally {
dbRW.endTransaction();
}
dbRW.setTransactionSuccessful();
} finally {
dbRW.endTransaction();
}
}
@ -148,8 +157,8 @@ public class BlurDatabaseHelper {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STARRED_STORY_COUNT_COUNT, count);
// this DB just has one row and one column. blow it away and replace it.
dbRW.delete(DatabaseConstants.STARRED_STORY_COUNT_TABLE, null, null);
dbRW.insert(DatabaseConstants.STARRED_STORY_COUNT_TABLE, null, values);
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.STARRED_STORY_COUNT_TABLE, null, null);}
synchronized (RW_MUTEX) {dbRW.insert(DatabaseConstants.STARRED_STORY_COUNT_TABLE, null, values);}
}
public List<String> getStoryHashesForFeed(String feedId) {
@ -232,7 +241,7 @@ public class BlurDatabaseHelper {
for (ContentValues values : classifierValues) {
values.put(DatabaseConstants.CLASSIFIER_ID, classifierFeedId);
}
dbRW.delete(DatabaseConstants.CLASSIFIER_TABLE, DatabaseConstants.CLASSIFIER_ID + " = ?", new String[] { classifierFeedId });
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.CLASSIFIER_TABLE, DatabaseConstants.CLASSIFIER_ID + " = ?", new String[] { classifierFeedId });}
bulkInsertValues(DatabaseConstants.CLASSIFIER_TABLE, classifierValues);
}
}
@ -288,7 +297,7 @@ public class BlurDatabaseHelper {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STORY_READ, read);
values.put(DatabaseConstants.STORY_READ_THIS_SESSION, read);
dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_HASH + " = ?", new String[]{hash});
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_HASH + " = ?", new String[]{hash});}
}
/**
@ -335,7 +344,7 @@ public class BlurDatabaseHelper {
} else {
throw new IllegalStateException("Asked to mark stories for FeedSet of unknown type.");
}
dbRW.update(DatabaseConstants.STORY_TABLE, values, conjoinSelections(feedSelection, rangeSelection), null);
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.STORY_TABLE, values, conjoinSelections(feedSelection, rangeSelection), null);}
refreshFeedCounts(fs);
}
@ -370,7 +379,7 @@ public class BlurDatabaseHelper {
values.put(DatabaseConstants.FEED_NEGATIVE_COUNT, getUnreadCount(singleFs, StateFilter.NEG));
values.put(DatabaseConstants.FEED_NEUTRAL_COUNT, getUnreadCount(singleFs, StateFilter.NEUT));
values.put(DatabaseConstants.FEED_POSITIVE_COUNT, getUnreadCount(singleFs, StateFilter.BEST));
dbRW.update(DatabaseConstants.FEED_TABLE, values, DatabaseConstants.FEED_ID + " = ?", new String[]{feedId});
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.FEED_TABLE, values, DatabaseConstants.FEED_ID + " = ?", new String[]{feedId});}
}
for (String socialId : socialFeedIds) {
@ -379,7 +388,7 @@ public class BlurDatabaseHelper {
values.put(DatabaseConstants.SOCIAL_FEED_NEGATIVE_COUNT, getUnreadCount(singleFs, StateFilter.NEG));
values.put(DatabaseConstants.SOCIAL_FEED_NEUTRAL_COUNT, getUnreadCount(singleFs, StateFilter.NEUT));
values.put(DatabaseConstants.SOCIAL_FEED_POSITIVE_COUNT, getUnreadCount(singleFs, StateFilter.BEST));
dbRW.update(DatabaseConstants.SOCIALFEED_TABLE, values, DatabaseConstants.SOCIAL_FEED_ID + " = ?", new String[]{socialId});
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.SOCIALFEED_TABLE, values, DatabaseConstants.SOCIAL_FEED_ID + " = ?", new String[]{socialId});}
}
}
@ -391,7 +400,7 @@ public class BlurDatabaseHelper {
}
public void enqueueAction(ReadingAction ra) {
dbRW.insertOrThrow(DatabaseConstants.ACTION_TABLE, null, ra.toContentValues());
synchronized (RW_MUTEX) {dbRW.insertOrThrow(DatabaseConstants.ACTION_TABLE, null, ra.toContentValues());}
}
public Cursor getActions(boolean includeDone) {
@ -400,7 +409,7 @@ public class BlurDatabaseHelper {
}
public void clearAction(String actionId) {
dbRW.delete(DatabaseConstants.ACTION_TABLE, DatabaseConstants.ACTION_ID + " = ?", new String[]{actionId});
synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.ACTION_TABLE, DatabaseConstants.ACTION_ID + " = ?", new String[]{actionId});}
}
public Cursor getStory(String hash) {
@ -412,7 +421,7 @@ public class BlurDatabaseHelper {
public void setStoryStarred(String hash, boolean starred) {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STORY_STARRED, starred);
dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_HASH + " = ?", new String[]{hash});
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_HASH + " = ?", new String[]{hash});}
}
public String getStoryText(String hash) {
@ -435,7 +444,7 @@ public class BlurDatabaseHelper {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STORY_TEXT_STORY_HASH, hash);
values.put(DatabaseConstants.STORY_TEXT_STORY_TEXT, text);
dbRW.insertOrThrow(DatabaseConstants.STORY_TEXT_TABLE, null, values);
synchronized (RW_MUTEX) {dbRW.insertOrThrow(DatabaseConstants.STORY_TEXT_TABLE, null, values);}
}
/**
@ -444,7 +453,7 @@ public class BlurDatabaseHelper {
public void markSavedReadingSession() {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STORY_READ_THIS_SESSION, true);
dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_STARRED + " = 1", null);
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.STORY_TABLE, values, DatabaseConstants.STORY_STARRED + " = 1", null);}
}
/**
@ -453,7 +462,7 @@ public class BlurDatabaseHelper {
public void clearReadingSession() {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.STORY_READ_THIS_SESSION, false);
dbRW.update(DatabaseConstants.STORY_TABLE, values, null, null);
synchronized (RW_MUTEX) {dbRW.update(DatabaseConstants.STORY_TABLE, values, null, null);}
}
public Loader<Cursor> getStoriesLoader(final FeedSet fs, final StateFilter stateFilter) {

5
clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
View file

@ -46,6 +46,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
protected DefaultFeedView defaultFeedView;
protected StateFilter currentState;
private boolean isLoading = true;
private boolean cursorSeenYet = false;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -58,6 +59,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
* Indicate that the DB was cleared.
*/
public void resetEmptyState() {
cursorSeenYet = false;
setLoading(true);
}
@ -76,7 +78,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
}
TextView emptyView = (TextView) itemList.getEmptyView();
if (isLoading) {
if (isLoading || (!cursorSeenYet)) {
emptyView.setText(R.string.empty_list_view_loading);
} else {
emptyView.setText(R.string.empty_list_view_no_stories);
@ -130,6 +132,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
if (cursor != null) {
cursorSeenYet = true;
if (cursor.getCount() == 0) {
((ItemsList) getActivity()).triggerRefresh(1);
}

17
clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
View file

@ -44,6 +44,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
/**
* A background service to handle synchronisation with the NB servers.
@ -653,7 +654,7 @@ public class NBSyncService extends Service {
* Is there a sync for a given FeedSet running?
*/
public static boolean isFeedSetSyncing(FeedSet fs) {
return (PendingFeeds.containsKey(fs));
return (PendingFeeds.containsKey(fs) && StorySyncRunning);
}
public static String getSyncStatusMessage() {
@ -752,9 +753,21 @@ public class NBSyncService extends Service {
@Override
public void onDestroy() {
Log.d(this.getClass().getName(), "onDestroy");
if (AppConstants.VERBOSE_LOG) Log.d(this.getClass().getName(), "onDestroy - stopping execution");
HaltNow = true;
executor.shutdown();
boolean cleanShutdown = false;
try {
cleanShutdown = executor.awaitTermination(60, TimeUnit.SECONDS);
} catch (InterruptedException e) {
// this value is somewhat arbitrary. ideally we would wait the max network timeout, but
// the system like to force-kill terminating services that take too long, so it is often
// moot to tune.
executor.shutdownNow();
Thread.currentThread().interrupt();
}
if (AppConstants.VERBOSE_LOG) Log.d(this.getClass().getName(), "onDestroy - execution halted");
super.onDestroy();
dbHelper.close();
}

4
clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
View file

@ -50,6 +50,10 @@ public class FeedUtils {
c.startService(i);
}
public static void dropAndRecreateTables() {
dbHelper.dropAndRecreateTables();
}
public static void setStorySaved(final Story story, final boolean saved, final Context context) {
new AsyncTask<Void, Void, Void>() {
@Override

1
clients/android/NewsBlur/src/com/newsblur/util/ImageCache.java
View file

@ -48,6 +48,7 @@ public class ImageCache {
}
File f = new File(cacheDir, fileName);
if (f.exists()) return;
URL u = new URL(url);
NetworkUtils.loadURL(u, new FileOutputStream(f));
} catch (IOException e) {

7
clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
View file

@ -24,7 +24,6 @@ import android.util.Log;
import com.newsblur.R;
import com.newsblur.activity.Login;
import com.newsblur.database.BlurDatabase;
import com.newsblur.domain.UserDetails;
import com.newsblur.service.NBSyncService;
@ -58,8 +57,7 @@ public class PrefsUtils {
if ( (oldVersion == null) || (!oldVersion.equals(version)) ) {
Log.i(PrefsUtils.class.getName(), "detected new version of app, clearing local data");
// wipe the local DB
BlurDatabase databaseHelper = new BlurDatabase(context.getApplicationContext());
databaseHelper.dropAndRecreateTables();
FeedUtils.dropAndRecreateTables();
// in case this is the first time we have run since moving the cache to the new location,
// blow away the old version entirely. This line can be removed some time well after
// v61+ is widely deployed
@ -99,8 +97,7 @@ public class PrefsUtils {
context.getSharedPreferences(PrefConstants.PREFERENCES, 0).edit().clear().commit();
// wipe the local DB
BlurDatabase databaseHelper = new BlurDatabase(context.getApplicationContext());
databaseHelper.dropAndRecreateTables();
FeedUtils.dropAndRecreateTables();
// prompt for a new login
Intent i = new Intent(context, Login.class);