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=1e40f9705244d454e82a8d4145e7788222f5de56;hp=b74ca52b6f191fed02186a4b6c9b0ae035e943b9;hb=ffdec8106ad23f62ca529749ade99f51e336ce55;hpb=6b4312dc0c2d6cb059a0fbe6d4e7cd9317db34b6 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 b74ca52b..1e40f970 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java @@ -28,7 +28,7 @@ import android.database.sqlite.SQLiteOpenHelper; import android.preference.PreferenceManager; public class DomainsDatabaseHelper extends SQLiteOpenHelper { - private static final int SCHEMA_VERSION = 9; + private static final int SCHEMA_VERSION = 11; static final String DOMAINS_DATABASE = "domains.db"; static final String DOMAINS_TABLE = "domains"; @@ -43,12 +43,14 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { public static final String ENABLE_EASYPRIVACY = "enableeasyprivacy"; public static final String ENABLE_FANBOYS_ANNOYANCE_LIST = "enablefanboysannoyancelist"; public static final String ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST = "enablefanboyssocialblockinglist"; + public static final String ULTRALIST = "ultralist"; public static final String ENABLE_ULTRAPRIVACY = "enableultraprivacy"; public static final String BLOCK_ALL_THIRD_PARTY_REQUESTS = "blockallthirdpartyrequests"; 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 WIDE_VIEWPORT = "wide_viewport"; public static final String DISPLAY_IMAGES = "displayimages"; public static final String PINNED_SSL_CERTIFICATE = "pinnedsslcertificate"; public static final String SSL_ISSUED_TO_COMMON_NAME = "sslissuedtocommonname"; @@ -62,20 +64,10 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { public static final String PINNED_IP_ADDRESSES = "pinned_ip_addresses"; public static final String IP_ADDRESSES = "ip_addresses"; - // Swipe to refresh constants. - public static final int SWIPE_TO_REFRESH_SYSTEM_DEFAULT = 0; - public static final int SWIPE_TO_REFRESH_ENABLED = 1; - public static final int SWIPE_TO_REFRESH_DISABLED = 2; - - // Night mode constants. - public static final int NIGHT_MODE_SYSTEM_DEFAULT = 0; - public static final int NIGHT_MODE_ENABLED = 1; - public static final int NIGHT_MODE_DISABLED = 2; - - // Display webpage images constants. - public static final int DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT = 0; - public static final int DISPLAY_WEBPAGE_IMAGES_ENABLED = 1; - public static final int DISPLAY_WEBPAGE_IMAGES_DISABLED = 2; + // Spinner constants. + public static final int SYSTEM_DEFAULT = 0; + public static final int ENABLED = 1; + public static final int DISABLED = 2; static final String CREATE_DOMAINS_TABLE = "CREATE TABLE " + DOMAINS_TABLE + " (" + _ID + " INTEGER PRIMARY KEY, " + @@ -89,12 +81,14 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { ENABLE_EASYPRIVACY + " BOOLEAN, " + ENABLE_FANBOYS_ANNOYANCE_LIST + " BOOLEAN, " + ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST + " BOOLEAN, " + + ULTRALIST + " BOOLEAN, " + ENABLE_ULTRAPRIVACY + " BOOLEAN, " + BLOCK_ALL_THIRD_PARTY_REQUESTS + " BOOLEAN, " + USER_AGENT + " TEXT, " + FONT_SIZE + " INTEGER, " + SWIPE_TO_REFRESH + " INTEGER, " + NIGHT_MODE + " INTEGER, " + + WIDE_VIEWPORT + " INTEGER, " + DISPLAY_IMAGES + " INTEGER, " + PINNED_SSL_CERTIFICATE + " BOOLEAN, " + SSL_ISSUED_TO_COMMON_NAME + " TEXT, " + @@ -219,6 +213,19 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { // Add the Pinned IP Addresses 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. + domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + WIDE_VIEWPORT + " INTEGER"); + + // Upgrade from schema version 10. + case 10: + // Add the UltraList column. + domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + ULTRALIST + " BOOLEAN"); + + // Enable it for all existing rows. + domainsDatabase.execSQL("UPDATE " + DOMAINS_TABLE + " SET " + ULTRALIST + " = " + 1); } } @@ -286,35 +293,38 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext); // Get the default settings. - boolean javaScriptEnabled = sharedPreferences.getBoolean("javascript", false); - boolean firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies", false); - boolean thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies", false); - boolean domStorageEnabled = sharedPreferences.getBoolean("dom_storage", false); - boolean saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data", false); // Form data can be removed once the minimum API >= 26. - boolean easyListEnabled = sharedPreferences.getBoolean("easylist", true); - boolean easyPrivacyEnabled = sharedPreferences.getBoolean("easyprivacy", true); - boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboys_annoyance_list", true); - boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboys_social_blocking_list", true); - boolean ultraPrivacyEnabled = sharedPreferences.getBoolean("ultraprivacy", true); + boolean javaScript = sharedPreferences.getBoolean("javascript", false); + boolean firstPartyCookies = sharedPreferences.getBoolean("first_party_cookies", false); + boolean thirdPartyCookies = sharedPreferences.getBoolean("third_party_cookies", 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); + boolean easyPrivacy = sharedPreferences.getBoolean("easyprivacy", true); + boolean fanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true); + boolean fanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true); + boolean ultraList = sharedPreferences.getBoolean("ultralist", true); + boolean ultraPrivacy = sharedPreferences.getBoolean("ultraprivacy", true); boolean blockAllThirdPartyRequests = sharedPreferences.getBoolean("block_all_third_party_requests", false); // 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, javaScriptEnabled); - domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookiesEnabled); - domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookiesEnabled); - domainContentValues.put(ENABLE_DOM_STORAGE, domStorageEnabled); - domainContentValues.put(ENABLE_FORM_DATA, saveFormDataEnabled); // Form data can be removed once the minimum API >= 26. - domainContentValues.put(ENABLE_EASYLIST, easyListEnabled); - domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacyEnabled); - domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, fanboyAnnoyanceListEnabled); - domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, fanboySocialBlockingListEnabled); - domainContentValues.put(ENABLE_ULTRAPRIVACY, ultraPrivacyEnabled); + domainContentValues.put(ENABLE_JAVASCRIPT, javaScript); + domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookies); + domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookies); + 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); + domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacy); + domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, fanboyAnnoyanceList); + domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, fanboySocialBlockingList); + domainContentValues.put(ULTRALIST, ultraList); + domainContentValues.put(ENABLE_ULTRAPRIVACY, ultraPrivacy); domainContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests); 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(WIDE_VIEWPORT, 0); domainContentValues.put(DISPLAY_IMAGES, 0); // Get a writable database handle. @@ -341,30 +351,32 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper { domainsDatabase.close(); } - public void updateDomain(int databaseId, String domainName, boolean javaScriptEnabled, boolean firstPartyCookiesEnabled, boolean thirdPartyCookiesEnabled, boolean domStorageEnabled, boolean formDataEnabled, - boolean easyListEnabled, boolean easyPrivacyEnabled, boolean fanboysAnnoyanceEnabled, boolean fanboysSocialBlockingEnabled, boolean ultraPrivacyEnabled, - boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int nightMode, int displayImages, boolean pinnedSslCertificate, boolean pinnedIpAddresses) { + 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) { // Store the domain data in a `ContentValues`. ContentValues domainContentValues = new ContentValues(); // Add entries for each field in the database. domainContentValues.put(DOMAIN_NAME, domainName); - domainContentValues.put(ENABLE_JAVASCRIPT, javaScriptEnabled); - domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookiesEnabled); - domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookiesEnabled); - domainContentValues.put(ENABLE_DOM_STORAGE, domStorageEnabled); - domainContentValues.put(ENABLE_FORM_DATA, formDataEnabled); // Form data can be removed once the minimum API >= 26. - domainContentValues.put(ENABLE_EASYLIST, easyListEnabled); - domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacyEnabled); - domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, fanboysAnnoyanceEnabled); - domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, fanboysSocialBlockingEnabled); - domainContentValues.put(ENABLE_ULTRAPRIVACY, ultraPrivacyEnabled); + domainContentValues.put(ENABLE_JAVASCRIPT, javaScript); + domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, firstPartyCookies); + domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, thirdPartyCookies); + 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); + domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacy); + domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, fanboysAnnoyance); + domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, fanboysSocialBlocking); + domainContentValues.put(ULTRALIST, ultraList); + domainContentValues.put(ENABLE_ULTRAPRIVACY, ultraPrivacy); domainContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests); domainContentValues.put(USER_AGENT, userAgent); domainContentValues.put(FONT_SIZE, fontSize); domainContentValues.put(SWIPE_TO_REFRESH, swipeToRefresh); domainContentValues.put(NIGHT_MODE, nightMode); + domainContentValues.put(WIDE_VIEWPORT, wideViewport); domainContentValues.put(DISPLAY_IMAGES, displayImages); domainContentValues.put(PINNED_SSL_CERTIFICATE, pinnedSslCertificate); domainContentValues.put(PINNED_IP_ADDRESSES, pinnedIpAddresses);