X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FImportExportDatabaseHelper.java;h=bcec5294af58d34f937c407fab0a833390a245b4;hp=5f8dcee0ba941655bf0a02b42db8af7c62909c13;hb=572449f6c66adfc1a3d88e761cb87581a7961df3;hpb=8cd4c56d559436ee6c5b81df9a411bbf211be7fd diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java index 5f8dcee0..bcec5294 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Soren Stoutner . + * Copyright © 2018-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -158,7 +158,7 @@ public class ImportExportDatabaseHelper { BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(context, null, null, 0); // Get a full bookmarks cursor. - Cursor bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarksCursor(); + Cursor bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarks(); // Move to the first bookmark. bookmarksCursor.moveToFirst(); @@ -369,7 +369,7 @@ public class ImportExportDatabaseHelper { case 2: // Once the SQLite version is >= 3.25.0 `ALTER TABLE RENAME COLUMN` can be used. https://www.sqlite.org/lang_altertable.html https://www.sqlite.org/changes.html // https://developer.android.com/reference/android/database/sqlite/package-summary - // In the meantime, we can create a new column with the new name. There is no need to delete the old column on the temporary import database. + // In the meantime, a new column must be created with the new name. There is no need to delete the old column on the temporary import database. // Get a cursor with the current `default_font_size` value. Cursor importDatabasePreferenceCursor = importDatabase.rawQuery("SELECT default_font_size FROM " + PREFERENCES_TABLE, null);