Merge branch 'master' of github.com:guardianproject/orbot

guardianproject · Mar 17, 2023 · 79b343c · 79b343c
2 parents aa57bb9 + 79c096a
commit 79b343c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,22 +42,15 @@ android {
     productFlavors {
         fullperm {
             dimension "free"
-
-            minSdkVersion 18
             applicationId 'org.torproject.android'
-            targetSdkVersion 31
-            versionCode 1700200300
-
+            versionCode 1700200400
             versionName getVersionName()
             archivesBaseName = "Orbot-${versionName}"
         }
 
         nightly {
             dimension "free"
-
-            minSdkVersion 18
             applicationId 'org.torproject.android.nightly'
-            targetSdkVersion 31
             versionName getVersionName()
             versionCode versionCodeEpoch()
             archivesBaseName = "Orbot-${versionName}"

diff --git a/app/src/main/java/org/torproject/android/ConnectFragment.kt b/app/src/main/java/org/torproject/android/ConnectFragment.kt
@@ -276,15 +276,15 @@ class ConnectFragment : Fragment(), ConnectionHelperCallbacks, ExitNodeDialogFra
         with(btnStartVpn) {
             visibility = View.VISIBLE
 
-            var connectStr = context.getString(R.string.action_use) + ' '
+            var connectStr = ""
             if (Prefs.getConnectionPathway().equals(Prefs.PATHWAY_DIRECT))
-                connectStr += getString(R.string.direct_connect);
+                connectStr = context.getString(R.string.action_use) + ' ' + getString(R.string.direct_connect);
             else if (Prefs.getConnectionPathway().equals(Prefs.PATHWAY_SNOWFLAKE))
-                connectStr += getString(R.string.snowflake);
+                connectStr = context.getString(R.string.action_use) + ' ' + getString(R.string.snowflake);
             else if (Prefs.getConnectionPathway().equals(Prefs.PATHWAY_SNOWFLAKE_AMP))
-                connectStr += getString(R.string.snowflake_amp);
+                connectStr = context.getString(R.string.action_use) + ' ' + getString(R.string.snowflake_amp);
             else if (Prefs.getConnectionPathway().equals(Prefs.PATHWAY_CUSTOM))
-                connectStr += getString(R.string.custom_bridge);
+                connectStr = context.getString(R.string.action_use) + ' ' + getString(R.string.custom_bridge);
 
             text = if (Prefs.isPowerUserMode())
                 getString(R.string.connect)