diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index 0fa63c4b4..015161c9e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/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; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java index f7b08944a..670439481 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java +++ b/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); diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml index ba34d4941..6b8d4a027 100644 --- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml +++ b/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" diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 0e5a43007..e16b3a152 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -18,6 +18,11 @@ android:title="@string/menu_export_key" app:showAsAction="never" /> + + "Sorry, this feature can only be used on Android 5 or newer :(" "No keys on this device that could be sent. Waiting for incoming keys…" "Connecting…" - "Secure Wifi Transfer" + "Secure Wifi Transfer" + "Secure Wifi Transfer" "Cancel" "Send" "Send your key?"