mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 21:55:10 +00:00
Code Issues Releases Wiki Activity

Add incremental notifications plugin settings database upgrade

Browse Source 
Summary: When upgrading the app to the version with the new privacy options (D17126), the app will crash with some error about missing a table in the Notifications Plugin database. This patch adds the table in onUpgrade in a proper way.

Test Plan:
 - Build current app from master
 - Disable some apps in the Notifications plugin
 - Apply this patch (as well as its dependency, D17126)
 - The app should work, with your old settings, and now able to toggle privacy options!

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Differential Revision: https://phabricator.kde.org/D17521
This commit is contained in:
Simon Redman
2018-12-12 19:02:28 -07:00
parent 6ba6842fc7
commit 5eb368c630
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/kde/kdeconnect/Plugins/NotificationsPlugin/AppDatabase.java
View File

@@ -40,7 +40,7 @@ class AppDatabase {
private static final String SETTINGS_NAME = "app_database"; private static final String SETTINGS_NAME = "app_database";
private static final String SETTINGS_KEY_ALL_ENABLED = "all_enabled"; private static final String SETTINGS_KEY_ALL_ENABLED = "all_enabled";
private static final int DATABASE_VERSION = 4; private static final int DATABASE_VERSION = 5;
private static final String DATABASE_NAME = "Applications"; private static final String DATABASE_NAME = "Applications";
private static final String TABLE_ENABLED = "Applications"; private static final String TABLE_ENABLED = "Applications";
private static final String TABLE_PRIVACY = "PrivacyOpts"; private static final String TABLE_PRIVACY = "PrivacyOpts";
@@ -49,6 +49,14 @@ class AppDatabase {
private static final String KEY_PRIVACY_OPTIONS = "privacyOptions"; private static final String KEY_PRIVACY_OPTIONS = "privacyOptions";
private static final String DATABASE_CREATE_ENABLED = "CREATE TABLE "
+ TABLE_ENABLED + "(" + KEY_PACKAGE_NAME + " TEXT PRIMARY KEY NOT NULL, "
+ KEY_IS_ENABLED + " INTEGER NOT NULL ); ";
private static final String DATABASE_CREATE_PRIVACY_OPTS = "CREATE TABLE "
+ TABLE_PRIVACY + "(" + KEY_PACKAGE_NAME + " TEXT PRIMARY KEY NOT NULL, "
+ KEY_PRIVACY_OPTIONS + " INTEGER NOT NULL); ";
private SQLiteDatabase ourDatabase; private SQLiteDatabase ourDatabase;
private DbHelper ourHelper; private DbHelper ourHelper;
private SharedPreferences prefs; private SharedPreferences prefs;
@@ -77,18 +85,15 @@ class AppDatabase {
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL("CREATE TABLE " + TABLE_ENABLED + db.execSQL(DATABASE_CREATE_ENABLED);
"(" + KEY_PACKAGE_NAME + " TEXT PRIMARY KEY NOT NULL, " + db.execSQL(DATABASE_CREATE_PRIVACY_OPTS);
KEY_IS_ENABLED + " INTEGER NOT NULL ); ");
db.execSQL("CREATE TABLE " + TABLE_PRIVACY +
"(" + KEY_PACKAGE_NAME + " TEXT PRIMARY KEY NOT NULL, " +
KEY_PRIVACY_OPTIONS + " INTEGER NOT NULL); ");
} }
@Override @Override
public void onUpgrade(SQLiteDatabase db, int i, int i2) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
db.execSQL("DROP TABLE IF EXISTS " + TABLE_ENABLED); if (oldVersion < 5) {
onCreate(db); db.execSQL(DATABASE_CREATE_PRIVACY_OPTS);
}
} }
} }