From cdbd0fea022e075e46906307cbf889cac5325dd5 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 9 Mar 2016 22:17:25 -0700 Subject: [PATCH] Release version 1.1. --- .gitignore | 6 ++ .idea/dictionaries/soren.xml | 13 +++ app/app.iml | 97 +++++++++---------- app/build.gradle | 13 +-- .../com/stoutner/privacybrowser/BannerAd.java | 2 +- app/src/free/res/values/strings.xml | 1 - .../CreateHomeScreenShortcut.java | 2 +- .../privacybrowser/MainWebViewActivity.java | 10 +- .../privacybrowser/SettingsActivity.java | 2 +- .../main/res/drawable/javascript_enabled.xml | 2 +- app/src/main/res/drawable/privacy_mode.xml | 2 +- app/src/main/res/drawable/warning.xml | 2 +- app/src/main/res/values/strings.xml | 7 +- .../com/stoutner/privacybrowser/BannerAd.java | 2 +- 14 files changed, 82 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 9c4de582..19073633 100644 --- 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 75d1eb64..920c48c6 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -1,14 +1,27 @@ + affero + creativecommons duckduckgo + homescreen + lgpl + licensors + mailto + mimetype + noncommercially privacybrowser recents rehide rehides + relicensing soren stoutner + sublicenses + sublicensing + webpage webview + wipo \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index a3768653..522dbccb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -8,62 +8,62 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,28 +88,25 @@ - - - - + - - + + @@ -118,10 +115,8 @@ - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7d29b94e..c215b003 100644 --- 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 df936ab6..6a50a0ad 100644 --- 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 d92134a7..cd10412a 100644 --- a/app/src/free/res/values/strings.xml +++ b/app/src/free/res/values/strings.xml @@ -23,6 +23,5 @@ Privacy Browser Free - true ca-app-pub-5962503714887045/2738552414 \ 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 fba32e74..9808d407 100644 --- 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 c0928c8d..2919a222 100644 --- 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 5fb9b63f..f0f78fff 100644 --- 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 633f17ee..b4162402 100644 --- 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"> - + diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml index 453b210a..30bf3928 100644 --- 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"> - + diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml index 16e16ce8..9df2bc09 100644 --- 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"> - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c810c05..68709a7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,9 +23,6 @@ Privacy Browser Privacy Browser Settings - - false - Privacy Mode Download started @@ -36,7 +33,6 @@ JavaScript DOM Storage - Save Form Data Cookies Clear DOM Storage Clear Cookies @@ -44,7 +40,6 @@ Downloads Navigation Home - Refresh Back Forward Share @@ -52,7 +47,7 @@ About Clear and Exit - + Shortcut name Cancel Create diff --git a/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java index 651c8971..69152689 100644 --- 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. } -- 2.45.2