import android.preference.PreferenceManager;
public class DomainsDatabaseHelper extends SQLiteOpenHelper {
- private static final int SCHEMA_VERSION = 7;
- private static final String DOMAINS_DATABASE = "domains.db";
- private static final String DOMAINS_TABLE = "domains";
+ private static final int SCHEMA_VERSION = 8;
+ 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_EASYLIST = "enableeasylist";
public static final String ENABLE_EASYPRIVACY = "enableeasyprivacy";
public static final String ENABLE_FANBOYS_ANNOYANCE_LIST = "enablefanboysannoyancelist";
- public static final String BLOCK_ALL_THIRD_PARTY_REQUESTS = "blockallthirdpartyrequests";
public static final String ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST = "enablefanboyssocialblockinglist";
+ 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 int DISPLAY_WEBPAGE_IMAGES_ENABLED = 1;
public static final int DISPLAY_WEBPAGE_IMAGES_DISABLED = 2;
- private Context appContext;
+ 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, " +
+ ENABLE_DOM_STORAGE + " BOOLEAN, " +
+ ENABLE_FORM_DATA + " BOOLEAN, " +
+ ENABLE_EASYLIST + " BOOLEAN, " +
+ ENABLE_EASYPRIVACY + " BOOLEAN, " +
+ ENABLE_FANBOYS_ANNOYANCE_LIST + " BOOLEAN, " +
+ ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST + " BOOLEAN, " +
+ ENABLE_ULTRAPRIVACY + " BOOLEAN, " +
+ BLOCK_ALL_THIRD_PARTY_REQUESTS + " BOOLEAN, " +
+ USER_AGENT + " TEXT, " +
+ FONT_SIZE + " INTEGER, " +
+ SWIPE_TO_REFRESH + " INTEGER, " +
+ NIGHT_MODE + " INTEGER, " +
+ DISPLAY_IMAGES + " INTEGER, " +
+ PINNED_SSL_CERTIFICATE + " BOOLEAN, " +
+ SSL_ISSUED_TO_COMMON_NAME + " TEXT, " +
+ SSL_ISSUED_TO_ORGANIZATION + " TEXT, " +
+ SSL_ISSUED_TO_ORGANIZATIONAL_UNIT + " TEXT, " +
+ SSL_ISSUED_BY_COMMON_NAME + " TEXT, " +
+ SSL_ISSUED_BY_ORGANIZATION + " TEXT, " +
+ SSL_ISSUED_BY_ORGANIZATIONAL_UNIT + " TEXT, " +
+ SSL_START_DATE + " INTEGER, " +
+ SSL_END_DATE + " INTEGER)";
+
+ private final Context appContext;
// Initialize the database. The lint warnings for the unused parameters are suppressed.
public DomainsDatabaseHelper(Context context, @SuppressWarnings("UnusedParameters") String name, SQLiteDatabase.CursorFactory cursorFactory, @SuppressWarnings("UnusedParameters") int version) {
@Override
public void onCreate(SQLiteDatabase domainsDatabase) {
- // Setup the SQL string to create the `domains` table.
- 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, " +
- ENABLE_DOM_STORAGE + " BOOLEAN, " +
- ENABLE_FORM_DATA + " BOOLEAN, " +
- ENABLE_EASYLIST + " BOOLEAN, " +
- ENABLE_EASYPRIVACY + " BOOLEAN, " +
- ENABLE_FANBOYS_ANNOYANCE_LIST + " BOOLEAN, " +
- ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST + " BOOLEAN, " +
- BLOCK_ALL_THIRD_PARTY_REQUESTS + " BOOLEAN, " +
- USER_AGENT + " TEXT, " +
- FONT_SIZE + " INTEGER, " +
- SWIPE_TO_REFRESH + " INTEGER, " +
- NIGHT_MODE + " INTEGER, " +
- DISPLAY_IMAGES + " INTEGER, " +
- PINNED_SSL_CERTIFICATE + " BOOLEAN, " +
- SSL_ISSUED_TO_COMMON_NAME + " TEXT, " +
- SSL_ISSUED_TO_ORGANIZATION + " TEXT, " +
- SSL_ISSUED_TO_ORGANIZATIONAL_UNIT + " TEXT, " +
- SSL_ISSUED_BY_COMMON_NAME + " TEXT, " +
- SSL_ISSUED_BY_ORGANIZATION + " TEXT, " +
- SSL_ISSUED_BY_ORGANIZATIONAL_UNIT + " TEXT, " +
- SSL_START_DATE + " INTEGER, " +
- SSL_END_DATE + " INTEGER);";
-
- // Make it so.
+ // Create the domains table.
domainsDatabase.execSQL(CREATE_DOMAINS_TABLE);
}
case 6:
// Add the block all third-party requests column.
domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + BLOCK_ALL_THIRD_PARTY_REQUESTS + " BOOLEAN");
+
+ // Upgrade from schema version 7.
+ case 7:
+ // Add the UltraPrivacy column.
+ domainsDatabase.execSQL("ALTER TABLE " + DOMAINS_TABLE + " ADD COLUMN " + ENABLE_ULTRAPRIVACY + " BOOLEAN");
+
+ // Enable it for all existing rows.
+ domainsDatabase.execSQL("UPDATE " + DOMAINS_TABLE + " SET " + ENABLE_ULTRAPRIVACY + " = " + 1);
}
}
+ Cursor getCompleteCursorOrderedByDomain() {
+ // Get a readable database handle.
+ SQLiteDatabase domainsDatabase = this.getReadableDatabase();
+
+ // Return everything in the domains table ordered by the domain name. The second argument is `null` because there are no `selectionArgs`.
+ return domainsDatabase.rawQuery("SELECT * FROM " + DOMAINS_TABLE + " ORDER BY " + DOMAIN_NAME + " ASC", null);
+ }
+
public Cursor getDomainNameCursorOrderedByDomain() {
// Get a readable database handle.
SQLiteDatabase domainsDatabase = this.getReadableDatabase();
- // Get everything in `DOMAINS_TABLE` ordered by `DOMAIN_NAME`.
+ // Get everything in the domains table ordered by the domain name.
String GET_CURSOR_ORDERED_BY_DOMAIN = "SELECT " + _ID + ", " + DOMAIN_NAME +
" FROM " + DOMAINS_TABLE +
" ORDER BY " + DOMAIN_NAME + " ASC";
boolean easyPrivacyEnabled = sharedPreferences.getBoolean("easyprivacy", true);
boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ boolean ultraPrivacyEnabled = 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(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(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests);
domainContentValues.put(USER_AGENT, "System default user agent");
domainContentValues.put(FONT_SIZE, 0);
return newDomainDatabaseId;
}
+ void addDomain(ContentValues contentValues) {
+ // Get a writable database handle.
+ SQLiteDatabase domainsDatabase = this.getWritableDatabase();
+
+ // Add the new domain.
+ domainsDatabase.insert(DOMAINS_TABLE, null, contentValues);
+
+ // Close the database handle.
+ domainsDatabase.close();
+ }
+
public void updateDomainExceptCertificate(int databaseId, String domainName, boolean javaScriptEnabled, boolean firstPartyCookiesEnabled, boolean thirdPartyCookiesEnabled, boolean domStorageEnabled,
boolean formDataEnabled, boolean easyListEnabled, boolean easyPrivacyEnabled, boolean fanboysAnnoyanceEnabled, boolean fanboysSocialBlockingEnabled,
- boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int nightMode, int displayImages, boolean pinnedSslCertificate) {
+ boolean ultraPrivacyEnabled, boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int nightMode, int displayImages,
+ boolean pinnedSslCertificate) {
// Store the domain data in a `ContentValues`.
ContentValues domainContentValues = new ContentValues();
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(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests);
domainContentValues.put(USER_AGENT, userAgent);
domainContentValues.put(FONT_SIZE, fontSize);
public void updateDomainWithCertificate(int databaseId, String domainName, boolean javaScriptEnabled, boolean firstPartyCookiesEnabled, boolean thirdPartyCookiesEnabled, boolean domStorageEnabled,
boolean formDataEnabled, boolean easyListEnabled, boolean easyPrivacyEnabled, boolean fanboysAnnoyanceEnabled, boolean fanboysSocialBlockingEnabled,
- boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int nightMode, int displayImages, boolean pinnedSslCertificate,
- String sslIssuedToCommonName, String sslIssuedToOrganization, String sslIssuedToOrganizationalUnit, String sslIssuedByCommonName, String sslIssuedByOrganization,
- String sslIssuedByOrganizationalUnit, long sslStartDate, long sslEndDate) {
+ boolean ultraPrivacyEnabled, boolean blockAllThirdPartyRequests, String userAgent, int fontSize, int swipeToRefresh, int nightMode, int displayImages,
+ boolean pinnedSslCertificate, String sslIssuedToCommonName, String sslIssuedToOrganization, String sslIssuedToOrganizationalUnit, String sslIssuedByCommonName,
+ String sslIssuedByOrganization, String sslIssuedByOrganizationalUnit, long sslStartDate, long sslEndDate) {
// Store the domain data in a `ContentValues`.
ContentValues domainContentValues = new ContentValues();
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(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests);
domainContentValues.put(USER_AGENT, userAgent);
domainContentValues.put(FONT_SIZE, fontSize);
projects / PrivacyBrowserAndroid.git / blobdiff