Release version 1.1.

diff --git a/.gitignore b/.gitignore
index 9c4de5825b194f36e90f594c680b6b87ccc56270..1907363330b5070f8cda8d54cadf137b97a993d1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,9 @@
 .DS_Store
 /build
 /captures
+
+# Built APK files.
+*.apk
+
+# IntelliJ config files.
+*.iml

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index 75d1eb6496ae9299447d576774c9abf3714353f4..920c48c612f0246ecfae86cea1978ffbac188058 100644 (file)
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -1,14 +1,27 @@
 <component name="ProjectDictionaryState">
   <dictionary name="soren">
     <words>
+      <w>affero</w>
+      <w>creativecommons</w>
       <w>duckduckgo</w>
+      <w>homescreen</w>
+      <w>lgpl</w>
+      <w>licensors</w>
+      <w>mailto</w>
+      <w>mimetype</w>
+      <w>noncommercially</w>
       <w>privacybrowser</w>
       <w>recents</w>
       <w>rehide</w>
       <w>rehides</w>
+      <w>relicensing</w>
       <w>soren</w>
       <w>stoutner</w>
+      <w>sublicenses</w>
+      <w>sublicensing</w>
+      <w>webpage</w>
       <w>webview</w>
+      <w>wipo</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file

diff --git a/app/app.iml b/app/app.iml
index a3768653fa5ad95026b13263472fae2c84838826..522dbccb25df5bb7cd2ee5a0749996e4a6f0f807 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,62 +8,62 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="freeDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="standardDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleFreeDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileFreeDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleFreeDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileFreeDebugAndroidTestSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleStandardDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileStandardDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleStandardDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileStandardDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateFreeDebugAndroidTestSources</task>
-          <task>generateFreeDebugSources</task>
+          <task>generateStandardDebugAndroidTestSources</task>
+          <task>generateStandardDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/free/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/free/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/standard/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/standard/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/free/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/free/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/free/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/free/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/free/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/standard/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/standard/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/standard/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/standard/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/standard/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/standard/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/standard/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/standard/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/standard/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/standard/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/standard/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/standard/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/standard/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -88,28 +88,25 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.4.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
@@ -118,10 +115,8 @@
     <orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="design-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7d29b94e53bb8792c1696d47601a244649daf3d2..c215b003a2c7a174dca69a0ba8d334a441eab7ce 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "com.stoutner.privacybrowser"
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
 
     buildTypes {
@@ -43,19 +43,14 @@ android {
     productFlavors {
         standard {
             applicationId "com.stoutner.privacybrowser.standard"
-            versionName "1.0-standard"
+            versionName "1.1-standard"
         }
 
         free {
             applicationId "com.stoutner.privacybrowser.free"
-            versionName "1.0-free"
+            versionName "1.1-free"
         }
     }
-
-    // `lintOptions abortOnError false` is required for F-Droid to build correctly.
-    lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {

diff --git a/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
index df936ab630d51570f80fb790cd39d0b45f9e69bc..6a50a0ad4174b4e72cdcf6a27a1fb686233f0b68 100644 (file)
--- a/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
+++ b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
@@ -25,7 +25,7 @@ import android.view.View;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdView;
 
-public class BannerAd extends AppCompatActivity{
+class BannerAd extends AppCompatActivity{
     public static void requestAd(View view) {
         // Cast view to an AdView.
         AdView adView = (AdView) view;

diff --git a/app/src/free/res/values/strings.xml b/app/src/free/res/values/strings.xml
index d92134a7d7b87aba9caa3b0922be88b287a9acc9..cd10412ab29f2e1fe6a6e4a8765be05c1b807a00 100644 (file)
--- a/app/src/free/res/values/strings.xml
+++ b/app/src/free/res/values/strings.xml
@@ -23,6 +23,5 @@
     <string name="privacy_browser">Privacy Browser Free</string>
 
     <!-- Ad control strings. -->
-    <string name="free_flavor">true</string>
     <string name="ad_id">ca-app-pub-5962503714887045/2738552414</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
index fba32e74da2260972055c6be8bd40ded551432fe..9808d407a9e849f4c9e3003b5e2f234a787fa1e2 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
@@ -43,7 +43,7 @@ public class CreateHomeScreenShortcut extends AppCompatDialogFragment {
         void onCreateHomeScreenShortcutCreate(DialogFragment dialog);
     }
 
-    CreateHomeScreenSchortcutListener buttonListener;
+    private CreateHomeScreenSchortcutListener buttonListener;
 
     // Check to make sure that the activity that called CreateHomeScreenShortcut implements both listeners.
     public void onAttach(Activity activity) {

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index c0928c8d02b782e9854b53151964feefe6e50577..2919a2229d3297bc5baa13f1a19587ac6805deb6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -318,7 +318,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         cookieManager = CookieManager.getInstance();
         cookieManager.setAcceptCookie(cookiesEnabled);
 
-        // Set hompage initial status.
+        // Set homepage initial status.
         homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com");
 
         // Get the intent information that started the app.
@@ -569,12 +569,12 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
 
             case R.id.downloads:
                 // Launch the system Download Manager.
-                Intent downloadManangerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
+                Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
 
                 // Launch as a new task so that Download Manager and Privacy Browser show as separate windows in the recent tasks list.
-                downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                downloadManagerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-                startActivity(downloadManangerIntent);
+                startActivity(downloadManagerIntent);
                 return true;
 
             case R.id.home:
@@ -673,7 +673,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         }
     }
 
-    public void loadUrlFromTextBox() throws UnsupportedEncodingException {
+    private void loadUrlFromTextBox() throws UnsupportedEncodingException {
         // Get the text from urlTextBox and convert it to a string.
         String unformattedUrlString = urlTextBox.getText().toString();
         URL unformattedUrl = null;

diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
index 5fb9b63fbb127f96183b88423b6c08a11fcca417..f0f78fffe4c015557a7319e16603a4a427f582f6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
@@ -25,7 +25,7 @@ import android.preference.PreferenceActivity;
 // Once the minimum API is >= 11 we can switch from the deprecated PreferenceActivity to using a PreferenceFragment.
 public class SettingsActivity extends PreferenceActivity {
     @Override
-    // Until minumum API is >= 11 we needs to use the deprecated addPreferenceFromResource from PreferenceActivity.
+    // Until minimum API is >= 11 we needs to use the deprecated addPreferenceFromResource from PreferenceActivity.
     @SuppressWarnings("deprecation")
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index 633f17eef1cbdcfb0d2b58940811f086d0e8bb27..b41624023e3fa9a3ad0a4d9b51f2b4868517c270 100644 (file)
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -9,7 +9,7 @@
         android:viewportWidth="26.0"
         android:viewportHeight="26.0">
 
-    <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
+    <!-- The fillColor must be hardcoded in this file until the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zm0,-8c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>

diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index 453b210a1b295675c6f2b7945671cb158f487837..30bf392805a0c124521b6d35e662e4416d6abaa2 100644 (file)
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -9,7 +9,7 @@
         android:viewportWidth="26.0"
         android:viewportHeight="26.0">
 
-    <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
+    <!-- The fillColor must be hardcoded in this file until the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path
         android:fillColor="#FF64DD17"
         android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>

diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index 16e16ce83a34fd274263457055cce59b36dd4701..9df2bc0991a0f4507dc3c334a20d204016dd1b84 100644 (file)
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -9,7 +9,7 @@
         android:viewportWidth="26.0"
         android:viewportHeight="26.0">
 
-    <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
+    <!-- The fillColor must be hardcoded in this file until the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path
         android:fillColor="#FFFFD600"
         android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zm0,-8c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c810c0571da136cafe489ef2417c0e4e3b4256f..68709a7b8ea25f8aae55951455889868e8892590 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,9 +23,6 @@
     <string name="privacy_browser">Privacy Browser</string>
     <string name="privacy_browser_settings">Privacy Browser Settings</string>
 
-    <!-- Ad control strings. -->
-    <string name="free_flavor">false</string>
-
     <!-- MainWebViewActivity. -->
     <string name="privacy_mode">Privacy Mode</string>
     <string name="download_started">Download started</string>
@@ -36,7 +33,6 @@
     <!-- Menu. -->
     <string name="javascript">JavaScript</string>
     <string name="dom_storage">DOM Storage</string>
-    <string name="save_form_data">Save Form Data</string>
     <string name="cookies">Cookies</string>
     <string name="clear_dom_storage">Clear DOM Storage</string>
     <string name="clear_cookies">Clear Cookies</string>
@@ -44,7 +40,6 @@
     <string name="downloads">Downloads</string>
     <string name="navigation">Navigation</string>
     <string name="home">Home</string>
-    <string name="refresh">Refresh</string>
     <string name="back">Back</string>
     <string name="forward">Forward</string>
     <string name="share">Share</string>
@@ -52,7 +47,7 @@
     <string name="about">About</string>
     <string name="clear_and_exit">Clear and Exit</string>
 
-    <!-- Create Home Screen Shorcut Alert Dialog. -->
+    <!-- Create Home Screen Shortcut Alert Dialog. -->
     <string name="shortcut_name">Shortcut name</string>
     <string name="cancel">Cancel</string>
     <string name="create">Create</string>

diff --git a/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
index 651c8971be617403fa523ff10f34c5e1c27824d3..69152689e1939b2642e2ce9808a8c6fae43c9e9b 100644 (file)
--- a/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
+++ b/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
@@ -21,7 +21,7 @@ package com.stoutner.privacybrowser;
 
 import android.view.View;
 
-public class BannerAd {
+class BannerAd {
     public static void requestAd(View view) {
         // Do nothing because this is the standard version.
     }