moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-06 11:16:06 +01:00
commit def4492107
1 changed files with 77 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -89,6 +89,8 @@ public class ViewKeyActivity extends BaseActivity implements
LoaderManager.LoaderCallbacks<Cursor> { LoaderManager.LoaderCallbacks<Cursor> {
static final int REQUEST_QR_FINGERPRINT = 1; static final int REQUEST_QR_FINGERPRINT = 1;
static final int REQUEST_DELETE= 2;
static final int REQUEST_EXPORT= 3;
ExportHelper mExportHelper; ExportHelper mExportHelper;
ProviderHelper mProviderHelper; ProviderHelper mProviderHelper;
@ -298,7 +300,6 @@ public class ViewKeyActivity extends BaseActivity implements
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
try {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: { case android.R.id.home: {
Intent homeIntent = new Intent(this, MainActivity.class); Intent homeIntent = new Intent(this, MainActivity.class);
@ -307,11 +308,31 @@ public class ViewKeyActivity extends BaseActivity implements
return true; return true;
} }
case R.id.menu_key_view_export_file: { case R.id.menu_key_view_export_file: {
exportToFile(mDataUri, mExportHelper, mProviderHelper); Intent mIntent = new Intent(this,PassphraseDialogActivity.class);
long keyId=0;
try {
keyId = new ProviderHelper(this)
.getCachedPublicKeyRing(mDataUri)
.extractOrGetMasterKeyId();
} catch (PgpKeyNotFoundException e) {
e.printStackTrace();
}
mIntent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID,keyId);
startActivityForResult(mIntent,REQUEST_EXPORT);
return true; return true;
} }
case R.id.menu_key_view_delete: { case R.id.menu_key_view_delete: {
deleteKey(mDataUri, mExportHelper); Intent mIntent = new Intent(this,PassphraseDialogActivity.class);
long keyId=0;
try {
keyId = new ProviderHelper(this)
.getCachedPublicKeyRing(mDataUri)
.extractOrGetMasterKeyId();
} catch (PgpKeyNotFoundException e) {
e.printStackTrace();
}
mIntent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID,keyId);
startActivityForResult(mIntent,REQUEST_DELETE);
return true; return true;
} }
case R.id.menu_key_view_advanced: { case R.id.menu_key_view_advanced: {
@ -337,10 +358,6 @@ public class ViewKeyActivity extends BaseActivity implements
return true; return true;
} }
} }
} catch (ProviderHelper.NotFoundException e) {
Notify.showNotify(this, R.string.error_key_not_found, Notify.Style.ERROR);
Log.e(Constants.TAG, "Key not found", e);
}
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@ -427,6 +444,12 @@ public class ViewKeyActivity extends BaseActivity implements
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
} }
@Override
protected void onSaveInstanceState(Bundle outState) {
//Note:-Done due to the same weird crashes as for commitAllowingStateLoss()
//super.onSaveInstanceState(outState);
}
private void showQrCodeDialog() { private void showQrCodeDialog() {
Intent qrCodeIntent = new Intent(this, QrCodeViewActivity.class); Intent qrCodeIntent = new Intent(this, QrCodeViewActivity.class);
@ -500,6 +523,19 @@ public class ViewKeyActivity extends BaseActivity implements
return; return;
} }
if (requestCode == REQUEST_DELETE && resultCode == Activity.RESULT_OK){
deleteKey(mDataUri, mExportHelper);
}
if (requestCode == REQUEST_EXPORT && resultCode == Activity.RESULT_OK){
try {
exportToFile(mDataUri, mExportHelper, mProviderHelper);
} catch (ProviderHelper.NotFoundException e) {
Notify.showNotify(this, R.string.error_key_not_found, Notify.Style.ERROR);
Log.e(Constants.TAG, "Key not found", e);
}
}
if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
result.createNotify(this).show(); result.createNotify(this).show();