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

Smarter on-upgrade logic and UI feedback.

Browse source
This commit is contained in:
dosiecki 2015-01-06 00:09:53 -08:00
parent 189f7aa992
commit 5e5b67ea1b
2 changed files with 52 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import com.newsblur.network.domain.StoriesResponse;
import com.newsblur.network.domain.UnreadStoryHashesResponse;
import com.newsblur.util.AppConstants;
import com.newsblur.util.FeedSet;
import com.newsblur.util.FileCache;
import com.newsblur.util.NetworkUtils;
import com.newsblur.util.PrefsUtils;
import com.newsblur.util.ReadingAction;
@ -73,7 +74,7 @@ public class NBSyncService extends Service {
private volatile static boolean CleanupRunning = false;
private volatile static boolean FFSyncRunning = false;
private volatile static boolean StorySyncRunning = false;
private volatile static boolean VacuumRunning = false;
private volatile static boolean HousekeepingRunning = false;
private volatile static boolean DoFeedsFolders = false;
private volatile static boolean DoUnreads = false;
@ -180,10 +181,9 @@ public class NBSyncService extends Service {
Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT + Process.THREAD_PRIORITY_LESS_FAVORABLE);
}
// do these even if background syncs aren't enabled, because it absolutely must happen
// in the background on all devices
boolean upgraded = PrefsUtils.checkForUpgrade(this);
doVacuum(upgraded);
// do this even if background syncs aren't enabled, because it absolutely must happen
// on all devices
housekeeping();
// check to see if we are on an allowable network only after ensuring we have CPU
if (!(PrefsUtils.isBackgroundNetworkAllowed(this) || (NbActivity.getActiveActivityCount() > 0))) {
@ -216,20 +216,41 @@ public class NBSyncService extends Service {
}
}
private void doVacuum(boolean upgraded) {
boolean autoVac = PrefsUtils.isTimeToVacuum(this);
// this will lock up the DB for a few seconds, only do it if the UI is hidden
if (NbActivity.getActiveActivityCount() > 0) autoVac = false;
if (upgraded || autoVac) {
VacuumRunning = true;
NbActivity.updateAllActivities(false);
PrefsUtils.updateLastVacuumTime(this);
Log.i(this.getClass().getName(), "rebuilding DB . . .");
dbHelper.vacuum();
Log.i(this.getClass().getName(), ". . . . done rebuilding DB");
VacuumRunning = false;
NbActivity.updateAllActivities(false);
/**
* Check for upgrades and wipe the DB if necessary, and do DB maintenance
*/
private void housekeeping() {
try {
boolean upgraded = PrefsUtils.checkForUpgrade(this);
if (upgraded) {
HousekeepingRunning = true;
NbActivity.updateAllActivities(false);
// wipe the local DB
dbHelper.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
FileCache.cleanUpOldCache(this);
PrefsUtils.updateVersion(this);
}
boolean autoVac = PrefsUtils.isTimeToVacuum(this);
// this will lock up the DB for a few seconds, only do it if the UI is hidden
if (NbActivity.getActiveActivityCount() > 0) autoVac = false;
if (upgraded || autoVac) {
HousekeepingRunning = true;
NbActivity.updateAllActivities(false);
PrefsUtils.updateLastVacuumTime(this);
Log.i(this.getClass().getName(), "rebuilding DB . . .");
dbHelper.vacuum();
Log.i(this.getClass().getName(), ". . . . done rebuilding DB");
}
} finally {
if (HousekeepingRunning) {
HousekeepingRunning = false;
NbActivity.updateAllActivities(true);
}
}
}
@ -557,7 +578,7 @@ public class NBSyncService extends Service {
* Is the main feed/folder list sync running?
*/
public static boolean isFeedFolderSyncRunning() {
return (VacuumRunning || ActionsRunning || FFSyncRunning || CleanupRunning || UnreadsService.running() || StorySyncRunning || OriginalTextService.running() || ImagePrefetchService.running());
return (HousekeepingRunning || ActionsRunning || FFSyncRunning || CleanupRunning || UnreadsService.running() || StorySyncRunning || OriginalTextService.running() || ImagePrefetchService.running());
}
/**
@ -568,7 +589,7 @@ public class NBSyncService extends Service {
}
public static String getSyncStatusMessage() {
if (VacuumRunning) return "Tidying up . . .";
if (HousekeepingRunning) return "Tidying up . . .";
if (ActionsRunning) return "Catching up reading actions . . .";
if (FFSyncRunning) return "Syncing feeds . . .";
if (CleanupRunning) return "Cleaning up storage . . .";

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

@ -40,41 +40,32 @@ public class PrefsUtils {
edit.commit();
}
/**
* Check to see if this is the first launch of the app after an upgrade, in which case
* we clear the DB to prevent bugs associated with non-forward-compatibility.
* @return true if an upgrade was detected.
*/
public static boolean checkForUpgrade(Context context) {
SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
String version = getVersion(context);
if (version == null) {
Log.w(PrefsUtils.class.getName(), "could not determine app version");
Log.wtf(PrefsUtils.class.getName(), "could not determine app version");
return false;
}
if (AppConstants.VERBOSE_LOG) Log.i(PrefsUtils.class.getName(), "launching version: " + version);
String oldVersion = prefs.getString(AppConstants.LAST_APP_VERSION, null);
if ( (oldVersion == null) || (!oldVersion.equals(version)) ) {
Log.i(PrefsUtils.class.getName(), "detected new version of app, clearing local data");
// wipe the local DB
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
FileCache.cleanUpOldCache(context);
// store the current version
prefs.edit().putString(AppConstants.LAST_APP_VERSION, version).commit();
// also make sure we auto-trigger an update, since all data are now gone
prefs.edit().putLong(AppConstants.LAST_SYNC_TIME, 0L).commit();
Log.i(PrefsUtils.class.getName(), "detected new version of app");
return true;
}
return false;
}
public static void updateVersion(Context context) {
SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
// store the current version
prefs.edit().putString(AppConstants.LAST_APP_VERSION, getVersion(context)).commit();
// also make sure we auto-trigger an update, since all data are now gone
prefs.edit().putLong(AppConstants.LAST_SYNC_TIME, 0L).commit();
}
public static String getVersion(Context context) {
try {
return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;