From e17a17a8e840230651cb6f7d9f9d46e252637e77 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 Jan 2023 12:14:11 +0530
Subject: fix(app): address UI inconsistencies in proxy configuration screen

---
 app/src/main/AndroidManifest.xml                      |  1 +
 .../passwordstore/ui/proxy/ProxySelectorActivity.kt   | 19 +++++++++++++++++--
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e187240d..19bd6845 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,7 @@
     <activity
       android:name=".ui.proxy.ProxySelectorActivity"
       android:exported="false"
+      android:label="@string/activity_proxy_label"
       android:windowSoftInputMode="adjustResize" />
 
     <activity
diff --git a/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt b/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt
index f7833a1c..833f14c7 100644
--- a/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt
@@ -12,6 +12,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Patterns
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.core.os.postDelayed
@@ -27,8 +28,6 @@ import app.passwordstore.util.settings.PreferenceKeys
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
-private val WEB_ADDRESS_REGEX = Patterns.WEB_URL.toRegex()
-
 @AndroidEntryPoint
 class ProxySelectorActivity : AppCompatActivity() {
 
@@ -36,9 +35,11 @@ class ProxySelectorActivity : AppCompatActivity() {
   @ProxyPreferences @Inject lateinit var proxyPrefs: SharedPreferences
   @Inject lateinit var proxyUtils: ProxyUtils
   private val binding by viewBinding(ActivityProxySelectorBinding::inflate)
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(binding.root)
+    supportActionBar?.setDisplayHomeAsUpEnabled(true)
     with(binding) {
       proxyHost.setText(proxyPrefs.getString(PreferenceKeys.PROXY_HOST))
       proxyUser.setText(proxyPrefs.getString(PreferenceKeys.PROXY_USERNAME))
@@ -61,6 +62,16 @@ class ProxySelectorActivity : AppCompatActivity() {
     }
   }
 
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    when (item.itemId) {
+      android.R.id.home -> {
+        onBackPressedDispatcher.onBackPressed()
+      }
+      else -> return super.onOptionsItemSelected(item)
+    }
+    return true
+  }
+
   private fun isNumericAddress(text: CharSequence): Boolean {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       InetAddresses.isNumericAddress(text as String)
@@ -91,4 +102,8 @@ class ProxySelectorActivity : AppCompatActivity() {
     proxyUtils.setDefaultProxy()
     Handler(Looper.getMainLooper()).postDelayed(500) { finish() }
   }
+
+  private companion object {
+    private val WEB_ADDRESS_REGEX = Patterns.WEB_URL.toRegex()
+  }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3840c0bc..c59d3486 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -344,6 +344,7 @@
   <string name="git_scheme_disallowed_message">The git protocol provided by git-daemon performs no transport encryption and is unsuitable for secure operations.</string>
 
   <!-- Proxy configuration activity -->
+  <string name="activity_proxy_label">Proxy settings</string>
   <string name="proxy_hostname">Proxy hostname</string>
   <string name="port">Port</string>
   <string name="pref_edit_proxy_settings">HTTP(S) proxy settings</string>
-- 
cgit v1.2.3