Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

fix import settings not working

This commit is contained in:
Christian Schabesberger 2019-08-04 17:27:56 +02:00
parent c8f475bba1
commit fabb07bb28
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/schabi/newpipe/database/Migrations.java
View File

@ -3,15 +3,24 @@ package org.schabi.newpipe.database;
import android.arch.persistence.db.SupportSQLiteDatabase; import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.migration.Migration; import android.arch.persistence.room.migration.Migration;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log;
import org.schabi.newpipe.BuildConfig;
public class Migrations { public class Migrations {
public static final int DB_VER_11_0 = 1; public static final int DB_VER_11_0 = 1;
public static final int DB_VER_12_0 = 2; public static final int DB_VER_12_0 = 2;
public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
private static final String TAG = Migrations.class.getName();
public static final Migration MIGRATION_11_12 = new Migration(DB_VER_11_0, DB_VER_12_0) { public static final Migration MIGRATION_11_12 = new Migration(DB_VER_11_0, DB_VER_12_0) {
@Override @Override
public void migrate(@NonNull SupportSQLiteDatabase database) { public void migrate(@NonNull SupportSQLiteDatabase database) {
if(DEBUG) {
Log.d(TAG, "Start migrating database");
}
/* /*
* Unfortunately these queries must be hardcoded due to the possibility of * Unfortunately these queries must be hardcoded due to the possibility of
* schema and names changing at a later date, thus invalidating the older migration * schema and names changing at a later date, thus invalidating the older migration
@ -56,6 +65,10 @@ public class Migrations {
"ORDER BY creation_date DESC"); "ORDER BY creation_date DESC");
database.execSQL("DROP TABLE IF EXISTS watch_history"); database.execSQL("DROP TABLE IF EXISTS watch_history");
if(DEBUG) {
Log.d(TAG, "Stop migrating database");
}
} }
}; };
} }

2
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
View File

@ -274,7 +274,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
else if (v instanceof String) else if (v instanceof String)
prefEdit.putString(key, ((String) v)); prefEdit.putString(key, ((String) v));
} }
prefEdit.apply(); prefEdit.commit();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {