diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 00:00:19 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 00:09:18 +0200 |
commit | 558cc6befca479d33c20ca58f426bda486b5ee8f (patch) | |
tree | 11b1add5d551547d06a7b00c08b43fdb93f218df /OpenKeychain/src/main/java | |
parent | 4826e0a8c89e43401a3188d7a4d51cdbfd64c37a (diff) | |
download | open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.tar.gz open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.tar.bz2 open-keychain-558cc6befca479d33c20ca58f426bda486b5ee8f.zip |
instrument: adapt to new decrypt file dialog, and some minor fixes
Diffstat (limited to 'OpenKeychain/src/main/java')
3 files changed, 6 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 29ccb0907..c8ae867b2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui; import java.util.ArrayList; +import android.app.Activity; import android.content.Intent; import android.database.Cursor; import android.net.Uri; @@ -152,7 +153,10 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager. final ImportKeyResult result = returnData.getParcelable(OperationResult.EXTRA_RESULT); - result.createNotify(getActivity()).show(); + Activity activity = getActivity(); + if (result != null && activity != null) { + result.createNotify(activity).show(); + } getLoaderManager().restartLoader(LOADER_ID_UNIFIED, null, DecryptFragment.this); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextActivity.java index 2742e4565..be21cdde1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextActivity.java @@ -28,15 +28,10 @@ import android.support.v4.app.Fragment; import android.view.View; import android.widget.Toast; -import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.ui.base.BaseActivity; -import org.sufficientlysecure.keychain.ui.util.Notify; -import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.util.FileHelper; -import org.sufficientlysecure.keychain.util.Log; public class DisplayTextActivity extends BaseActivity { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java index 566ad1d67..590d02c6f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java @@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain.ui; -import java.util.ArrayList; import java.util.regex.Matcher; import android.app.Activity; @@ -152,7 +151,7 @@ public class EncryptDecryptOverviewFragment extends Fragment { if (resultCode == Activity.RESULT_OK && data != null) { Uri uri = data.getData(); if (uri == null) { - Notify.create(getActivity(), R.string.no_file_selected, Notify.Style.ERROR).show(this); + Notify.create(getActivity(), R.string.no_file_selected, Notify.Style.ERROR).show(); return; } |