[tor-commits] [orbot/master] small v3 text updates

[n8fr8 at torproject.org]

commit f3bfaa15a5d167809cf4fc988626ecb102053602
Author: bim <dsnake at protonmail.com>
Date:   Sat Feb 6 15:34:22 2021 -0500

    small v3 text updates
---
 .../android/ui/v3onionservice/clientauth/ClientAuthActivity.java    | 4 ++--
 app/src/main/res/menu/v3_client_auth_menu.xml                       | 6 ++++++
 app/src/main/res/values/strings.xml                                 | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
index b24b81f7..e33ddf78 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
@@ -101,7 +101,7 @@ public class ClientAuthActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_restore_backup) {
+        if (item.getItemId() == R.id.menu_import_auth_priv) {
             if (DiskUtils.supportsStorageAccessFramework()) {
                 Intent readFileIntent = DiskUtils.createReadFileIntent("text/*");
                 startActivityForResult(readFileIntent, REQUEST_CODE_READ_ZIP_BACKUP);
@@ -134,7 +134,7 @@ public class ClientAuthActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.hs_menu, menu);
+        getMenuInflater().inflate(R.menu.v3_client_auth_menu, menu);
         return true;
     }
 
diff --git a/app/src/main/res/menu/v3_client_auth_menu.xml b/app/src/main/res/menu/v3_client_auth_menu.xml
new file mode 100644
index 00000000..757c17c4
--- /dev/null
+++ b/app/src/main/res/menu/v3_client_auth_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_import_auth_priv"
+        android:title="@string/v3_import_auth_private" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a624ccc4..89ca6643 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,13 +168,14 @@
     <string name="v3_hosted_services">Hosted v3 Onion Services</string>
     <string name="v3_client_auth">v3 Onion Service Client Authorization</string>
     <string name="v3_client_auth_activity_title">v3 Client Authorization</string>
-    <string name="v3_key_hash">X25519 Private Key in Base 32</string>
+    <string name="v3_key_hash">x25519 Private Key in Base 32</string>
     <string name="v3_onion">v3 .onion Domain</string>
     <string name="v3_backup_key">Backup Client Authorization Key</string>
     <string name="v3_backup_key_warning">Warning: This Could Expose Your Key to Other Apps</string>
     <string name="v3_delete_client_authorization">Delete Client Authorization Key</string>
     <string name="v3_delete_client_authorization_confirm">Delete Client Authorization</string>
     <string name="v3_backup_name_hint">Backup filename…</string>
+    <string name="v3_import_auth_private">Import .auth_private</string>
     <string name="confirm">Confirm</string>
     <string name="title_activity_hidden_services">Onion Services</string>
     <string name="menu_hidden_services">Onion Services</string>