diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-11-21 23:55:17 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-11-21 23:55:17 +0100 |
commit | 47caad3edbdb32dd47bdbee27828edda81e433e1 (patch) | |
tree | dd76b19147dbf0f1926555b1d949f4646b570fc3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java | |
parent | 629d83a1ceedefe42f6e763af2065033f3fe77ae (diff) | |
parent | a805069c59586775fd5790c00cbd82f4dfeddcb6 (diff) | |
download | open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.gz open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.bz2 open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.zip |
Merge branch 'development' into keybase-proofs
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java index 27f026f80..51e58565f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java @@ -1,10 +1,3 @@ -package org.sufficientlysecure.keychain.util; - -import android.content.Context; -import android.content.Intent; -import android.content.pm.LabeledIntent; -import android.content.pm.ResolveInfo; -import android.os.Build; /* * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de> * @@ -22,6 +15,13 @@ import android.os.Build; * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +package org.sufficientlysecure.keychain.util; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.LabeledIntent; +import android.content.pm.ResolveInfo; +import android.os.Build; import android.os.Parcelable; import java.util.ArrayList; @@ -38,7 +38,7 @@ public class ShareHelper { } /** - * Create Intent Chooser but exclude OK's EncryptActivity. + * Create Intent Chooser but exclude specific activites, e.g., EncryptActivity to prevent encrypting again * <p/> * Put together from some stackoverflow posts... */ |