From 51ea71d68ac58795abdc6f265ba8ed27a87ef05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 22:23:48 +0200 Subject: Maybe fixes encrypt files on tablets --- .../java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java index dc97bc8fb..09d6b3d21 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -309,7 +309,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.encrypt_file_activity); + setContentView(R.layout.encrypt_files_activity); // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index fc4c9ed75..6961f5ee7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -76,7 +76,7 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.encrypt_file_fragment, container, false); + View view = inflater.inflate(R.layout.encrypt_files_fragment, container, false); View vEncryptFile = view.findViewById(R.id.action_encrypt_file); vEncryptFile.setOnClickListener(new View.OnClickListener() { -- cgit v1.2.3 From 43140c10b114c30e57531cf52fa1b3a47cc9a43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 22:52:03 +0200 Subject: Fixes for share to decrypt --- .../java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java | 4 ++-- .../java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/src/main/java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java index 582c988df..9271f146c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java @@ -112,11 +112,11 @@ public class DecryptTextActivity extends ActionBarActivity { } if (Intent.ACTION_SEND.equals(action) && type != null) { - // Android action + Log.logDebugBundle(extras, "extras"); // When sending to Keychain Decrypt via share menu if ("text/plain".equals(type)) { - String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + String sharedText = extras.getString(Intent.EXTRA_TEXT); sharedText = getPgpContent(sharedText); if (sharedText != null) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index f4d2040ed..d05989bb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -302,7 +302,6 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv // Handle intent actions handleActions(getIntent()); updateModeFragment(); - } @Override @@ -359,9 +358,11 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv // When sending to OpenKeychain Encrypt via share menu if (Intent.ACTION_SEND.equals(action) && type != null) { + Log.logDebugBundle(extras, "extras"); + // When sending to OpenKeychain Encrypt via share menu if ("text/plain".equals(type)) { - String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + String sharedText = extras.getString(Intent.EXTRA_TEXT); if (sharedText != null) { // handle like normal text encryption, override action and extras to later // executeServiceMethod ACTION_ENCRYPT_TEXT in main actions -- cgit v1.2.3 From 9e7c9a0d325b45226d37efe00188eadb81f506ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 23:05:17 +0200 Subject: Fix nullpointer in DecryptActivity --- .../org/sufficientlysecure/keychain/ui/DecryptActivity.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/src/main/java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 46c99878b..ac58c63dc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -79,7 +79,7 @@ public class DecryptActivity extends DrawerActivity { final String clipboardText = ClipboardReflection.getClipboardText(DecryptActivity.this).toString(); - new AsyncTask() { + AsyncTask tadaTask = new AsyncTask() { @Override protected Boolean doInBackground(Void... params) { @@ -88,7 +88,7 @@ public class DecryptActivity extends DrawerActivity { boolean animate = matcher.matches(); // see if it looks like another pgp thing - if(!animate) { + if (!animate) { matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); animate = matcher.matches(); } @@ -100,11 +100,15 @@ public class DecryptActivity extends DrawerActivity { super.onPostExecute(animate); // if so, animate the clipboard icon just a bit~ - if(animate) { + if (animate) { SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); } } - }.execute(); + }; + + if (clipboardText != null) { + tadaTask.execute(); + } } } -- cgit v1.2.3