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

enc-export: use BackupActivity for backup from ViewKeyActivity

Browse source
This commit is contained in:
Vincent Breitmoser 2015-09-30 01:59:22 +02:00
parent 771d9d54b6
commit 4025acd13a
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
View file

@ -17,6 +17,7 @@
package org.sufficientlysecure.keychain.ui;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@ -28,6 +29,7 @@ import org.sufficientlysecure.keychain.ui.base.BaseActivity;
public class BackupActivity extends BaseActivity {
public static final String EXTRA_MASTER_KEY_IDS = "master_key_ids";
public static final String EXTRA_SECRET = "export_secret";
@Override
@ -43,8 +45,11 @@ public class BackupActivity extends BaseActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
boolean exportSecret = getIntent().getBooleanExtra(EXTRA_SECRET, false);
Fragment frag = BackupCodeFragment.newInstance(null, exportSecret);
Intent intent = getIntent();
boolean exportSecret = intent.getBooleanExtra(EXTRA_SECRET, false);
long[] masterKeyIds = intent.getLongArrayExtra(EXTRA_MASTER_KEY_IDS);
Fragment frag = BackupCodeFragment.newInstance(masterKeyIds, exportSecret);
FragmentManager fragMan = getSupportFragmentManager();
fragMan.beginTransaction()

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

@ -345,7 +345,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
startActivity(homeIntent);
return true;
}
case R.id.menu_key_view_export_file: {
case R.id.menu_key_view_backup: {
startPassphraseActivity(REQUEST_BACKUP);
return true;
}
@ -395,7 +395,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
editKey.setVisible(mIsSecret);
MenuItem exportKey = menu.findItem(R.id.menu_key_view_export_file);
MenuItem exportKey = menu.findItem(R.id.menu_key_view_backup);
exportKey.setVisible(mIsSecret);
MenuItem addLinked = menu.findItem(R.id.menu_key_view_add_linked_identity);
@ -455,10 +455,11 @@ public class ViewKeyActivity extends BaseNfcActivity implements
startActivityForResult(intent, requestCode);
}
private void backupToFile() {
new ExportHelper(this).showExportKeysDialog(
mMasterKeyId, new File(Constants.Path.APP_DIR,
KeyFormattingUtils.convertKeyIdToHex(mMasterKeyId) + ".sec.asc"), true);
private void startBackupActivity() {
Intent intent = new Intent(this, BackupActivity.class);
intent.putExtra(BackupActivity.EXTRA_MASTER_KEY_IDS, new long[] { mMasterKeyId });
intent.putExtra(BackupActivity.EXTRA_SECRET, true);
startActivity(intent);
}
private void deleteKey() {
@ -514,7 +515,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
return;
}
backupToFile();
startBackupActivity();
return;
}

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

@ -16,7 +16,7 @@
android:title="@string/key_view_action_update" />
<item
android:id="@+id/menu_key_view_export_file"
android:id="@+id/menu_key_view_backup"
app:showAsAction="never"
android:title="@string/menu_export_key" />

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

@ -108,7 +108,7 @@
<!-- menu -->
<string name="menu_preferences">"Settings"</string>
<string name="menu_help">"Help"</string>
<string name="menu_export_key">"Backup to file"</string>
<string name="menu_export_key">"Backup key"</string>
<string name="menu_delete_key">"Delete key"</string>
<string name="menu_manage_keys">"Manage my keys"</string>
<string name="menu_search">"Search"</string>