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: [PATCH 1/7] Maybe fixes encrypt files on tablets --- .../sufficientlysecure/keychain/ui/EncryptFilesActivity.java | 2 +- .../sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 2 +- .../{decrypt_activity_old.xml => encrypt_files_activity.xml} | 3 +-- .../{encrypt_file_activity.xml => encrypt_files_activity.xml} | 2 +- .../{encrypt_file_content.xml => encrypt_files_content.xml} | 0 .../{encrypt_file_fragment.xml => encrypt_files_fragment.xml} | 0 6 files changed, 4 insertions(+), 5 deletions(-) rename OpenKeychain/src/main/res/layout-large/{decrypt_activity_old.xml => encrypt_files_activity.xml} (90%) rename OpenKeychain/src/main/res/layout/{encrypt_file_activity.xml => encrypt_files_activity.xml} (89%) rename OpenKeychain/src/main/res/layout/{encrypt_file_content.xml => encrypt_files_content.xml} (100%) rename OpenKeychain/src/main/res/layout/{encrypt_file_fragment.xml => encrypt_files_fragment.xml} (100%) 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() { diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml similarity index 90% rename from OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml rename to OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml index fb1aaa1e8..4b277c331 100644 --- a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml +++ b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml @@ -13,6 +13,5 @@ - - + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml similarity index 89% rename from OpenKeychain/src/main/res/layout/encrypt_file_activity.xml rename to OpenKeychain/src/main/res/layout/encrypt_files_activity.xml index 46daad28f..cdcf4fa43 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" tools:context=".ui.EncryptFileActivity"> - + diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml similarity index 100% rename from OpenKeychain/src/main/res/layout/encrypt_file_content.xml rename to OpenKeychain/src/main/res/layout/encrypt_files_content.xml diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml similarity index 100% rename from OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml rename to OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml From 8e5c5c9503e7f0d9843498601bfb3dded483e0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 22:24:55 +0200 Subject: [PATCH 2/7] Remove unused layouts --- .../main/res/layout/decrypt_activity_old.xml | 11 --------- .../main/res/layout/decrypt_content_old.xml | 24 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_activity_old.xml delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_content_old.xml diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml deleted file mode 100644 index 15216af32..000000000 --- a/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/OpenKeychain/src/main/res/layout/decrypt_content_old.xml b/OpenKeychain/src/main/res/layout/decrypt_content_old.xml deleted file mode 100644 index f62cf615c..000000000 --- a/OpenKeychain/src/main/res/layout/decrypt_content_old.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - \ No newline at end of file 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: [PATCH 3/7] Fixes for share to decrypt --- .../sufficientlysecure/keychain/ui/DecryptTextActivity.java | 4 ++-- .../sufficientlysecure/keychain/ui/EncryptTextActivity.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 From f275daf1fbb06951f5962f6478d3f8ff97fe6bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 22:54:17 +0200 Subject: [PATCH 4/7] Disable NfcIntentActivity until we implement it properly --- OpenKeychain/src/main/AndroidManifest.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index ddec381c8..209f560c6 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -633,16 +633,16 @@ android:taskAffinity=":Nfc" android:allowTaskReparenting="true" /> - - - + + + + + - - - - + + + + Date: Mon, 29 Sep 2014 22:54:36 +0200 Subject: [PATCH 5/7] 3.0 beta2 --- OpenKeychain/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 209f560c6..0093b6f5b 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.sufficientlysecure.keychain" android:installLocation="auto" - android:versionCode="29201" - android:versionName="3.0 beta1"> + android:versionCode="29202" + android:versionName="3.0 beta2">