Add OpenPGP encrypted export. https://redmine.stoutner.com/issues/338

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index c96e514b485384f8a788e9de8e9167d47d2e3b99..5c9a66a3c24b143ccfe69899876bed23b6c535e6 100644 (file)
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -27,6 +27,7 @@
       <w>buildapi</w>
       <w>buildversion</w>
       <w>buratti</w>
       <w>buildapi</w>
       <w>buildversion</w>
       <w>buratti</w>

+      <w>cardview</w>

       <w>checkedtextview</w>
       <w>chromebooks</w>
       <w>chromeversion</w>
       <w>checkedtextview</w>
       <w>chromebooks</w>
       <w>chromeversion</w>


@@ -64,6 +65,7 @@
       <w>fbee</w>
       <w>fdfilter</w>
       <w>fdid</w>
       <w>fbee</w>
       <w>fdfilter</w>
       <w>fdid</w>

+      <w>fileprovider</w>

       <w>firebase</w>
       <w>fontsize</w>
       <w>framelayout</w>
       <w>firebase</w>
       <w>fontsize</w>
       <w>framelayout</w>


@@ -99,6 +101,7 @@
       <w>nist</w>
       <w>nojs</w>
       <w>oname</w>
       <w>nist</w>
       <w>nojs</w>
       <w>oname</w>

+      <w>openkeychain</w>

       <w>openpgp</w>
       <w>orbot</w>
       <w>panopticlick</w>
       <w>openpgp</w>
       <w>orbot</w>
       <w>panopticlick</w>


@@ -143,6 +146,7 @@
       <w>subdomains</w>
       <w>subfolders</w>
       <w>sublists</w>
       <w>subdomains</w>
       <w>subfolders</w>
       <w>sublists</w>

+      <w>sufficientlysecure</w>

       <w>swipetorefresh</w>
       <w>tablayout</w>
       <w>techrepublic</w>
       <w>swipetorefresh</w>
       <w>tablayout</w>
       <w>techrepublic</w>

diff --git a/app/src/free/res/values/strings.xml b/app/src/free/res/values/strings.xml
index 9aae5fc55dfb199539b0da9d03843477a5aab06b..af5d2675bb5f93cee810bc9c386dd1d59e460b8f 100644 (file)
--- a/app/src/free/res/values/strings.xml
+++ b/app/src/free/res/values/strings.xml
@@ -19,6 +19,9 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <resources>
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <resources>

+    <!-- Providers. -->
+    <string name="file_provider" translatable="false">com.stoutner.privacybrowser.fileprovider.free</string>
+

     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser Free</string>
 
     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser Free</string>
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 028a7e3b6405e6c7bc918d17dd799dedca49040b..c957349d548dff012311e5cc90b58096a5de1a04 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,6 +65,18 @@
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="@string/google_app_id" />
 
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="@string/google_app_id" />
 

+        <!-- The file provider is required to encrypt files with OpenKeychain. -->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="@string/file_provider"
+            android:exported="false"
+            android:grantUriPermissions="true" >
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
+        

         <!-- The theme has to be defined here or an ugly title bar is displayed when the app launches.
              `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes, which preserves scroll location in the WebView.
              `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent.
         <!-- The theme has to be defined here or an ugly title bar is displayed when the app launches.
              `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes, which preserves scroll location in the WebView.
              `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
index 14f5789fe3a9b7fbfe3a8d0fc59f42bd8be71ba0..fb30046998b71c859591118264379d186378cc36 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
@@ -34,8 +34,10 @@ import android.support.design.widget.Snackbar;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;

+import android.support.v4.content.FileProvider;

 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;

+import android.support.v7.widget.CardView;

 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;


@@ -45,6 +47,8 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;

+import android.widget.LinearLayout;
+import android.widget.RadioButton;

 import android.widget.Spinner;
 import android.widget.TextView;
 
 import android.widget.Spinner;
 import android.widget.TextView;
 


@@ -69,11 +73,14 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
     // Create the encryption constants.
     private final int NO_ENCRYPTION = 0;
     private final int PASSWORD_ENCRYPTION = 1;
     // Create the encryption constants.
     private final int NO_ENCRYPTION = 0;
     private final int PASSWORD_ENCRYPTION = 1;

-    private final int GPG_ENCRYPTION = 2;
+    private final int OPENPGP_ENCRYPTION = 2;

 
 

-    // Create the action constants.
-    private final int IMPORT = 0;
-    private final int EXPORT = 1;
+    // Create the activity result constants.
+    private final int BROWSE_RESULT_CODE = 0;
+    private final int OPENPGP_EXPORT_RESULT_CODE = 1;
+
+    // `openKeychainInstalled` is accessed from an inner class.
+    boolean openKeychainInstalled;

 
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {


@@ -104,46 +111,61 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
         assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that `appBar` might be null.
         appBar.setDisplayHomeAsUpEnabled(true);
 
         assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that `appBar` might be null.
         appBar.setDisplayHomeAsUpEnabled(true);
 

+        // Find out if we are running KitKat
+        boolean runningKitKat = (Build.VERSION.SDK_INT == 19);
+
+        // Find out if OpenKeychain is installed.
+        try {
+            openKeychainInstalled = !getPackageManager().getPackageInfo("org.sufficientlysecure.keychain", 0).versionName.isEmpty();
+        } catch (PackageManager.NameNotFoundException exception) {
+            openKeychainInstalled = false;
+        }
+

         // Get handles for the views that need to be modified.
         Spinner encryptionSpinner = findViewById(R.id.encryption_spinner);
         TextInputLayout passwordEncryptionTextInputLayout = findViewById(R.id.password_encryption_textinputlayout);
         EditText encryptionPasswordEditText = findViewById(R.id.password_encryption_edittext);
         // Get handles for the views that need to be modified.
         Spinner encryptionSpinner = findViewById(R.id.encryption_spinner);
         TextInputLayout passwordEncryptionTextInputLayout = findViewById(R.id.password_encryption_textinputlayout);
         EditText encryptionPasswordEditText = findViewById(R.id.password_encryption_edittext);

-        Spinner importExportSpinner = findViewById(R.id.import_export_spinner);
+        TextView kitKatPasswordEncryptionTextView = findViewById(R.id.kitkat_password_encryption_textview);
+        TextView openKeychainRequiredTextView = findViewById(R.id.openkeychain_required_textview);
+        CardView fileLocationCardView = findViewById(R.id.file_location_cardview);
+        RadioButton importRadioButton = findViewById(R.id.import_radiobutton);
+        RadioButton exportRadioButton = findViewById(R.id.export_radiobutton);
+        LinearLayout fileNameLinearLayout = findViewById(R.id.file_name_linearlayout);

         EditText fileNameEditText = findViewById(R.id.file_name_edittext);
         EditText fileNameEditText = findViewById(R.id.file_name_edittext);

+        TextView openKeychainImportInstructionsTextView = findViewById(R.id.openkeychain_import_instructions_textview);

         Button importExportButton = findViewById(R.id.import_export_button);
         TextView storagePermissionTextView = findViewById(R.id.import_export_storage_permission_textview);
 
         Button importExportButton = findViewById(R.id.import_export_button);
         TextView storagePermissionTextView = findViewById(R.id.import_export_storage_permission_textview);
 

-        // Create array adapters for the spinners.
+        // Create an array adapter for the spinner.

         ArrayAdapter<CharSequence> encryptionArrayAdapter = ArrayAdapter.createFromResource(this, R.array.encryption_type, R.layout.spinner_item);
         ArrayAdapter<CharSequence> encryptionArrayAdapter = ArrayAdapter.createFromResource(this, R.array.encryption_type, R.layout.spinner_item);

-        ArrayAdapter<CharSequence> importExportArrayAdapter = ArrayAdapter.createFromResource(this, R.array.import_export_spinner, R.layout.spinner_item);

 
 

-        // Set the drop down view resource on the spinners.
+        // Set the drop down view resource on the spinner.

         encryptionArrayAdapter.setDropDownViewResource(R.layout.spinner_dropdown_items);
         encryptionArrayAdapter.setDropDownViewResource(R.layout.spinner_dropdown_items);

-        importExportArrayAdapter.setDropDownViewResource(R.layout.spinner_dropdown_items);

 
 

-        // Set the array adapters for the spinners.
+        // Set the array adapter for the spinner.

         encryptionSpinner.setAdapter(encryptionArrayAdapter);
         encryptionSpinner.setAdapter(encryptionArrayAdapter);

-        importExportSpinner.setAdapter(importExportArrayAdapter);

 
 

-        // Initially hide the encryption layout items.
+        // Initially hide the unneeded views.

         passwordEncryptionTextInputLayout.setVisibility(View.GONE);
         passwordEncryptionTextInputLayout.setVisibility(View.GONE);

+        kitKatPasswordEncryptionTextView.setVisibility(View.GONE);
+        openKeychainRequiredTextView.setVisibility(View.GONE);
+        fileNameLinearLayout.setVisibility(View.GONE);
+        openKeychainImportInstructionsTextView.setVisibility(View.GONE);
+        importExportButton.setVisibility(View.GONE);

 
         // Create strings for the default file paths.
         String defaultFilePath;
         String defaultPasswordEncryptionFilePath;
 
         // Create strings for the default file paths.
         String defaultFilePath;
         String defaultPasswordEncryptionFilePath;

-        String defaultGpgEncryptionFilePath;

 
         // Set the default file paths according to the storage permission status.
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {  // The storage permission has been granted.
             // Set the default file paths to use the external public directory.
 
         // Set the default file paths according to the storage permission status.
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {  // The storage permission has been granted.
             // Set the default file paths to use the external public directory.

-            defaultFilePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/" + getString(R.string.privacy_browser_settings);
+            defaultFilePath = Environment.getExternalStorageDirectory() + "/" + getString(R.string.privacy_browser_settings);

             defaultPasswordEncryptionFilePath = defaultFilePath + ".aes";
             defaultPasswordEncryptionFilePath = defaultFilePath + ".aes";

-            defaultGpgEncryptionFilePath = defaultFilePath + ".gpg";

         } else {  // The storage permission has not been granted.
             // Set the default file paths to use the external private directory.
         } else {  // The storage permission has not been granted.
             // Set the default file paths to use the external private directory.

-            defaultFilePath = getApplicationContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS) + "/" + getString(R.string.privacy_browser_settings);
+            defaultFilePath = getApplicationContext().getExternalFilesDir(null) + "/" + getString(R.string.privacy_browser_settings);

             defaultPasswordEncryptionFilePath = defaultFilePath + ".aes";
             defaultPasswordEncryptionFilePath = defaultFilePath + ".aes";

-            defaultGpgEncryptionFilePath = defaultFilePath + ".gpg";

         }
 
         // Set the default file path.
         }
 
         // Set the default file path.


@@ -155,8 +177,24 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 switch (position) {
                     case NO_ENCRYPTION:
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 switch (position) {
                     case NO_ENCRYPTION:

-                        // Hide the encryption layout items.
+                        // Hide the unneeded layout items.

                         passwordEncryptionTextInputLayout.setVisibility(View.GONE);
                         passwordEncryptionTextInputLayout.setVisibility(View.GONE);

+                        kitKatPasswordEncryptionTextView.setVisibility(View.GONE);
+                        openKeychainRequiredTextView.setVisibility(View.GONE);
+                        openKeychainImportInstructionsTextView.setVisibility(View.GONE);
+
+                        // Show the file location card.
+                        fileLocationCardView.setVisibility(View.VISIBLE);
+
+                        // Show the file name linear layout if either import or export is checked.
+                        if (importRadioButton.isChecked() || exportRadioButton.isChecked()) {
+                            fileNameLinearLayout.setVisibility(View.VISIBLE);
+                        }
+
+                        // Reset the text of the import button, which may have been changed to `Decrypt`.
+                        if (importRadioButton.isChecked()) {
+                            importExportButton.setText(R.string.import_button);
+                        }

 
                         // Reset the default file path.
                         fileNameEditText.setText(defaultFilePath);
 
                         // Reset the default file path.
                         fileNameEditText.setText(defaultFilePath);


@@ -166,43 +204,80 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
                         break;
 
                     case PASSWORD_ENCRYPTION:
                         break;
 
                     case PASSWORD_ENCRYPTION:

-                        // Show the password encryption layout items.
-                        passwordEncryptionTextInputLayout.setVisibility(View.VISIBLE);
-
-                        // Update the default file path.
-                        fileNameEditText.setText(defaultPasswordEncryptionFilePath);
-
-                        // Enable the import/export button if a file name and password exists.
-                        importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty());
+                        if (runningKitKat) {
+                            // Show the KitKat password encryption message.
+                            kitKatPasswordEncryptionTextView.setVisibility(View.VISIBLE);
+
+                            // Hide the OpenPGP required text view and the file location card.
+                            openKeychainRequiredTextView.setVisibility(View.GONE);
+                            fileLocationCardView.setVisibility(View.GONE);
+                        } else {
+                            // Hide the OpenPGP layout items.
+                            openKeychainRequiredTextView.setVisibility(View.GONE);
+                            openKeychainImportInstructionsTextView.setVisibility(View.GONE);
+
+                            // Show the password encryption layout items.
+                            passwordEncryptionTextInputLayout.setVisibility(View.VISIBLE);
+
+                            // Show the file location card.
+                            fileLocationCardView.setVisibility(View.VISIBLE);
+
+                            // Show the file name linear layout if either import or export is checked.
+                            if (importRadioButton.isChecked() || exportRadioButton.isChecked()) {
+                                fileNameLinearLayout.setVisibility(View.VISIBLE);
+                            }
+
+                            // Reset the text of the import button, which may have been changed to `Decrypt`.
+                            if (importRadioButton.isChecked()) {
+                                importExportButton.setText(R.string.import_button);
+                            }
+
+                            // Update the default file path.
+                            fileNameEditText.setText(defaultPasswordEncryptionFilePath);
+
+                            // Enable the import/export button if a password exists.
+                            importExportButton.setEnabled(!encryptionPasswordEditText.getText().toString().isEmpty());
+                        }

                         break;
 
                         break;
 

-                    case GPG_ENCRYPTION:
+                    case OPENPGP_ENCRYPTION:

                         // Hide the password encryption layout items.
                         passwordEncryptionTextInputLayout.setVisibility(View.GONE);
                         // Hide the password encryption layout items.
                         passwordEncryptionTextInputLayout.setVisibility(View.GONE);

-
-                        // Update the default file path.
-                        fileNameEditText.setText(defaultGpgEncryptionFilePath);
-                        break;
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
-        // Update the import/export button when the spinner changes.
-        importExportSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                switch (position) {
-                    case IMPORT:
-                        importExportButton.setText(R.string.import_button);
-                        break;
-
-                    case EXPORT:
-                        importExportButton.setText(R.string.export);
+                        kitKatPasswordEncryptionTextView.setVisibility(View.GONE);
+
+                        // Updated items based on the installation status of OpenKeychain.
+                        if (openKeychainInstalled) {  // OpenKeychain is installed.
+                            // Remove the default file path.
+                            fileNameEditText.setText("");
+
+                            // Show the file location card.
+                            fileLocationCardView.setVisibility(View.VISIBLE);
+
+                            if (importRadioButton.isChecked()) {
+                                // Show the file name linear layout and the OpenKeychain import instructions.
+                                fileNameLinearLayout.setVisibility(View.VISIBLE);
+                                openKeychainImportInstructionsTextView.setVisibility(View.VISIBLE);
+
+                                // Set the text of the import button to be `Decrypt`.
+                                importExportButton.setText(R.string.decrypt);
+
+                                // Disable the import/export button.  The user needs to select a file to import first.
+                                importExportButton.setEnabled(false);
+                            } else if (exportRadioButton.isChecked()) {
+                                // Hide the file name linear layout and the OpenKeychain import instructions.
+                                fileNameLinearLayout.setVisibility(View.GONE);
+                                openKeychainImportInstructionsTextView.setVisibility(View.GONE);
+
+                                // Enable the import/export button.
+                                importExportButton.setEnabled(true);
+                            }
+                        } else {  // OpenKeychain is not installed.
+                            // Show the OpenPGP required layout item.
+                            openKeychainRequiredTextView.setVisibility(View.VISIBLE);
+
+                            // Hide the file location card.
+                            fileLocationCardView.setVisibility(View.GONE);
+                        }

                         break;
                 }
             }
                         break;
                 }
             }


@@ -258,7 +333,9 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
                         importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty());
                         break;
 
                         importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty());
                         break;
 

-                    case GPG_ENCRYPTION:
+                    case OPENPGP_ENCRYPTION:
+                        // Enable the import/export button if OpenKeychain is installed and a file name exists.
+                        importExportButton.setEnabled(openKeychainInstalled && !fileNameEditText.getText().toString().isEmpty());

                         break;
                 }
             }
                         break;
                 }
             }


@@ -270,66 +347,130 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
         }
     }
 
         }
     }
 

+    public void onClickRadioButton(View view) {
+        // Get handles for the views.
+        Spinner encryptionSpinner = findViewById(R.id.encryption_spinner);
+        LinearLayout fileNameLinearLayout = findViewById(R.id.file_name_linearlayout);
+        EditText fileNameEditText = findViewById(R.id.file_name_edittext);
+        TextView openKeychainImportInstructionTextView = findViewById(R.id.openkeychain_import_instructions_textview);
+        Button importExportButton = findViewById(R.id.import_export_button);
+
+        // Check to see if import or export was selected.
+        switch (view.getId()) {
+            case R.id.import_radiobutton:
+                // Check to see if OpenPGP encryption is selected.
+                if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) {  // OpenPGP encryption selected.
+                    // Show the OpenKeychain import instructions.
+                    openKeychainImportInstructionTextView.setVisibility(View.VISIBLE);
+
+                    // Set the text on the import/export button to be `Decrypt`.
+                    importExportButton.setText(R.string.decrypt);
+
+                    // Enable the decrypt button if there is a file name.
+                    importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty());
+                } else {  // OpenPGP encryption not selected.
+                    // Hide the OpenKeychain import instructions.
+                    openKeychainImportInstructionTextView.setVisibility(View.GONE);
+
+                    // Set the text on the import/export button to be `Import`.
+                    importExportButton.setText(R.string.import_button);
+                }
+
+                // Display the file name views.
+                fileNameLinearLayout.setVisibility(View.VISIBLE);
+                importExportButton.setVisibility(View.VISIBLE);
+                break;
+
+            case R.id.export_radiobutton:
+                // Hide the OpenKeychain import instructions.
+                openKeychainImportInstructionTextView.setVisibility(View.GONE);
+
+                // Set the text on the import/export button to be `Export`.
+                importExportButton.setText(R.string.export);
+
+                // Show the import/export button.
+                importExportButton.setVisibility(View.VISIBLE);
+
+                // Check to see if OpenPGP encryption is selected.
+                if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) {  // OpenPGP encryption is selected.
+                    // Hide the file name views.
+                    fileNameLinearLayout.setVisibility(View.GONE);
+
+                    // Enable the export button.
+                    importExportButton.setEnabled(true);
+                } else {  // OpenPGP encryption is not selected.
+                    // Show the file name views.
+                    fileNameLinearLayout.setVisibility(View.VISIBLE);
+                }
+                break;
+        }
+    }
+

     public void browse(View view) {
     public void browse(View view) {

-        // Get a handle for the import/export spinner.
-        Spinner importExportSpinner = findViewById(R.id.import_export_spinner);
+        // Get a handle for the import radiobutton.
+        RadioButton importRadioButton = findViewById(R.id.import_radiobutton);

 
         // Check to see if import or export is selected.
 
         // Check to see if import or export is selected.

-        if (importExportSpinner.getSelectedItemPosition() == IMPORT) {  // Import is selected.
+        if (importRadioButton.isChecked()) {  // Import is selected.

             // Create the file picker intent.
             // Create the file picker intent.

-            Intent importIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+            Intent importBrowseIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);

 
             // Set the intent MIME type to include all files.
 
             // Set the intent MIME type to include all files.

-            importIntent.setType("*/*");
+            importBrowseIntent.setType("*/*");

 
             // Set the initial directory if API >= 26.
             if (Build.VERSION.SDK_INT >= 26) {
 
             // Set the initial directory if API >= 26.
             if (Build.VERSION.SDK_INT >= 26) {

-                importIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory());
+                importBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory());

             }
 
             // Specify that a file that can be opened is requested.
             }
 
             // Specify that a file that can be opened is requested.

-            importIntent.addCategory(Intent.CATEGORY_OPENABLE);
+            importBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE);

 
             // Launch the file picker.
 
             // Launch the file picker.

-            startActivityForResult(importIntent, 0);
+            startActivityForResult(importBrowseIntent, BROWSE_RESULT_CODE);

         } else {  // Export is selected
             // Create the file picker intent.
         } else {  // Export is selected
             // Create the file picker intent.

-            Intent exportIntent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+            Intent exportBrowseIntent = new Intent(Intent.ACTION_CREATE_DOCUMENT);

 
             // Set the intent MIME type to include all files.
 
             // Set the intent MIME type to include all files.

-            exportIntent.setType("*/*");
+            exportBrowseIntent.setType("*/*");

 
             // Set the initial export file name.
 
             // Set the initial export file name.

-            exportIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.privacy_browser_settings));
+            exportBrowseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.privacy_browser_settings));

 
             // Set the initial directory if API >= 26.
             if (Build.VERSION.SDK_INT >= 26) {
 
             // Set the initial directory if API >= 26.
             if (Build.VERSION.SDK_INT >= 26) {

-                exportIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory());
+                exportBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory());

             }
 
             // Specify that a file that can be opened is requested.
             }
 
             // Specify that a file that can be opened is requested.

-            exportIntent.addCategory(Intent.CATEGORY_OPENABLE);
+            exportBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE);

 
             // Launch the file picker.
 
             // Launch the file picker.

-            startActivityForResult(exportIntent, 0);
+            startActivityForResult(exportBrowseIntent, BROWSE_RESULT_CODE);

         }
     }
 
     public void importExport(View view) {
         }
     }
 
     public void importExport(View view) {

-        // Get a handle for the import/export spinner.
-        Spinner importExportSpinner = findViewById(R.id.import_export_spinner);
-
-        // Check to see if the storage permission has been granted.
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {  // Storage permission granted.
+        // Get a handle for the views.
+        Spinner encryptionSpinner = findViewById(R.id.encryption_spinner);
+        RadioButton importRadioButton = findViewById(R.id.import_radiobutton);
+        RadioButton exportRadioButton = findViewById(R.id.export_radiobutton);
+
+        // Check to see if the storage permission is needed.
+        if ((encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) && exportRadioButton.isChecked()) {  // Permission not needed to export via OpenKeychain.
+            // Export the settings.
+            exportSettings();
+        } else if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {  // The storage permission has been granted.

             // Check to see if import or export is selected.
             // Check to see if import or export is selected.

-            if (importExportSpinner.getSelectedItemPosition() == IMPORT) {  // Import is selected.
+            if (importRadioButton.isChecked()) {  // Import is selected.

                 // Import the settings.
                 importSettings();
             } else {  // Export is selected.
                 // Export the settings.
                 exportSettings();
             }
                 // Import the settings.
                 importSettings();
             } else {  // Export is selected.
                 // Export the settings.
                 exportSettings();
             }

-        } else {  // Storage permission not granted.
+        } else {  // The storage permission has not been granted.

             // Get a handle for the file name EditText.
             EditText fileNameEditText = findViewById(R.id.file_name_edittext);
 
             // Get a handle for the file name EditText.
             EditText fileNameEditText = findViewById(R.id.file_name_edittext);
 


@@ -348,7 +489,7 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
             // Check to see if the file path is in the external private directory.
             if (fileNameString.startsWith(externalPrivateDirectory)) {  // The file path is in the external private directory.
                 // Check to see if import or export is selected.
             // Check to see if the file path is in the external private directory.
             if (fileNameString.startsWith(externalPrivateDirectory)) {  // The file path is in the external private directory.
                 // Check to see if import or export is selected.

-                if (importExportSpinner.getSelectedItemPosition() == IMPORT) {  // Import is selected.
+                if (importRadioButton.isChecked()) {  // Import is selected.

                     // Import the settings.
                     importSettings();
                 } else {  // Export is selected.
                     // Import the settings.
                     importSettings();
                 } else {  // Export is selected.


@@ -379,18 +520,18 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {

-        // Get a handle for the import/export spinner.
-        Spinner importExportSpinner = findViewById(R.id.import_export_spinner);
+        // Get a handle for the import radiobutton.
+        RadioButton importRadioButton = findViewById(R.id.import_radiobutton);

 
         // Check to see if import or export is selected.
 
         // Check to see if import or export is selected.

-        if (importExportSpinner.getSelectedItemPosition() == IMPORT) {  // Import is selected.
+        if (importRadioButton.isChecked()) {  // Import is selected.

             // Check to see if the storage permission was granted.  If the dialog was canceled the grant results will be empty.
             if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {  // The storage permission was granted.
                 // Import the settings.
                 importSettings();
             } else {  // The storage permission was not granted.
                 // Display an error snackbar.
             // Check to see if the storage permission was granted.  If the dialog was canceled the grant results will be empty.
             if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {  // The storage permission was granted.
                 // Import the settings.
                 importSettings();
             } else {  // The storage permission was not granted.
                 // Display an error snackbar.

-                Snackbar.make(importExportSpinner, getString(R.string.cannot_import), Snackbar.LENGTH_LONG).show();
+                Snackbar.make(importRadioButton, getString(R.string.cannot_import), Snackbar.LENGTH_LONG).show();

             }
         } else {  // Export is selected.
             // Check to see if the storage permission was granted.  If the dialog was canceled the grant results will be empty.
             }
         } else {  // Export is selected.
             // Check to see if the storage permission was granted.  If the dialog was canceled the grant results will be empty.


@@ -399,62 +540,77 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
                 exportSettings();
             } else {  // The storage permission was not granted.
                 // Display an error snackbar.
                 exportSettings();
             } else {  // The storage permission was not granted.
                 // Display an error snackbar.

-                Snackbar.make(importExportSpinner, getString(R.string.cannot_export), Snackbar.LENGTH_LONG).show();
+                Snackbar.make(importRadioButton, getString(R.string.cannot_export), Snackbar.LENGTH_LONG).show();

             }
         }
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         }
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {

-        // Don't do anything if the user pressed back from the file picker.
-        if (resultCode == Activity.RESULT_OK) {
-            // Get a handle for the file name EditText.
-            EditText fileNameEditText = findViewById(R.id.file_name_edittext);
-
-            // Get the file name URI.
-            Uri fileNameUri = data.getData();
-
-            // Remove the lint warning that the file name URI might be null.
-            assert fileNameUri != null;
-
-            // Get the raw file name path.
-            String rawFileNamePath = fileNameUri.getPath();
-
-            // Remove the warning that the file name path might be null.
-            assert rawFileNamePath != null;
-
-            // Check to see if the file name Path includes a valid storage location.
-            if (rawFileNamePath.contains(":")) {  // The path is valid.
-                // Split the path into the initial content uri and the final path information.
-                String fileNameContentPath = rawFileNamePath.substring(0, rawFileNamePath.indexOf(":"));
-                String fileNameFinalPath = rawFileNamePath.substring(rawFileNamePath.indexOf(":") + 1);
-
-                // Create the file name path string.
-                String fileNamePath;
+        switch (requestCode) {
+            case (BROWSE_RESULT_CODE):
+                // Don't do anything if the user pressed back from the file picker.
+                if (resultCode == Activity.RESULT_OK) {
+                    // Get a handle for the file name EditText.
+                    EditText fileNameEditText = findViewById(R.id.file_name_edittext);
+
+                    // Get the file name URI.
+                    Uri fileNameUri = data.getData();
+
+                    // Remove the lint warning that the file name URI might be null.
+                    assert fileNameUri != null;
+
+                    // Get the raw file name path.
+                    String rawFileNamePath = fileNameUri.getPath();
+
+                    // Remove the warning that the file name path might be null.
+                    assert rawFileNamePath != null;
+
+                    // Check to see if the file name Path includes a valid storage location.
+                    if (rawFileNamePath.contains(":")) {  // The path is valid.
+                        // Split the path into the initial content uri and the final path information.
+                        String fileNameContentPath = rawFileNamePath.substring(0, rawFileNamePath.indexOf(":"));
+                        String fileNameFinalPath = rawFileNamePath.substring(rawFileNamePath.indexOf(":") + 1);
+
+                        // Create the file name path string.
+                        String fileNamePath;
+
+                        // Construct the file name path.
+                        switch (fileNameContentPath) {
+                            // The documents home has a special content path.
+                            case "/document/home":
+                                fileNamePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/" + fileNameFinalPath;
+                                break;
+
+                            // Everything else for the primary user should be in `/document/primary`.
+                            case "/document/primary":
+                                fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
+                                break;
+
+                            // Just in case, catch everything else and place it in the external storage directory.
+                            default:
+                                fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
+                                break;
+                        }
+
+                        // Set the file name path as the text of the file name EditText.
+                        fileNameEditText.setText(fileNamePath);
+                    } else {  // The path is invalid.
+                        Snackbar.make(fileNameEditText, rawFileNamePath + " " + getString(R.string.invalid_location), Snackbar.LENGTH_INDEFINITE).show();
+                    }
+                }
+                break;

 
 

-                // Construct the file name path.
-                switch (fileNameContentPath) {
-                    // The documents home has a special content path.
-                    case "/document/home":
-                        fileNamePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/" + fileNameFinalPath;
-                        break;
+            case OPENPGP_EXPORT_RESULT_CODE:
+                // Get the temporary unencrypted export file.
+                File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings));

 
 

-                    // Everything else for the primary user should be in `/document/primary`.
-                    case "/document/primary":
-                        fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
-                        break;
-
-                    // Just in case, catch everything else and place it in the external storage directory.
-                    default:
-                        fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath;
-                        break;
+                // Delete the temporary unencrypted export file if it exists.
+                if (temporaryUnencryptedExportFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    temporaryUnencryptedExportFile.delete();

                 }
                 }

-
-                // Set the file name path as the text of the file name EditText.
-                fileNameEditText.setText(fileNamePath);
-            } else {  // The path is invalid.
-                Snackbar.make(fileNameEditText, rawFileNamePath + " + " + getString(R.string.invalid_location), Snackbar.LENGTH_INDEFINITE).show();
-            }
+                break;

         }
     }
 
         }
     }
 


@@ -466,24 +622,29 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
         // Instantiate the import export database helper.
         ImportExportDatabaseHelper importExportDatabaseHelper = new ImportExportDatabaseHelper();
 
         // Instantiate the import export database helper.
         ImportExportDatabaseHelper importExportDatabaseHelper = new ImportExportDatabaseHelper();
 

-        // Get the export file.
+        // Get the export and temporary unencrypted export files.

         File exportFile = new File(fileNameEditText.getText().toString());
         File exportFile = new File(fileNameEditText.getText().toString());

+        File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings));

 
         // Initialize the export status string.
 
         // Initialize the export status string.

-        String exportStatus = "";
+        String exportStatus;

 
         // Export according to the encryption type.
         switch (encryptionSpinner.getSelectedItemPosition()) {
             case NO_ENCRYPTION:
                 // Export the unencrypted file.
                 exportStatus = importExportDatabaseHelper.exportUnencrypted(exportFile, this);
 
         // Export according to the encryption type.
         switch (encryptionSpinner.getSelectedItemPosition()) {
             case NO_ENCRYPTION:
                 // Export the unencrypted file.
                 exportStatus = importExportDatabaseHelper.exportUnencrypted(exportFile, this);

+
+                // Show a disposition snackbar.
+                if (exportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) {
+                    Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show();
+                } else {
+                    Snackbar.make(fileNameEditText, getString(R.string.export_failed) + "  " + exportStatus, Snackbar.LENGTH_INDEFINITE).show();
+                }

                 break;
 
             case PASSWORD_ENCRYPTION:
                 break;
 
             case PASSWORD_ENCRYPTION:

-                // Use a private temporary export location.
-                File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/export.temp");
-
-                // Create an unencrypted export in the private location.
+                // Create an unencrypted export in a private directory.

                 exportStatus = importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportFile, this);
 
                 try {
                 exportStatus = importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportFile, this);
 
                 try {


@@ -585,18 +746,34 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
                 } catch (Exception exception) {
                     exportStatus = exception.toString();
                 }
                 } catch (Exception exception) {
                     exportStatus = exception.toString();
                 }

+
+                // Show a disposition snackbar.
+                if (exportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) {
+                    Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show();
+                } else {
+                    Snackbar.make(fileNameEditText, getString(R.string.export_failed) + "  " + exportStatus, Snackbar.LENGTH_INDEFINITE).show();
+                }

                 break;
 
                 break;
 

-            case GPG_ENCRYPTION:
+            case OPENPGP_ENCRYPTION:
+                // Create an unencrypted export in the private location.
+                importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportFile, this);

 
 

-                break;
-        }
+                // Create an encryption intent for OpenKeychain.
+                Intent openKeychainEncryptIntent = new Intent("org.sufficientlysecure.keychain.action.ENCRYPT_DATA");

 
 

-        // Show a disposition snackbar.
-        if (exportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) {
-            Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show();
-        } else {
-            Snackbar.make(fileNameEditText, getString(R.string.export_failed) + "  " + exportStatus, Snackbar.LENGTH_INDEFINITE).show();
+                // Include the temporary unencrypted export file URI.
+                openKeychainEncryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), temporaryUnencryptedExportFile));
+
+                // Allow OpenKeychain to read the file URI.
+                openKeychainEncryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+                // Send the intent to the OpenKeychain package.
+                openKeychainEncryptIntent.setPackage("org.sufficientlysecure.keychain");
+
+                // Make it so.
+                startActivityForResult(openKeychainEncryptIntent, OPENPGP_EXPORT_RESULT_CODE);
+                break;

         }
     }
 
         }
     }
 


@@ -623,7 +800,7 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
 
             case PASSWORD_ENCRYPTION:
                 // Use a private temporary import location.
 
             case PASSWORD_ENCRYPTION:
                 // Use a private temporary import location.

-                File temporaryUnencryptedImportFile = new File(getApplicationContext().getCacheDir() + "/import.temp");
+                File temporaryUnencryptedImportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings));

 
                 try {
                     // Create an encrypted import file input stream.
 
                 try {
                     // Create an encrypted import file input stream.


@@ -724,8 +901,26 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
                 }
                 break;
 
                 }
                 break;
 

-            case GPG_ENCRYPTION:
+            case OPENPGP_ENCRYPTION:
+                try {
+                    // Create an decryption intent for OpenKeychain.
+                    Intent openKeychainDecryptIntent = new Intent("org.sufficientlysecure.keychain.action.DECRYPT_DATA");
+
+                    // Include the URI to be decrypted.
+                    openKeychainDecryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), importFile));
+
+                    // Allow OpenKeychain to read the file URI.
+                    openKeychainDecryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

 
 

+                    // Send the intent to the OpenKeychain package.
+                    openKeychainDecryptIntent.setPackage("org.sufficientlysecure.keychain");
+
+                    // Make it so.
+                    startActivity(openKeychainDecryptIntent);
+                } catch (IllegalArgumentException exception) {  // The file import location is not valid.
+                    // Display a snack bar with the import error.
+                    Snackbar.make(fileNameEditText, getString(R.string.import_failed) + "  " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show();
+                }

                 break;
         }
 
                 break;
         }
 


@@ -742,7 +937,7 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp
 
             // Make it so.
             startActivity(restartIntent);
 
             // Make it so.
             startActivity(restartIntent);

-        } else {  // The import was not successful.
+        } else if (!(encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION)){  // The import was not successful.

             // Display a snack bar with the import error.
             Snackbar.make(fileNameEditText, getString(R.string.import_failed) + "  " + importStatus, Snackbar.LENGTH_INDEFINITE).show();
         }
             // Display a snack bar with the import error.
             Snackbar.make(fileNameEditText, getString(R.string.import_failed) + "  " + importStatus, Snackbar.LENGTH_INDEFINITE).show();
         }

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
index d4bd52fc22d0a6a8b3942af1ec47758f0c8cb1f7..9f627b6c0e42d946a086034075626953f413a2bb 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
@@ -20,6 +20,7 @@
 package com.stoutner.privacybrowser.fragments;
 
 import android.annotation.SuppressLint;
 package com.stoutner.privacybrowser.fragments;
 
 import android.annotation.SuppressLint;

+import android.content.Context;

 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.os.Build;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.os.Build;


@@ -82,38 +83,44 @@ public class AboutTabFragment extends Fragment {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

+        // Create a tab layout view.

         View tabLayout;
 
         View tabLayout;
 

+        // Get a handle for the context and assert that it isn't null.
+        Context context = getContext();
+        assert context != null;
+

         // Load the tabs.  Tab numbers start at 0.
         if (tabNumber == 0) {  // Load the about tab.
             // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.  The fragment will take care of attaching the root automatically.
             tabLayout = inflater.inflate(R.layout.about_tab_version, container, false);
 
             // Get handles for the `TextViews`.
         // Load the tabs.  Tab numbers start at 0.
         if (tabNumber == 0) {  // Load the about tab.
             // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.  The fragment will take care of attaching the root automatically.
             tabLayout = inflater.inflate(R.layout.about_tab_version, container, false);
 
             // Get handles for the `TextViews`.

-            TextView versionNumberTextView = tabLayout.findViewById(R.id.about_version_number);
-            TextView versionBrandTextView = tabLayout.findViewById(R.id.about_version_brand);
-            TextView versionManufacturerTextView = tabLayout.findViewById(R.id.about_version_manufacturer);
-            TextView versionModelTextView = tabLayout.findViewById(R.id.about_version_model);
-            TextView versionDeviceTextView = tabLayout.findViewById(R.id.about_version_device);
-            TextView versionBootloaderTextView = tabLayout.findViewById(R.id.about_version_bootloader);
-            TextView versionRadioTextView = tabLayout.findViewById(R.id.about_version_radio);
-            TextView versionAndroidTextView = tabLayout.findViewById(R.id.about_version_android);
-            TextView versionSecurityPatchTextView = tabLayout.findViewById(R.id.about_version_securitypatch);
-            TextView versionBuildTextView = tabLayout.findViewById(R.id.about_version_build);
-            TextView versionWebViewTextView = tabLayout.findViewById(R.id.about_version_webview);
-            TextView versionOrbotTextView = tabLayout.findViewById(R.id.about_version_orbot);
-            TextView versionEasyListTextView = tabLayout.findViewById(R.id.about_version_easylist);
-            TextView versionEasyPrivacyTextView = tabLayout.findViewById(R.id.about_version_easyprivacy);
-            TextView versionFanboyAnnoyanceTextView = tabLayout.findViewById(R.id.about_version_fanboy_annoyance);
-            TextView versionFanboySocialTextView = tabLayout.findViewById(R.id.about_version_fanboy_social);
-            TextView versionUltraPrivacyTextView = tabLayout.findViewById(R.id.about_version_ultraprivacy);
-            TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.about_version_certificate_issuer_dn);
-            TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.about_version_certificate_subject_dn);
-            TextView certificateStartDateTextView = tabLayout.findViewById(R.id.about_version_certificate_start_date);
-            TextView certificateEndDateTextView = tabLayout.findViewById(R.id.about_version_certificate_end_date);
-            TextView certificateVersionTextView = tabLayout.findViewById(R.id.about_version_certificate_version);
-            TextView certificateSerialNumberTextView = tabLayout.findViewById(R.id.about_version_certificate_serial_number);
-            TextView certificateSignatureAlgorithmTextView = tabLayout.findViewById(R.id.about_version_certificate_signature_algorithm);
+            TextView versionTextView = tabLayout.findViewById(R.id.version);
+            TextView brandTextView = tabLayout.findViewById(R.id.brand);
+            TextView manufacturerTextView = tabLayout.findViewById(R.id.manufacturer);
+            TextView modelTextView = tabLayout.findViewById(R.id.model);
+            TextView deviceTextView = tabLayout.findViewById(R.id.device);
+            TextView bootloaderTextView = tabLayout.findViewById(R.id.bootloader);
+            TextView radioTextView = tabLayout.findViewById(R.id.radio);
+            TextView androidTextView = tabLayout.findViewById(R.id.android);
+            TextView securityPatchTextView = tabLayout.findViewById(R.id.security_patch);
+            TextView buildTextView = tabLayout.findViewById(R.id.build);
+            TextView webViewTextView = tabLayout.findViewById(R.id.webview);
+            TextView orbotTextView = tabLayout.findViewById(R.id.orbot);
+            TextView openKeychainTextView = tabLayout.findViewById(R.id.open_keychain);
+            TextView easyListTextView = tabLayout.findViewById(R.id.easylist);
+            TextView easyPrivacyTextView = tabLayout.findViewById(R.id.easyprivacy);
+            TextView fanboyAnnoyanceTextView = tabLayout.findViewById(R.id.fanboy_annoyance);
+            TextView fanboySocialTextView = tabLayout.findViewById(R.id.fanboy_social);
+            TextView ultraPrivacyTextView = tabLayout.findViewById(R.id.ultraprivacy);
+            TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.certificate_issuer_dn);
+            TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.certificate_subject_dn);
+            TextView certificateStartDateTextView = tabLayout.findViewById(R.id.certificate_start_date);
+            TextView certificateEndDateTextView = tabLayout.findViewById(R.id.certificate_end_date);
+            TextView certificateVersionTextView = tabLayout.findViewById(R.id.certificate_version);
+            TextView certificateSerialNumberTextView = tabLayout.findViewById(R.id.certificate_serial_number);
+            TextView certificateSignatureAlgorithmTextView = tabLayout.findViewById(R.id.certificate_signature_algorithm);

 
             // Setup the labels.
             String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")";
 
             // Setup the labels.
             String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")";


@@ -158,15 +165,21 @@ public class AboutTabFragment extends Fragment {
             // Get the Orbot version name if Orbot is installed.
             String orbot;
             try {
             // Get the Orbot version name if Orbot is installed.
             String orbot;
             try {

-                // Remove the lint warning that `getContext()` might be null.
-                assert getContext() != null;
-

                 // Store the version name.
                 // Store the version name.

-                orbot = getContext().getPackageManager().getPackageInfo("org.torproject.android", PackageManager.GET_CONFIGURATIONS).versionName;
-            } catch (PackageManager.NameNotFoundException e) {  // Orbot is not installed.
+                orbot = context.getPackageManager().getPackageInfo("org.torproject.android", 0).versionName;
+            } catch (PackageManager.NameNotFoundException exception) {  // Orbot is not installed.

                 orbot = "";
             }
 
                 orbot = "";
             }
 

+            // Get the OpenKeychain version name if it is installed.
+            String openKeychain;
+            try {
+                // Store the version name.
+                openKeychain = context.getPackageManager().getPackageInfo("org.sufficientlysecure.keychain", 0).versionName;
+            } catch (PackageManager.NameNotFoundException exception) {  // OpenKeychain is not installed.
+                openKeychain = "";
+            }
+

             // Create a `SpannableStringBuilder` for the hardware and software `TextViews` that needs multiple colors of text.
             SpannableStringBuilder brandStringBuilder = new SpannableStringBuilder(brandLabel + brand);
             SpannableStringBuilder manufacturerStringBuilder = new SpannableStringBuilder(manufacturerLabel + manufacturer);
             // Create a `SpannableStringBuilder` for the hardware and software `TextViews` that needs multiple colors of text.
             SpannableStringBuilder brandStringBuilder = new SpannableStringBuilder(brandLabel + brand);
             SpannableStringBuilder manufacturerStringBuilder = new SpannableStringBuilder(manufacturerLabel + manufacturer);


@@ -210,20 +223,20 @@ public class AboutTabFragment extends Fragment {
             ultraPrivacyStringBuilder.setSpan(blueColorSpan, ultraPrivacyLabel.length(), ultraPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
             // Display the strings in the text boxes.
             ultraPrivacyStringBuilder.setSpan(blueColorSpan, ultraPrivacyLabel.length(), ultraPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
             // Display the strings in the text boxes.

-            versionNumberTextView.setText(version);
-            versionBrandTextView.setText(brandStringBuilder);
-            versionManufacturerTextView.setText(manufacturerStringBuilder);
-            versionModelTextView.setText(modelStringBuilder);
-            versionDeviceTextView.setText(deviceStringBuilder);
-            versionBootloaderTextView.setText(bootloaderStringBuilder);
-            versionAndroidTextView.setText(androidStringBuilder);
-            versionBuildTextView.setText(buildStringBuilder);
-            versionWebViewTextView.setText(webViewStringBuilder);
-            versionEasyListTextView.setText(easyListStringBuilder);
-            versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder);
-            versionFanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder);
-            versionFanboySocialTextView.setText(fanboySocialStringBuilder);
-            versionUltraPrivacyTextView.setText(ultraPrivacyStringBuilder);
+            versionTextView.setText(version);
+            brandTextView.setText(brandStringBuilder);
+            manufacturerTextView.setText(manufacturerStringBuilder);
+            modelTextView.setText(modelStringBuilder);
+            deviceTextView.setText(deviceStringBuilder);
+            bootloaderTextView.setText(bootloaderStringBuilder);
+            androidTextView.setText(androidStringBuilder);
+            buildTextView.setText(buildStringBuilder);
+            webViewTextView.setText(webViewStringBuilder);
+            easyListTextView.setText(easyListStringBuilder);
+            easyPrivacyTextView.setText(easyPrivacyStringBuilder);
+            fanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder);
+            fanboySocialTextView.setText(fanboySocialStringBuilder);
+            ultraPrivacyTextView.setText(ultraPrivacyStringBuilder);

 
             // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23.
             if (Build.VERSION.SDK_INT >= 23) {
 
             // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23.
             if (Build.VERSION.SDK_INT >= 23) {


@@ -231,29 +244,39 @@ public class AboutTabFragment extends Fragment {
                 String securityPatch = Build.VERSION.SECURITY_PATCH;
                 SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch);
                 securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 String securityPatch = Build.VERSION.SECURITY_PATCH;
                 SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch);
                 securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);

-                versionSecurityPatchTextView.setText(securityPatchStringBuilder);
-            } else {  // SDK_INT < 23, so `versionSecurityPatchTextView` should be hidden.
-                versionSecurityPatchTextView.setVisibility(View.GONE);
+                securityPatchTextView.setText(securityPatchStringBuilder);
+            } else {  // SDK_INT < 23.
+                securityPatchTextView.setVisibility(View.GONE);

             }
 
             }
 

-            // Only populate `versionRadioTextView` if there is a radio in the device.
-            if (!radio.equals("")) {
+            // Only populate the radio TextView if there is a radio in the device.
+            if (!radio.isEmpty()) {

                 String radioLabel = getString(R.string.radio) + "  ";
                 SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio);
                 radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 String radioLabel = getString(R.string.radio) + "  ";
                 SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio);
                 radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);

-                versionRadioTextView.setText(radioStringBuilder);
-            } else {  // This device does not have a radio, so `versionRadioTextView` should be hidden.
-                versionRadioTextView.setVisibility(View.GONE);
+                radioTextView.setText(radioStringBuilder);
+            } else {  // This device does not have a radio.
+                radioTextView.setVisibility(View.GONE);

             }
 
             }
 

-            // Only populate `versionOrbotTextView` if Orbot is installed.
-            if (!orbot.equals("")) {
+            // Only populate the Orbot TextView if it is installed.
+            if (!orbot.isEmpty()) {

                 String orbotLabel = getString(R.string.orbot) + "  ";
                 SpannableStringBuilder orbotStringBuilder = new SpannableStringBuilder(orbotLabel + orbot);
                 orbotStringBuilder.setSpan(blueColorSpan, orbotLabel.length(), orbotStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 String orbotLabel = getString(R.string.orbot) + "  ";
                 SpannableStringBuilder orbotStringBuilder = new SpannableStringBuilder(orbotLabel + orbot);
                 orbotStringBuilder.setSpan(blueColorSpan, orbotLabel.length(), orbotStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);

-                versionOrbotTextView.setText(orbotStringBuilder);
-            } else {  // Orbot is not installed, so the `versionOrbotTextView` should be hidden.
-                versionOrbotTextView.setVisibility(View.GONE);
+                orbotTextView.setText(orbotStringBuilder);
+            } else {  // Orbot is not installed.
+                orbotTextView.setVisibility(View.GONE);
+            }
+
+            // Only populate the EasyKeychain TextView if it is installed.
+            if (!openKeychain.isEmpty()) {
+                String openKeychainlabel = getString(R.string.open_keychain) + "  ";
+                SpannableStringBuilder openKeychainStringBuilder = new SpannableStringBuilder(openKeychainlabel + openKeychain);
+                openKeychainStringBuilder.setSpan(blueColorSpan, openKeychainlabel.length(), openKeychainStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+                openKeychainTextView.setText(openKeychainStringBuilder);
+            } else {  //OpenKeychain is not installed.
+                openKeychainTextView.setVisibility(View.GONE);

             }
 
             // Display the package signature.
             }
 
             // Display the package signature.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
index a3607dad9ebaa98bd9f947871aeb4c9cca997098..9852dd0bdd37c717928644fe507e1157f35f9376 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
@@ -43,7 +43,7 @@ public class OrbotProxyHelper {
         System.setProperty("proxyHost", proxyHost);
         System.setProperty("proxyPort", proxyPort);
 
         System.setProperty("proxyHost", proxyHost);
         System.setProperty("proxyPort", proxyPort);
 

-        // These entries shouldn't be needed if the above general settings are applied.  But I leave them in here for troubleshooting just in case.
+        // These entries shouldn't be needed if the above general settings are applied.  They are here for troubleshooting just in case.

         //System.setProperty("http.proxyHost", proxyHost);
         //System.setProperty("http.proxyPort", proxyPort);
         //System.setProperty("https.proxyHost", proxyHost);
         //System.setProperty("http.proxyHost", proxyHost);
         //System.setProperty("http.proxyPort", proxyPort);
         //System.setProperty("https.proxyHost", proxyHost);


@@ -95,7 +95,7 @@ public class OrbotProxyHelper {
         if (proxyPort.equals("8118")) {  // Orbot proxy was turned on.
             try {  // Check to see if Orbot is installed.
                 PackageManager packageManager = privacyBrowserContext.getPackageManager();
         if (proxyPort.equals("8118")) {  // Orbot proxy was turned on.
             try {  // Check to see if Orbot is installed.
                 PackageManager packageManager = privacyBrowserContext.getPackageManager();

-                packageManager.getPackageInfo("org.torproject.android", PackageManager.GET_ACTIVITIES);
+                packageManager.getPackageInfo("org.torproject.android", 0);

 
                 // Ask Orbot to connect if its current status is not "ON".
                 if (!MainWebViewActivity.orbotStatus.equals("ON")) {
 
                 // Ask Orbot to connect if its current status is not "ON".
                 if (!MainWebViewActivity.orbotStatus.equals("ON")) {

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index a973821eaceaf00d829f1683ccf18f8018da290b..1df1ef0de5c236a557859acb3ecb3bcdb29022de 100644 (file)
--- a/app/src/main/res/layout/about_tab_version.xml
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -41,7 +41,7 @@
                 `tools:ignore="ContentDescription"` suppresses the lint warning about supplying a content description for the `ImageView`,
                 which isn't needed in this case because the `ImageView` is only decorative. -->
             <ImageView
                 `tools:ignore="ContentDescription"` suppresses the lint warning about supplying a content description for the `ImageView`,
                 which isn't needed in this case because the `ImageView` is only decorative. -->
             <ImageView

-                android:id="@+id/about_version_icon"
+                android:id="@+id/icon"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@mipmap/privacy_browser"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@mipmap/privacy_browser"


@@ -50,7 +50,7 @@
                 tools:ignore="RtlSymmetry,ContentDescription" />
 
             <TextView
                 tools:ignore="RtlSymmetry,ContentDescription" />
 
             <TextView

-                android:id="@+id/about_version_privacy_browser_textview"
+                android:id="@+id/privacy_browser_textview"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="@string/privacy_browser"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="@string/privacy_browser"


@@ -58,15 +58,15 @@
                 android:textSize="22sp"
                 android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp"
                 android:textSize="22sp"
                 android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp"

-                android:layout_toEndOf="@id/about_version_icon" />
+                android:layout_toEndOf="@id/icon" />

 
             <TextView
 
             <TextView

-                android:id="@+id/about_version_number"
+                android:id="@+id/version"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:textColor="?attr/aboutText"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:textColor="?attr/aboutText"

-                android:layout_below="@id/about_version_privacy_browser_textview"
-                android:layout_toEndOf="@id/about_version_icon" />
+                android:layout_below="@id/privacy_browser_textview"
+                android:layout_toEndOf="@id/icon" />

         </RelativeLayout>
 
         <!-- The purpose of this `LinearLayout` is to provide padding on the start of the `TextViews` to make them line up with `about_version_icon`.
         </RelativeLayout>
 
         <!-- The purpose of this `LinearLayout` is to provide padding on the start of the `TextViews` to make them line up with `about_version_icon`.


@@ -89,32 +89,32 @@
                 android:textColor="?attr/aboutTitle" />
 
             <TextView
                 android:textColor="?attr/aboutTitle" />
 
             <TextView

-                android:id="@+id/about_version_brand"
+                android:id="@+id/brand"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_manufacturer"
+                android:id="@+id/manufacturer"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_model"
+                android:id="@+id/model"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_device"
+                android:id="@+id/device"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_bootloader"
+                android:id="@+id/bootloader"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_radio"
+                android:id="@+id/radio"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 


@@ -129,30 +129,35 @@
                 android:paddingTop="12dp" />
 
             <TextView
                 android:paddingTop="12dp" />
 
             <TextView

-                android:id="@+id/about_version_android"
+                android:id="@+id/android"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_securitypatch"
+                android:id="@+id/security_patch"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_build"
+                android:id="@+id/build"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_webview"
+                android:id="@+id/webview"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_orbot"
+                android:id="@+id/orbot"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 

+            <TextView
+                android:id="@+id/open_keychain"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"/>
+

             <!-- Block Lists. -->
             <TextView
                 android:layout_height="wrap_content"
             <!-- Block Lists. -->
             <TextView
                 android:layout_height="wrap_content"


@@ -164,27 +169,27 @@
                 android:paddingTop="12dp" />
 
             <TextView
                 android:paddingTop="12dp" />
 
             <TextView

-                android:id="@+id/about_version_easylist"
+                android:id="@+id/easylist"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_easyprivacy"
+                android:id="@+id/easyprivacy"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_fanboy-annoyance"
+                android:id="@+id/fanboy_annoyance"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_fanboy-social"
+                android:id="@+id/fanboy_social"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_ultraprivacy"
+                android:id="@+id/ultraprivacy"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 


@@ -199,37 +204,37 @@
                 android:paddingTop="12dp" />
 
             <TextView
                 android:paddingTop="12dp" />
 
             <TextView

-                android:id="@+id/about_version_certificate_issuer_dn"
+                android:id="@+id/certificate_issuer_dn"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_subject_dn"
+                android:id="@+id/certificate_subject_dn"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_start_date"
+                android:id="@+id/certificate_start_date"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_end_date"
+                android:id="@+id/certificate_end_date"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_version"
+                android:id="@+id/certificate_version"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_serial_number"
+                android:id="@+id/certificate_serial_number"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView

-                android:id="@+id/about_version_certificate_signature_algorithm"
+                android:id="@+id/certificate_signature_algorithm"

                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
         </LinearLayout>
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
         </LinearLayout>

diff --git a/app/src/main/res/layout/import_export_coordinatorlayout.xml b/app/src/main/res/layout/import_export_coordinatorlayout.xml
index f3c7cefeb4b2cf9a2b81309f9e2cd87336ab19ef..67b0cfd759de541c22fdea3a8b3def9a859db6aa 100644 (file)
--- a/app/src/main/res/layout/import_export_coordinatorlayout.xml
+++ b/app/src/main/res/layout/import_export_coordinatorlayout.xml
@@ -72,7 +72,10 @@
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"
                         android:orientation="vertical"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"
                         android:orientation="vertical"

-                        android:layout_margin="10dp" >
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="20dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp" >

 
                         <TextView
                             android:layout_width="wrap_content"
 
                         <TextView
                             android:layout_width="wrap_content"


@@ -104,11 +107,34 @@
                                 android:hint="@string/password"
                                 android:inputType="textPassword"/>
                         </android.support.design.widget.TextInputLayout>
                                 android:hint="@string/password"
                                 android:inputType="textPassword"/>
                         </android.support.design.widget.TextInputLayout>

+
+                        <!-- KitKat password encryption message. -->
+                        <TextView
+                            android:id="@+id/kitkat_password_encryption_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="10dp"
+                            android:text="@string/kitkat_password_encryption_message"
+                            android:textColor="?android:textColorPrimary"
+                            android:textAlignment="center" />
+
+                        <!-- OpenKeychain required message. -->
+                        <TextView
+                            android:id="@+id/openkeychain_required_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="10dp"
+                            android:text="@string/openkeychain_required"
+                            android:textColor="?android:textColorPrimary"
+                            android:textAlignment="center" />

                     </LinearLayout>
                 </android.support.v7.widget.CardView>
 
                 <!-- The file location card. -->
                 <android.support.v7.widget.CardView
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
 
                 <!-- The file location card. -->
                 <android.support.v7.widget.CardView

+                    android:id="@+id/file_location_cardview"

                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     android:layout_marginTop="5dp"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     android:layout_marginTop="5dp"


@@ -121,7 +147,10 @@
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"
                         android:orientation="vertical"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"
                         android:orientation="vertical"

-                        android:layout_margin="10dp" >
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="20dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp" >

 
                         <TextView
                             android:layout_width="wrap_content"
 
                         <TextView
                             android:layout_width="wrap_content"


@@ -133,14 +162,31 @@
                             android:textStyle="bold"
                             android:textColor="?colorAccent" />
 
                             android:textStyle="bold"
                             android:textColor="?colorAccent" />
 

-                        <Spinner
-                            android:id="@+id/import_export_spinner"
+                        <RadioGroup

                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"

-                            android:layout_gravity="center_horizontal" />
+                            android:layout_gravity="center_horizontal"
+                            android:orientation="horizontal" >
+
+                            <RadioButton
+                                android:id="@+id/import_radiobutton"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/import_button"
+                                android:layout_marginEnd="10dp"
+                                android:onClick="onClickRadioButton" />
+
+                            <RadioButton
+                                android:id="@+id/export_radiobutton"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/export"
+                                android:onClick="onClickRadioButton" />
+                        </RadioGroup>

 
                         <!-- Align the EditText and the select file button horizontally. -->
                         <LinearLayout
 
                         <!-- Align the EditText and the select file button horizontally. -->
                         <LinearLayout

+                            android:id="@+id/file_name_linearlayout"

                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:orientation="horizontal"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:orientation="horizontal"


@@ -170,11 +216,23 @@
                                 android:onClick="browse" />
                         </LinearLayout>
 
                                 android:onClick="browse" />
                         </LinearLayout>
 

+                        <!-- OpenKeychain import instructions -->
+                        <TextView
+                            android:id="@+id/openkeychain_import_instructions_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="5dp"
+                            android:text="@string/openkeychain_import_instructions"
+                            android:textColor="?android:textColorPrimary"
+                            android:textAlignment="center" />
+

                         <Button
                             android:id="@+id/import_export_button"
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_gravity="center_horizontal"
                         <Button
                             android:id="@+id/import_export_button"
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_gravity="center_horizontal"

+                            android:layout_marginTop="10dp"

                             android:text="@string/import_button"
                             android:textSize="18sp"
                             android:onClick="importExport"
                             android:text="@string/import_button"
                             android:textSize="18sp"
                             android:onClick="importExport"

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1ccd90a48df4f4b1cc32678a3b497df2c52d2d93..13daf274f438b882a5d4936e288ade16ea16033d 100644 (file)
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -314,10 +314,6 @@
     <string name="load_an_encrypted_website">Cargar una página web cifrada antes de abrir la configuración de dominio para rellenar el certificado SSL de la página web actual.</string>
 
     <!-- Import/Export. -->
     <string name="load_an_encrypted_website">Cargar una página web cifrada antes de abrir la configuración de dominio para rellenar el certificado SSL de la página web actual.</string>
 
     <!-- Import/Export. -->

-    <string-array name="import_export_spinner">
-        <item>Importar</item>
-        <item>Exportar</item>
-    </string-array>

     <string name="browse">Navegar</string>
     <string name="export">Exportar</string>
     <string name="import_button">Importar</string>  <!-- `import` is a reserved word and cannot be used as the name -->
     <string name="browse">Navegar</string>
     <string name="export">Exportar</string>
     <string name="import_button">Importar</string>  <!-- `import` is a reserved word and cannot be used as the name -->

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 028fb372f951e4c26b6c22e52f772317cc138289..f7feb02374f89341eeeaeb70cdfc159b13f9eb96 100644 (file)
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -313,10 +313,6 @@
     <string name="load_an_encrypted_website">Carica un sito Web criptato prima di aprire le impostazioni dei domini per popolare il certificato SSL del sito attuale.</string>
 
     <!-- Import/Export. -->
     <string name="load_an_encrypted_website">Carica un sito Web criptato prima di aprire le impostazioni dei domini per popolare il certificato SSL del sito attuale.</string>
 
     <!-- Import/Export. -->

-    <string-array name="import_export_spinner">
-        <item>Importa</item>
-        <item>Esporta</item>
-    </string-array>

     <string name="browse">Sfoglia</string>
     <string name="export">Esporta</string>
     <string name="import_button">Importa</string>  <!-- `import` is a reserved word and cannot be used as the name -->
     <string name="browse">Sfoglia</string>
     <string name="export">Esporta</string>
     <string name="import_button">Importa</string>  <!-- `import` is a reserved word and cannot be used as the name -->

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a9025b1ca19b874ab718f93667284643edd3933e..4f4507133e03270521a137e6f158cd8da03a49c7 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -314,10 +314,6 @@
     <string name="load_an_encrypted_website">Откройте зашифрованный сайт перед настройкой домена, чтобы заполнить текущий сертификат SSL веб-сайта.</string>
 
     <!-- Import/Export. -->
     <string name="load_an_encrypted_website">Откройте зашифрованный сайт перед настройкой домена, чтобы заполнить текущий сертификат SSL веб-сайта.</string>
 
     <!-- Import/Export. -->

-    <string-array name="import_export_spinner">
-        <item>Импорт</item>
-        <item>Экспорт</item>
-    </string-array>

     <string name="browse">Обзор</string>
     <string name="export">Экспорт</string>
     <string name="import_button">Импорт</string>  <!-- `import` is a reserved word and cannot be used as the name -->
     <string name="browse">Обзор</string>
     <string name="export">Экспорт</string>
     <string name="import_button">Импорт</string>  <!-- `import` is a reserved word and cannot be used as the name -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad2c49c982ad1264450e7094bd5193d5e3d20c52..3018e971bc2ef89e886ce17c0135fc3f76f489ef 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingTranslation" >
 
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingTranslation" >
 

+    <!-- Providers. -->
+    <string name="file_provider" translatable="false">com.stoutner.privacybrowser.fileprovider.standard</string>
+

     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser</string>
     <string name="privacy_browser_settings">Privacy Browser Settings</string>
     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser</string>
     <string name="privacy_browser_settings">Privacy Browser Settings</string>


@@ -319,16 +322,16 @@
     <string-array name="encryption_type">
         <item>None</item>
         <item>Password</item>
     <string-array name="encryption_type">
         <item>None</item>
         <item>Password</item>

-        <item>GPG</item>
+        <item>OpenPGP</item>

     </string-array>
     </string-array>

+    <string name="kitkat_password_encryption_message">Password encryption does not work on Android KitKat.</string>
+    <string name="openkeychain_required">OpenPGP encryption requires that OpenKeychain be installed.</string>
+    <string name="openkeychain_import_instructions">The unencrypted file will have to be imported in a separate step after it is decrypted.</string>

     <string name="file_location">File Location</string>
     <string name="file_location">File Location</string>

-    <string-array name="import_export_spinner">
-        <item>Import</item>
-        <item>Export</item>
-    </string-array>

     <string name="browse">Browse</string>
     <string name="export">Export</string>
     <string name="import_button">Import</string>  <!-- `import` is a reserved word and cannot be used as the name -->
     <string name="browse">Browse</string>
     <string name="export">Export</string>
     <string name="import_button">Import</string>  <!-- `import` is a reserved word and cannot be used as the name -->

+    <string name="decrypt">Decrypt</string>

     <string name="export_successful">Export successful.</string>
     <string name="export_failed">Export failed:</string>
     <string name="import_failed">Import failed:</string>
     <string name="export_successful">Export successful.</string>
     <string name="export_failed">Export failed:</string>
     <string name="import_failed">Import failed:</string>


@@ -590,6 +593,7 @@
             <string name="security_patch">Security Patch:</string>
             <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="security_patch">Security Patch:</string>
             <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>

+            <string name="open_keychain">OpenKeychain:</string>

             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
             <string name="fanboy_annoyance_label">Fanboy’s Annoyance List:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
             <string name="fanboy_annoyance_label">Fanboy’s Annoyance List:</string>

diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
new file mode 100644 (file)
index 0000000..6fb0864
--- /dev/null
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright © 2018 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/>. -->
+
+<paths>
+    <cache-path
+        name="private-cache-directory"
+        path="." />
+    
+    <external-files-path
+        name="external-app-directories"
+        path="." />
+
+    <external-path
+        name="external-directories"
+        path="." />
+</paths>
\ No newline at end of file