Kindness Mode UX Update

app/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
         tools:ignore="ForegroundServicesPolicy" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -45,11 +46,11 @@
     <application
         android:name=".OrbotApp"
         android:allowBackup="false"
-        android:fullBackupContent="false"
         android:allowClearUserData="true"
         android:configChanges="locale|orientation|screenSize"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:description="@string/app_description"
+        android:fullBackupContent="false"
         android:hasFragileUserData="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -120,6 +121,11 @@
             android:foregroundServiceType="remoteMessaging"
             android:stopWithTask="false" />
 
+        <service
+            android:name=".ui.kindness.TestTorForSnowflakeProxyService"
+            android:enabled="true"
+            android:stopWithTask="true" />
+
 
         <service
             android:name=".service.OrbotService"

app/src/main/java/org/torproject/android/Regionalization.kt

@@ -1,11 +1,13 @@
 package org.torproject.android
 
+import org.torproject.android.util.Prefs
 import java.util.Locale
 
 object Regionalization {
+
     // converts a code like "ES" into "Spain", "Espagne", etc. based on the users current locale
     @JvmStatic
-    fun getLocalizedNameForCountryCode(countryCode: String): String =
+    fun getLocalizedNameForCountryCode(countryCode: String? = Prefs.bridgeCountry): String =
         Locale.Builder().setRegion(countryCode).build().displayCountry
 
 
@@ -19,6 +21,9 @@ object Regionalization {
         return String(Character.toChars(firstChar)) + String(Character.toChars(secondChar))
     }
 
+    fun isKindnessModeDisabledForCountry(countryCode: String? = Prefs.bridgeCountry): Boolean =
+        listOf(AFGHANISTAN, IRAN).contains(countryCode?.uppercase())
+
     fun getCountriesForExitNodeUi(): List<String> =
         listOf(
             GERMANY, AUSTRIA, SWEDEN,

app/src/main/java/org/torproject/android/service/OrbotConstants.kt

@@ -145,9 +145,6 @@ object OrbotConstants {
         "app.accrescent.client"
     )
 
-    const val ONION_EMOJI: String = "\uD83E\uDDC5"
-
-
     // Constants for getting bridges in semi-manual ways.
 
     val GET_BRIDES_BRIDGES_URI = "https://bridges.torproject.org/".toUri()

app/src/main/java/org/torproject/android/service/OrbotService.java

@@ -758,10 +758,6 @@ public void onReceive(Context context, Intent intent) {
                     // hack for https://github.com/guardianproject/tor-android/issues/73 remove when fixed
                     var newStatus = intent.getStringExtra(EXTRA_STATUS);
 
-                    if (STATUS_ON.equals(newStatus) && Prefs.getTransport() == Transport.NONE && !Prefs.getHasDirectConnected()) {
-                        Prefs.setHasDirectConnected(true);
-                    }
-
                     if (STATUS_OFF.equals(mCurrentStatus) && STATUS_STOPPING.equals(newStatus))
                         break;
                     mCurrentStatus = newStatus;

app/src/main/java/org/torproject/android/service/circumvention/BuiltInBridges.kt

@@ -135,7 +135,7 @@ data class BuiltInBridges(
      */
     fun getUdpDnstt(context: Context, countryCode: String?): List<Bridge>? {
         if (countryCode.isNullOrEmpty()) return null
-        if (countryCode != "global" && !dnsCountries.contains(countryCode.lowercase())) return null
+        if (countryCode != "global" && !Regionalization.getCountriesWithDnsttSupport().contains(countryCode)) return null
 
         val dnsInfo: DnsInfo
 

app/src/main/java/org/torproject/android/ui/OrbotBottomSheetDialogFragment.kt

@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.FrameLayout
 
@@ -21,7 +22,9 @@ import org.torproject.android.R
 Class to set up default bottom sheet behavior for Config Connection, MOAT and any other
 bottom sheets to come
  */
-open class OrbotBottomSheetDialogFragment : BottomSheetDialogFragment() {
+open class OrbotBottomSheetDialogFragment(
+    val minMode: Boolean = false
+) : BottomSheetDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = BottomSheetDialog(requireActivity(), theme)
         dialog.setOnShowListener {
@@ -30,25 +33,33 @@ open class OrbotBottomSheetDialogFragment : BottomSheetDialogFragment() {
             bottomSheetView?.let {
                 it.setBackgroundResource(R.drawable.bottom_sheet_rounded)
                 it.setBackgroundColor(Color.TRANSPARENT)
-                setHeightResponsive(it)
                 val behavior = BottomSheetBehavior.from(it)
+                setHeightResponsive(it, behavior)
                 behavior.state = BottomSheetBehavior.STATE_EXPANDED
             }
         }
 
         return dialog
     }
 
-    private fun setHeightResponsive(bottomSheet: View) {
+    private fun setHeightResponsive(bottomSheet: View, behavior: BottomSheetBehavior<*>) {
         val windowMetrics = WindowMetricsCalculator
             .getOrCreate()
             .computeCurrentWindowMetrics(requireActivity())
 
         val windowHeight = windowMetrics.bounds.height()
         val height = (windowHeight * getHeightRatio()).toInt()
-
         val layoutParams = bottomSheet.layoutParams
-        layoutParams.height = height
+
+        if (minMode) {
+            behavior.maxHeight = height
+
+            layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        }
+        else {
+            layoutParams.height = height
+        }
+
         bottomSheet.layoutParams = layoutParams
     }
 

app/src/main/java/org/torproject/android/ui/connect/ConfigConnectionBottomSheet.kt

@@ -26,7 +26,6 @@ import org.torproject.android.Regionalization
 import org.torproject.android.databinding.ConfigConnectionBottomSheetBinding
 import org.torproject.android.service.OrbotConstants
 import org.torproject.android.service.circumvention.AutoConf
-import org.torproject.android.service.circumvention.BuiltInBridges
 import org.torproject.android.service.circumvention.Transport
 import org.torproject.android.util.Prefs
 import org.torproject.android.ui.OrbotBottomSheetDialogFragment
@@ -90,7 +89,9 @@ class ConfigConnectionBottomSheet :
         binding.acCountry.onItemClickListener = this
 
         binding.dnsttContainer.visibility =
-            if (BuiltInBridges.dnsCountries.contains(selectedCountryCode?.lowercase())) View.VISIBLE else View.GONE
+            if (Regionalization.getCountriesWithDnsttSupport()
+                    .contains(selectedCountryCode)
+            ) View.VISIBLE else View.GONE
 
         radios = arrayListOf(
             binding.rbDirect,
@@ -428,7 +429,7 @@ class ConfigConnectionBottomSheet :
     }
 
     private fun updateDnsttVisibility() {
-        if (BuiltInBridges.dnsCountries.contains(selectedCountryCode?.lowercase())) {
+        if (Regionalization.getCountriesWithDnsttSupport().contains(selectedCountryCode)) {
             binding.dnsttContainer.visibility = View.VISIBLE
         } else {
             binding.dnsttContainer.visibility = View.GONE

app/src/main/java/org/torproject/android/ui/connect/ConnectUiState.kt

@@ -1,6 +1,12 @@
 package org.torproject.android.ui.connect
 
 sealed class ConnectUiState {
+    /**
+     * NoInternet can mean two things, the device doesn't have *any* reliable WiFi/Cellular/USB signal
+     * TODO If the device has a VALID WIFI CONNECTION, but the device is using another VPN that is
+     * blocking Orbot from connecting to the web, NoInternet DOES NOT REGISTER, even though Orbot
+     * is effectively offline...
+     */
     object NoInternet : ConnectUiState()
     object Off : ConnectUiState()
     data class Starting(val bootstrapPercent: Int?) : ConnectUiState()

app/src/main/java/org/torproject/android/ui/kindness/KindnessConfigBottomSheet.kt

@@ -4,45 +4,45 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import androidx.appcompat.widget.SwitchCompat
-import androidx.fragment.app.FragmentActivity
-import org.torproject.android.R
-import org.torproject.android.util.Prefs
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.setFragmentResult
+import org.torproject.android.databinding.KindnessConfigBottomSheetBinding
 import org.torproject.android.ui.OrbotBottomSheetDialogFragment
+import org.torproject.android.util.Prefs
 
-class KindnessConfigBottomSheet : OrbotBottomSheetDialogFragment() {
+class KindnessConfigBottomSheet : OrbotBottomSheetDialogFragment(true) {
 
-    private lateinit var btnAction: Button
+    private lateinit var mBinding: KindnessConfigBottomSheetBinding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        val v = inflater.inflate(R.layout.kindess_config_bottom_sheet, container, false)
-        v.findViewById<View>(R.id.tvCancel).setOnClickListener { dismiss() }
-        btnAction = v.findViewById(R.id.btnAction)
+    ): View {
+        mBinding = KindnessConfigBottomSheetBinding.inflate(inflater, container, false)
+
+        mBinding.tvCancel.setOnClickListener { dismiss() }
 
-        val configWifi = v.findViewById<SwitchCompat>(R.id.swKindnessConfigWifi)
-        val configCharging = v.findViewById<SwitchCompat>(R.id.swKindnessConfigCharging)
+        mBinding.btnAction.setOnClickListener {
+            Prefs.setBeSnowflakeProxyLimitWifi(mBinding.swKindnessConfigWifi.isChecked)
+            Prefs.setBeSnowflakeProxyLimitCharging(mBinding.swKindnessConfigCharging.isChecked)
 
-        btnAction.setOnClickListener {
-            Prefs.setBeSnowflakeProxyLimitWifi(configWifi.isChecked)
-            Prefs.setBeSnowflakeProxyLimitCharging(configCharging.isChecked)
+            setFragmentResult(KEY_CONFIG_CHANGED, Bundle())
             dismiss()
         }
 
-        configWifi.isChecked = Prefs.limitSnowflakeProxyingWifi()
-        configCharging.isChecked = Prefs.limitSnowflakeProxyingCharging()
-        return v
+        mBinding.swKindnessConfigWifi.isChecked = Prefs.limitSnowflakeProxyingWifi()
+        mBinding.swKindnessConfigCharging.isChecked = Prefs.limitSnowflakeProxyingCharging()
+
+        return mBinding.root
     }
 
     companion object {
-        fun openKindnessSettings(fragmentActivity: FragmentActivity) {
+        const val KEY_CONFIG_CHANGED = "kindness_config_changed"
+
+        fun show(fragmentManager: FragmentManager) {
             KindnessConfigBottomSheet().show(
-                fragmentActivity.supportFragmentManager,
+                fragmentManager,
                 "KindnessConfig"
             )
         }
     }
-
-}
+}