X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FDomainsDatabaseHelper.java;h=2455fb3295d0b0fdb82529cafbcc3c39640ade6d;hp=1e40f9705244d454e82a8d4145e7788222f5de56;hb=333ec579b52efbfbad89e0150c7c320822ba9ecf;hpb=ffdec8106ad23f62ca529749ade99f51e336ce55 diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java index 1e40f970..2455fb32 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java @@ -1,20 +1,20 @@ /* - * Copyright © 2017-2019 Soren Stoutner . + * Copyright © 2017-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.helpers; @@ -27,16 +27,17 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.preference.PreferenceManager; +import com.stoutner.privacybrowser.R; + public class DomainsDatabaseHelper extends SQLiteOpenHelper { - private static final int SCHEMA_VERSION = 11; + private static final int SCHEMA_VERSION = 13; static final String DOMAINS_DATABASE = "domains.db"; static final String DOMAINS_TABLE = "domains"; public static final String _ID = "_id"; public static final String DOMAIN_NAME = "domainname"; public static final String ENABLE_JAVASCRIPT = "enablejavascript"; - public static final String ENABLE_FIRST_PARTY_COOKIES = "enablefirstpartycookies"; - public static final String ENABLE_THIRD_PARTY_COOKIES = "enablethirdpartycookies"; + public static final String COOKIES = "cookies"; public static final String ENABLE_DOM_STORAGE = "enabledomstorage"; public static final String ENABLE_FORM_DATA = "enableformdata"; // Form data can be removed once the minimum API >= 26. public static final String ENABLE_EASYLIST = "enableeasylist"; @@ -49,7 +50,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { public static final String USER_AGENT = "useragent"; public static final String FONT_SIZE = "fontsize"; public static final String SWIPE_TO_REFRESH = "swipetorefresh"; - public static final String NIGHT_MODE = "nightmode"; + public static final String WEBVIEW_THEME = "webview_theme"; public static final String WIDE_VIEWPORT = "wide_viewport"; public static final String DISPLAY_IMAGES = "displayimages"; public static final String PINNED_SSL_CERTIFICATE = "pinnedsslcertificate"; @@ -68,13 +69,14 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { public static final int SYSTEM_DEFAULT = 0; public static final int ENABLED = 1; public static final int DISABLED = 2; + public static final int LIGHT_THEME = 1; + public static final int DARK_THEME = 2; static final String CREATE_DOMAINS_TABLE = "CREATE TABLE " + DOMAINS_TABLE + " (" + _ID + " INTEGER PRIMARY KEY, " + DOMAIN_NAME + " TEXT, " + ENABLE_JAVASCRIPT + " BOOLEAN, " + - ENABLE_FIRST_PARTY_COOKIES + " BOOLEAN, " + - ENABLE_THIRD_PARTY_COOKIES + " BOOLEAN, " + + COOKIES + " BOOLEAN, " + ENABLE_DOM_STORAGE + " BOOLEAN, " + ENABLE_FORM_DATA + " BOOLEAN, " + ENABLE_EASYLIST + " BOOLEAN, " + @@ -87,7 +89,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { USER_AGENT + " TEXT, " + FONT_SIZE + " INTEGER, " + SWIPE_TO_REFRESH + " INTEGER, " + - NIGHT_MODE + " INTEGER, " + + WEBVIEW_THEME + " INTEGER, " + WIDE_VIEWPORT + " INTEGER, " + DISPLAY_IMAGES + " INTEGER, " + PINNED_SSL_CERTIFICATE + " BOOLEAN, " + @@ -142,8 +144,8 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Upgrade from schema version 3. case 3: - // Add the Night Mode column. - domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + NIGHT_MODE + " INTEGER"); + // Add the night mode column. + domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN nightmode INTEGER"); // Upgrade from schema version 4. case 4: @@ -192,12 +194,12 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Upgrade from schema version 5. case 5: - // Add the swipe to refresh column. + // Add the swipe to refresh column. This defaults to `0`, which is `System default`, so a separate step isn't needed to populate the column. domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + SWIPE_TO_REFRESH + " INTEGER"); // Upgrade from schema version 6. case 6: - // Add the block all third-party requests column. + // Add the block all third-party requests column. This defaults to `0`, which is off, so a separate step isn't needed to populate the column. domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + BLOCK_ALL_THIRD_PARTY_REQUESTS + " BOOLEAN"); // Upgrade from schema version 7. @@ -210,13 +212,13 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Upgrade from schema version 8. case 8: - // Add the Pinned IP Addresses columns. + // Add the pinned IP addresses columns. These default to `0` and `""`, so a separate step isn't needed to populate the columns. domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + PINNED_IP_ADDRESSES + " BOOLEAN"); domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + IP_ADDRESSES + " TEXT"); // Upgrade from schema version 9. case 9: - // Add the Wide Viewport column. + // Add the wide viewport column. This defaults to `0`, which is `System default`, so a separate step isn't needed to populate the column. domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + WIDE_VIEWPORT + " INTEGER"); // Upgrade from schema version 10. @@ -226,6 +228,22 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Enable it for all existing rows. domainsDatabase.execSQL("UPDATE " + DOMAINS_TABLE + " SET " + ULTRALIST + " = " + 1); + + // Upgrade from schema version 11. + case 11: + // Add the WebView theme column. This defaults to `0`, which is `System default`, so a separate step isn't needed to populate the column. + domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + WEBVIEW_THEME + " INTEGER"); + + // SQLite amazingly doesn't include an easy command to delete a column. + // Although a new table could be created and all the data copied to it, I think I will just leave the old night mode column. It will be wiped out the next time an import is run. + + // Upgrade from schema version 12. + case 12: + // Add the cookies column. + domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + COOKIES + " BOOLEAN"); + + // Copy the data from the old column to the new one. + domainsDatabase.execSQL("UPDATE " + DOMAINS_TABLE + " SET " + COOKIES + " = enablefirstpartycookies"); } } @@ -294,8 +312,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Get the default settings. boolean javaScript = sharedPreferences.getBoolean("javascript", false); - boolean firstPartyCookies = sharedPreferences.getBoolean("first_party_cookies", false); - boolean thirdPartyCookies = sharedPreferences.getBoolean("third_party_cookies", false); + boolean cookies = sharedPreferences.getBoolean(appContext.getString(R.string.cookies_key), false); boolean domStorage = sharedPreferences.getBoolean("dom_storage", false); boolean saveFormData = sharedPreferences.getBoolean("save_form_data", false); // Form data can be removed once the minimum API >= 26. boolean easyList = sharedPreferences.getBoolean("easylist", true); @@ -309,8 +326,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Create entries for the database fields. The ID is created automatically. The pinned SSL certificate information is not created unless added by the user. domainContentValues.put(DOMAIN_NAME, domainName); domainContentValues.put(ENABLE_JAVASCRIPT, javaScript); - domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookies); - domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookies); + domainContentValues.put(COOKIES, cookies); domainContentValues.put(ENABLE_DOM_STORAGE, domStorage); domainContentValues.put(ENABLE_FORM_DATA, saveFormData); // Form data can be removed once the minimum API >= 26. domainContentValues.put(ENABLE_EASYLIST, easyList); @@ -323,7 +339,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { domainContentValues.put(USER_AGENT, "System default user agent"); domainContentValues.put(FONT_SIZE, 0); domainContentValues.put(SWIPE_TO_REFRESH, 0); - domainContentValues.put(NIGHT_MODE, 0); + domainContentValues.put(WEBVIEW_THEME, 0); domainContentValues.put(WIDE_VIEWPORT, 0); domainContentValues.put(DISPLAY_IMAGES, 0); @@ -351,18 +367,17 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { domainsDatabase.close(); } - public void updateDomain(int databaseId, String domainName, boolean javaScript, boolean firstPartyCookies, boolean thirdPartyCookies, boolean domStorage, boolean formData, boolean easyList, - boolean easyPrivacy, boolean fanboysAnnoyance, boolean fanboysSocialBlocking, boolean ultraList, boolean ultraPrivacy, boolean blockAllThirdPartyRequests, String userAgent, - int fontSize, int swipeToRefresh, int nightMode, int wideViewport, int displayImages, boolean pinnedSslCertificate, boolean pinnedIpAddresses) { + public void updateDomain(int databaseId, String domainName, boolean javaScript, boolean cookies, boolean domStorage, boolean formData, boolean easyList, boolean easyPrivacy, boolean fanboysAnnoyance, + boolean fanboysSocialBlocking, boolean ultraList, boolean ultraPrivacy, boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int webViewTheme, + int wideViewport, int displayImages, boolean pinnedSslCertificate, boolean pinnedIpAddresses) { - // Store the domain data in a `ContentValues`. + // Store the domain data in a content values. ContentValues domainContentValues = new ContentValues(); // Add entries for each field in the database. domainContentValues.put(DOMAIN_NAME, domainName); domainContentValues.put(ENABLE_JAVASCRIPT, javaScript); - domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookies); - domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookies); + domainContentValues.put(COOKIES, cookies); domainContentValues.put(ENABLE_DOM_STORAGE, domStorage); domainContentValues.put(ENABLE_FORM_DATA, formData); // Form data can be removed once the minimum API >= 26. domainContentValues.put(ENABLE_EASYLIST, easyList); @@ -375,7 +390,7 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { domainContentValues.put(USER_AGENT, userAgent); domainContentValues.put(FONT_SIZE, fontSize); domainContentValues.put(SWIPE_TO_REFRESH, swipeToRefresh); - domainContentValues.put(NIGHT_MODE, nightMode); + domainContentValues.put(WEBVIEW_THEME, webViewTheme); domainContentValues.put(WIDE_VIEWPORT, wideViewport); domainContentValues.put(DISPLAY_IMAGES, displayImages); domainContentValues.put(PINNED_SSL_CERTIFICATE, pinnedSslCertificate);