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

Synchronise DB upgrades with other DB actions. (#591)

Browse source
This commit is contained in:
dosiecki 2014-10-03 14:39:08 -07:00
parent 32cdc1b512
commit 1462d53cb0
4 changed files with 11 additions and 8 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); db.execSQL(DatabaseConstants.ACTION_SQL);
} }
public void dropAndRecreateTables() { void dropAndRecreateTables() {
SQLiteDatabase db = getWritableDatabase(); SQLiteDatabase db = getWritableDatabase();
String drop = "DROP TABLE IF EXISTS "; String drop = "DROP TABLE IF EXISTS ";
db.execSQL(drop + DatabaseConstants.FEED_TABLE); db.execSQL(drop + DatabaseConstants.FEED_TABLE);
@ -48,8 +48,6 @@ public class BlurDatabase extends SQLiteOpenHelper {
db.execSQL(drop + DatabaseConstants.ACTION_TABLE); db.execSQL(drop + DatabaseConstants.ACTION_TABLE);
onCreate(db); onCreate(db);
db.close();
} }
@Override @Override

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

@ -72,6 +72,10 @@ public class BlurDatabaseHelper {
return dbRW.isOpen(); return dbRW.isOpen();
} }
public void dropAndRecreateTables() {
synchronized (RW_MUTEX) {dbWrapper.dropAndRecreateTables();}
}
private List<String> getAllFeeds() { private List<String> getAllFeeds() {
String q1 = "SELECT " + DatabaseConstants.FEED_ID + String q1 = "SELECT " + DatabaseConstants.FEED_ID +
" FROM " + DatabaseConstants.FEED_TABLE; " FROM " + DatabaseConstants.FEED_TABLE;

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

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

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