enc-export: use BackupActivity for backup from ViewKeyActivity
This commit is contained in:
parent
771d9d54b6
commit
4025acd13a
|
@ -17,6 +17,7 @@
|
||||||
package org.sufficientlysecure.keychain.ui;
|
package org.sufficientlysecure.keychain.ui;
|
||||||
|
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
|
@ -28,6 +29,7 @@ import org.sufficientlysecure.keychain.ui.base.BaseActivity;
|
||||||
|
|
||||||
public class BackupActivity extends 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";
|
public static final String EXTRA_SECRET = "export_secret";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -43,8 +45,11 @@ public class BackupActivity extends BaseActivity {
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
if (savedInstanceState == null) {
|
||||||
boolean exportSecret = getIntent().getBooleanExtra(EXTRA_SECRET, false);
|
Intent intent = getIntent();
|
||||||
Fragment frag = BackupCodeFragment.newInstance(null, exportSecret);
|
boolean exportSecret = intent.getBooleanExtra(EXTRA_SECRET, false);
|
||||||
|
long[] masterKeyIds = intent.getLongArrayExtra(EXTRA_MASTER_KEY_IDS);
|
||||||
|
|
||||||
|
Fragment frag = BackupCodeFragment.newInstance(masterKeyIds, exportSecret);
|
||||||
|
|
||||||
FragmentManager fragMan = getSupportFragmentManager();
|
FragmentManager fragMan = getSupportFragmentManager();
|
||||||
fragMan.beginTransaction()
|
fragMan.beginTransaction()
|
||||||
|
|
|
@ -345,7 +345,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
|
||||||
startActivity(homeIntent);
|
startActivity(homeIntent);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case R.id.menu_key_view_export_file: {
|
case R.id.menu_key_view_backup: {
|
||||||
startPassphraseActivity(REQUEST_BACKUP);
|
startPassphraseActivity(REQUEST_BACKUP);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -395,7 +395,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
|
||||||
MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
|
MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
|
||||||
editKey.setVisible(mIsSecret);
|
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);
|
exportKey.setVisible(mIsSecret);
|
||||||
|
|
||||||
MenuItem addLinked = menu.findItem(R.id.menu_key_view_add_linked_identity);
|
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);
|
startActivityForResult(intent, requestCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void backupToFile() {
|
private void startBackupActivity() {
|
||||||
new ExportHelper(this).showExportKeysDialog(
|
Intent intent = new Intent(this, BackupActivity.class);
|
||||||
mMasterKeyId, new File(Constants.Path.APP_DIR,
|
intent.putExtra(BackupActivity.EXTRA_MASTER_KEY_IDS, new long[] { mMasterKeyId });
|
||||||
KeyFormattingUtils.convertKeyIdToHex(mMasterKeyId) + ".sec.asc"), true);
|
intent.putExtra(BackupActivity.EXTRA_SECRET, true);
|
||||||
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void deleteKey() {
|
private void deleteKey() {
|
||||||
|
@ -514,7 +515,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
backupToFile();
|
startBackupActivity();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
android:title="@string/key_view_action_update" />
|
android:title="@string/key_view_action_update" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_key_view_export_file"
|
android:id="@+id/menu_key_view_backup"
|
||||||
app:showAsAction="never"
|
app:showAsAction="never"
|
||||||
android:title="@string/menu_export_key" />
|
android:title="@string/menu_export_key" />
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
<!-- menu -->
|
<!-- menu -->
|
||||||
<string name="menu_preferences">"Settings"</string>
|
<string name="menu_preferences">"Settings"</string>
|
||||||
<string name="menu_help">"Help"</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_delete_key">"Delete key"</string>
|
||||||
<string name="menu_manage_keys">"Manage my keys"</string>
|
<string name="menu_manage_keys">"Manage my keys"</string>
|
||||||
<string name="menu_search">"Search"</string>
|
<string name="menu_search">"Search"</string>
|
||||||
|
|
Loading…
Reference in a new issue