PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

tls-psk: add link from secret key view

Browse source
This commit is contained in:
Vincent Breitmoser 2017-06-29 00:13:02 +02:00
parent 33313824ce
commit c6c1222eed
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
View file

@ -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;

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

@ -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);

2
OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
View file

@ -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"

5
OpenKeychain/src/main/res/menu/key_view.xml
View file

@ -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"

3
OpenKeychain/src/main/res/values/strings.xml
View file

@ -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>