tls-psk: add link from secret key view

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java

@@ -54,7 +54,7 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
     static final int ID_ENCRYPT_DECRYPT = 2;
     static final int ID_APPS = 3;
     static final int ID_BACKUP = 4;
-    static final int ID_TRANSFER = 5;
+    public static final int ID_TRANSFER = 5;
     static final int ID_SETTINGS = 6;
     static final int ID_HELP = 7;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java

@@ -371,6 +371,13 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
                 startPassphraseActivity(REQUEST_BACKUP);
                 return true;
             }
+            case R.id.menu_key_view_skt: {
+                Intent intent = new Intent(this, MainActivity.class);
+                intent.putExtra(MainActivity.EXTRA_INIT_FRAG, MainActivity.ID_TRANSFER);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
+                return true;
+            }
             case R.id.menu_key_view_delete: {
                 deleteKey();
                 return true;
@@ -405,6 +412,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
     public boolean onPrepareOptionsMenu(Menu menu) {
         MenuItem backupKey = menu.findItem(R.id.menu_key_view_backup);
         backupKey.setVisible(mIsSecret);
+        menu.findItem(R.id.menu_key_view_skt).setVisible(mIsSecret);
         MenuItem changePassword = menu.findItem(R.id.menu_key_change_password);
         changePassword.setVisible(mIsSecret);
 

OpenKeychain/src/main/res/layout/create_key_start_fragment.xml

@@ -124,7 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
-            android:text="@string/first_time_secure_device_setup"
+            android:text="@string/first_time_secure_wifi_transfer"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_chevron_right_grey_24dp"

OpenKeychain/src/main/res/menu/key_view.xml

@@ -18,6 +18,11 @@
         android:title="@string/menu_export_key"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_key_view_skt"
+        android:title="@string/menu_secure_wifi_transfer"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_key_view_delete"
         android:icon="@drawable/ic_delete_grey_24dp"

OpenKeychain/src/main/res/values/strings.xml

@@ -1907,7 +1907,8 @@
     <string name="transfer_not_available">"Sorry, this feature can only be used on Android 5 or newer :("</string>
     <string name="transfer_list_empty">"No keys on this device that could be sent.  Waiting for incoming keys…"</string>
     <string name="transfer_connecting">"Connecting…"</string>
-    <string name="first_time_secure_device_setup">"Secure Wifi Transfer"</string>
+    <string name="first_time_secure_wifi_transfer">"Secure Wifi Transfer"</string>
+    <string name="menu_secure_wifi_transfer">"Secure Wifi Transfer"</string>
     <string name="transfer_confirm_cancel">"Cancel"</string>
     <string name="transfer_confirm_ok">"Send"</string>
     <string name="transfer_confirm_title">"Send your key?"</string>