Updates about_licenses, adding the full text of the Apache License 2.0 and the 3...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / AboutTabFragment.java

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 ad0708dedcc7e44546afd9b5a815984252536c8a..955dca253f7ed60f828a9823f7dff3fae56b1de7 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -91,6 +91,7 @@ public class AboutTabFragment extends Fragment {
             TextView versionSecurityPatchTextView = (TextView) tabLayout.findViewById(R.id.about_version_securitypatch);
             TextView versionWebKitTextView = (TextView) tabLayout.findViewById(R.id.about_version_webkit);
             TextView versionChromeTextView = (TextView) tabLayout.findViewById(R.id.about_version_chrome);
+            TextView versionOrbotTextView = (TextView) tabLayout.findViewById(R.id.about_version_orbot);
             TextView certificateIssuerDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_issuer_dn);
             TextView certificateSubjectDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_subject_dn);
             TextView certificateStartDateTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_start_date);
@@ -137,7 +138,16 @@ public class AboutTabFragment extends Fragment {
             // Select the substring that begins after "Chrome/" and goes until the next " ".
             String chrome = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/")));
 
-            // Create a `SpannableStringBuilder` for each `TextView` that needs multiple colors of text.
+            // Get the Orbot version name if Orbot is installed.
+            String orbot;
+            try {
+                // Store the version name.
+                orbot = getContext().getPackageManager().getPackageInfo("org.torproject.android", PackageManager.GET_CONFIGURATIONS).versionName;
+            } catch (PackageManager.NameNotFoundException e) {  // Orbot is not installed.
+                orbot = "";
+            }
+
+            // 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);
             SpannableStringBuilder modelStringBuilder = new SpannableStringBuilder(modelLabel + model);
@@ -181,7 +191,7 @@ public class AboutTabFragment extends Fragment {
                 SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch);
                 securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 versionSecurityPatchTextView.setText(securityPatchStringBuilder);
-            } else { // Hide `versionSecurityPatchTextView`.
+            } else {  // SDK_INT < 23, so `versionSecurityPatchTextView` should be hidden.
                 versionSecurityPatchTextView.setVisibility(View.GONE);
             }
 
@@ -191,10 +201,20 @@ public class AboutTabFragment extends Fragment {
                 SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio);
                 radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                 versionRadioTextView.setText(radioStringBuilder);
-            } else { // Hide `versionRadioTextView`.
+            } else {  // This device does not have a radio, so `versionRadioTextView` should be hidden.
                 versionRadioTextView.setVisibility(View.GONE);
             }
 
+            // Only populate `versionOrbotTextView` if Orbot is installed.
+            if (!orbot.equals("")) {
+                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);
+            }
+
             // Display the package signature.
             try {
                 // Get the first package signature.  Suppress the lint warning about the need to be careful in implementing comparison of certificates for security purposes.