X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FDomainsDatabaseHelper.kt;h=2c941634c500f642ee279a735baf49e891f602c7;hb=f3a2827543d388de53b27a124663c5f84af764c9;hp=c5401d457fedd318904f0292bcd4f43f4cf5b144;hpb=48ae68b846bb5bb035e0d86659e4736b6db6f12d;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt
index c5401d45..2c941634 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt
@@ -30,24 +30,24 @@ import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
 
-// The private constants.
+// Define the class constants.
 private const val SCHEMA_VERSION = 14
 
 class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper(appContext, DOMAINS_DATABASE, null, SCHEMA_VERSION) {
     // Define the public companion object constants.  These can be moved to public class constants once the entire project has migrated to Kotlin.
     companion object {
-        // The database constants.
+        // Define the public database constants.
         const val DOMAINS_DATABASE = "domains.db"
         const val DOMAINS_TABLE = "domains"
 
-        // The spinner constants.
+        // Define the public spinner constants.
         const val SYSTEM_DEFAULT = 0
         const val ENABLED = 1
         const val DISABLED = 2
         const val LIGHT_THEME = 1
         const val DARK_THEME = 2
 
-        // The schema constants.
+        // Define the public schema constants.
         const val ID = "_id"
         const val DOMAIN_NAME = "domainname"
         const val ENABLE_JAVASCRIPT = "enablejavascript"
@@ -80,7 +80,7 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper(
         const val PINNED_IP_ADDRESSES = "pinned_ip_addresses"
         const val IP_ADDRESSES = "ip_addresses"
 
-        // The table creation constant.
+        // Define the public table creation constant.
         const val CREATE_DOMAINS_TABLE = "CREATE TABLE $DOMAINS_TABLE (" +
                 "$ID INTEGER PRIMARY KEY, " +
                 "$DOMAIN_NAME TEXT, " +
@@ -318,17 +318,17 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper(
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext)
 
         // Get the default settings.
-        val javaScript = sharedPreferences.getBoolean("javascript", false)
+        val javaScript = sharedPreferences.getBoolean(appContext.getString(R.string.javascript_key), false)
         val cookies = sharedPreferences.getBoolean(appContext.getString(R.string.cookies_key), false)
-        val domStorage = sharedPreferences.getBoolean("dom_storage", false)
-        val saveFormData = sharedPreferences.getBoolean("save_form_data", false) // Form data can be removed once the minimum API >= 26.
-        val easyList = sharedPreferences.getBoolean("easylist", true)
-        val easyPrivacy = sharedPreferences.getBoolean("easyprivacy", true)
-        val fanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true)
-        val fanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true)
-        val ultraList = sharedPreferences.getBoolean("ultralist", true)
-        val ultraPrivacy = sharedPreferences.getBoolean("ultraprivacy", true)
-        val blockAllThirdPartyRequests = sharedPreferences.getBoolean("block_all_third_party_requests", false)
+        val domStorage = sharedPreferences.getBoolean(appContext.getString(R.string.dom_storage_key), false)
+        val saveFormData = sharedPreferences.getBoolean(appContext.getString(R.string.save_form_data_key), false)  // Form data can be removed once the minimum API >= 26.
+        val easyList = sharedPreferences.getBoolean(appContext.getString(R.string.easylist_key), true)
+        val easyPrivacy = sharedPreferences.getBoolean(appContext.getString(R.string.easyprivacy_key), true)
+        val fanboyAnnoyanceList = sharedPreferences.getBoolean(appContext.getString(R.string.fanboys_annoyance_list_key), true)
+        val fanboySocialBlockingList = sharedPreferences.getBoolean(appContext.getString(R.string.fanboys_social_blocking_list_key), true)
+        val ultraList = sharedPreferences.getBoolean(appContext.getString(R.string.ultralist_key), true)
+        val ultraPrivacy = sharedPreferences.getBoolean(appContext.getString(R.string.ultraprivacy_key), true)
+        val blockAllThirdPartyRequests = sharedPreferences.getBoolean(appContext.getString(R.string.block_all_third_party_requests_key), 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)
@@ -343,7 +343,7 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper(
         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(USER_AGENT, appContext.getString(R.string.user_agent_default_value))
         domainContentValues.put(X_REQUESTED_WITH_HEADER, 0)
         domainContentValues.put(FONT_SIZE, 0)
         domainContentValues.put(SWIPE_TO_REFRESH, 0)