From 96936dda23dc8854c0165ecf49720173aeb21ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 18 Jan 2014 22:37:00 +0100 Subject: handle onActivityResult in FileDialogFragment directly --- .../sufficientlysecure/keychain/ui/DecryptActivity.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java') diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 6cc0b3b5a..e91630316 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -629,8 +629,7 @@ public class DecryptActivity extends DrawerActivity { mFileDialog = FileDialogFragment.newInstance(messenger, getString(R.string.title_decrypt_to_file), - getString(R.string.specify_file_to_decrypt_to), mOutputFilename, null, - Id.request.output_filename); + getString(R.string.specify_file_to_decrypt_to), mOutputFilename, null); mFileDialog.show(getSupportFragmentManager(), "fileDialog"); } @@ -826,20 +825,6 @@ public class DecryptActivity extends DrawerActivity { return; } - case Id.request.output_filename: { - if (resultCode == RESULT_OK && data != null) { - try { - String path = FileHelper.getPath(this, data.getData()); - Log.d(Constants.TAG, "path=" + path); - - mFileDialog.setFilename(path); - } catch (NullPointerException e) { - Log.e(Constants.TAG, "Nullpointer while retrieving path!"); - } - } - return; - } - // this request is returned after LookupUnknownKeyDialogFragment started // KeyServerQueryActivity and user looked uo key case Id.request.look_up_key_id: { -- cgit v1.2.3