diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-09 23:13:23 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-09 23:13:23 +0100 |
commit | 37fd7dbbc70d6fc033db4101eaf89bad627fe499 (patch) | |
tree | d3250a834123281176342c1f3910366b7b2ede85 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java | |
parent | bb161d5fa9d56c5fc7369c979d6fd4eeff187987 (diff) | |
download | open-keychain-37fd7dbbc70d6fc033db4101eaf89bad627fe499.tar.gz open-keychain-37fd7dbbc70d6fc033db4101eaf89bad627fe499.tar.bz2 open-keychain-37fd7dbbc70d6fc033db4101eaf89bad627fe499.zip |
fix bad crashes
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java index 747055a47..34a053d25 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java @@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.helper.ExportHelper; import android.content.Intent; import android.os.Bundle; @@ -27,12 +28,16 @@ import android.os.Bundle; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -public class KeyListSecretActivity extends KeyActivity { +public class KeyListSecretActivity extends DrawerActivity { + + ExportHelper mExportHelper; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mExportHelper = new ExportHelper(this); + setContentView(R.layout.key_list_secret_activity); // now setup navigation drawer in DrawerActivity... @@ -58,7 +63,7 @@ public class KeyListSecretActivity extends KeyActivity { return true; case R.id.menu_key_list_secret_export: - showExportKeysDialog(null, Id.type.secret_key, Constants.path.APP_DIR + mExportHelper.showExportKeysDialog(null, Id.type.secret_key, Constants.path.APP_DIR + "/secexport.asc"); return true; @@ -86,4 +91,11 @@ public class KeyListSecretActivity extends KeyActivity { startActivityForResult(intent, 0); } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (!mExportHelper.handleActivityResult(requestCode, resultCode, data)) { + super.onActivityResult(requestCode, resultCode, data); + } + } + } |