Use GMS (Google Mobile Services) to update OpenSSL on API 19. Possible fix for https...

diff --git a/app/build.gradle b/app/build.gradle
index 5e97dbee7fcb7ccdb99dfd37f249a5cde821a413..f52a93cfdb4b6b06ba80637549eada58598ac3f4 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,6 +59,10 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:design:24.2.1'
+
+    // GMS (Google Mobile Services) is necessary to update OpenSSL on API 19, but must be removed to build on F-Droid.
+    compile 'com.google.android.gms:play-services-safetynet:9.8.0'
+
     // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor.
     freeCompile 'com.google.firebase:firebase-ads:9.8.0'
 }

diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java
deleted file mode 100644 (file)
index 8bd0930..0000000
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
- *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
- *
- * Privacy Browser is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Privacy Browser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.stoutner.privacybrowser;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-// If we don't use `android.support.v7.app.AlertDialog` instead of `android.app.AlertDialog` then the dialog will be covered by the keyboard.
-import android.support.v7.app.AlertDialog;
-// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22.
-import android.support.v7.app.AppCompatDialogFragment;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-
-public class CreateBookmark extends AppCompatDialogFragment {
-    // The public interface is used to send information back to the parent activity.
-    public interface CreateBookmarkListener {
-        void onCreateBookmark(AppCompatDialogFragment dialogFragment);
-    }
-
-    // `createBookmarkListener` is used in `onAttach()` and `onCreateDialog()`
-    private CreateBookmarkListener createBookmarkListener;
-
-
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        // Get a handle for `CreateBookmarkListener` from `context`.
-        try {
-            createBookmarkListener = (CreateBookmarkListener) context;
-        } catch(ClassCastException exception) {
-            throw new ClassCastException(context.toString() + " must implement CreateBookmarkListener.");
-        }
-    }
-
-    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
-    @SuppressLint("InflateParams")
-    @Override
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        // Create a drawable version of the favorite icon.
-        Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIcon);
-
-        // Use `AlertDialog.Builder` to create the `AlertDialog`.  The style formats the color of the button text.
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog);
-        dialogBuilder.setTitle(R.string.create_bookmark);
-        dialogBuilder.setIcon(favoriteIconDrawable);
-        // The parent view is `null` because it will be assigned by the `AlertDialog`.
-        dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.create_bookmark_dialog, null));
-
-        // Set an `onClick()` listener for the negative button.
-        dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                // Do nothing.  The `AlertDialog` will close automatically.
-            }
-        });
-
-        // Set an `onClick()` listener for the positive button.
-        dialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                // Return the `DialogFragment` to the parent activity on create.
-                createBookmarkListener.onCreateBookmark(CreateBookmark.this);
-            }
-        });
-
-
-        // Create an `AlertDialog` from the `AlertDialog.Builder`.
-        final AlertDialog alertDialog = dialogBuilder.create();
-
-        // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`.
-        assert alertDialog.getWindow() != null;
-
-        // Show the keyboard when the `Dialog` is displayed on the screen.
-        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-
-        // We need to show the `AlertDialog` before we can call `setOnKeyListener()` below.
-        alertDialog.show();
-
-        // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_name_edittext`.
-        EditText createBookmarkNameEditText = (EditText) alertDialog.findViewById(R.id.create_bookmark_name_edittext);
-        assert createBookmarkNameEditText != null;  // Remove the warning below that `createBookmarkNameEditText` might be `null`.
-        createBookmarkNameEditText.setOnKeyListener(new View.OnKeyListener() {
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // If the event is a key-down on the `enter` button, select the `PositiveButton` `Create`.
-                if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
-                    // Trigger `createBookmarkListener` and return the `DialogFragment` to the parent activity.
-                    createBookmarkListener.onCreateBookmark(CreateBookmark.this);
-                    // Manually dismiss the `AlertDialog`.
-                    alertDialog.dismiss();
-                    // Consume the event.
-                    return true;
-                } else {  // If any other key was pressed, do not consume the event.
-                    return false;
-                }
-            }
-        });
-
-        // Set the formattedUrlString as the initial text of `create_bookmark_url_edittext`.
-        EditText createBookmarkUrlEditText = (EditText) alertDialog.findViewById(R.id.create_bookmark_url_edittext);
-        assert createBookmarkUrlEditText != null;// Remove the warning below that `createBookmarkUrlEditText` might be `null`.
-        createBookmarkUrlEditText.setText(MainWebViewActivity.formattedUrlString);
-
-        // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_url_edittext`.
-        createBookmarkUrlEditText.setOnKeyListener(new View.OnKeyListener() {
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // If the event is a key-down on the "enter" button, select the PositiveButton "Create".
-                if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
-                    // Trigger `createBookmarkListener` and return the DialogFragment to the parent activity.
-                    createBookmarkListener.onCreateBookmark(CreateBookmark.this);
-                    // Manually dismiss the `AlertDialog`.
-                    alertDialog.dismiss();
-                    // Consume the event.
-                    return true;
-                } else { // If any other key was pressed, do not consume the event.
-                    return false;
-                }
-            }
-        });
-
-        // `onCreateDialog()` requires the return of an `AlertDialog`.
-        return alertDialog;
-    }
-}
\ No newline at end of file

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
index 5fdd814eda2675b948a340002e9fff145495d909..00ea17818b35ef6ce111c33c0dabcee5be73c8f7 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
@@ -52,6 +52,7 @@ import android.support.v7.app.AppCompatDialogFragment;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.util.Patterns;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
@@ -76,6 +77,11 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+// These three GMS (Google Mobile Services) lines need to be removed for F-Droid to build correctly.
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import com.google.android.gms.common.GooglePlayServicesRepairableException;
+import com.google.android.gms.security.ProviderInstaller;
+
 import com.stoutner.privacybrowser.BannerAd;
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.helpers.OrbotProxyHelper;
@@ -184,6 +190,18 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_coordinatorlayout);
 
+        // API 19 uses an old version of OpenSSL, which exposes users to man-in-the-middle attacks.
+        if (Build.VERSION.SDK_INT == 19) {
+            try {
+                // Update OpenSSL using Google Play Services.  This command must be removed for the build to succeed on F-Droid.
+                ProviderInstaller.installIfNeeded(this);
+            } catch (GooglePlayServicesRepairableException exception) {
+                Log.i("Privacy Browser", "OpenSSL needs to be updated");
+            } catch (GooglePlayServicesNotAvailableException exception) {
+                Log.i("Privacy Browser", "OpenSSL cannot be updated because Google Play Services are not available");
+            }
+        }
+
         // Get a handle for `inputMethodManager`.
         inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);