Merge branch 'master' of github.com:open-keychain/open-keychain

12 files changed, 28 insertions, 59 deletions

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index ddec381c8..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">
 
     <!--
         General remarks
@@ -633,16 +633,16 @@
             android:taskAffinity=":Nfc"
             android:allowTaskReparenting="true" />
 
-        <activity
-            android:name=".ui.NfcIntentActivity"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+        <!--<activity-->
+            <!--android:name=".ui.NfcIntentActivity"-->
+            <!--android:launchMode="singleTop">-->
+            <!--<intent-filter>-->
+                <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="my.yubico.com" android:scheme="https"/>
-            </intent-filter>
-        </activity>
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--<data android:host="my.yubico.com" android:scheme="https"/>-->
+            <!--</intent-filter>-->
+        <!--</activity>-->
 
         <activity
             android:name=".ui.HelpActivity"
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<Void,Void,Boolean>() {
+            AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() {
                 @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();
+            }
         }
     }
 
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/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/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
diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml b/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 @@
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/decrypt_content_old" />
-
+    <include layout="@layout/encrypt_files_content" />
 </FrameLayout>
\ No newline at end of file
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/decrypt_content_old"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_frame"
-    android:layout_marginLeft="@dimen/drawer_content_padding"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/notify_area" />
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/decrypt_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/decrypt_pager_tab_strip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="@color/emphasis" />
-    </android.support.v4.view.ViewPager>
-
-</LinearLayout>
\ 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
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">
 
-    <include layout="@layout/encrypt_file_content"/>
+    <include layout="@layout/encrypt_files_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
index b44a2bc4d..b44a2bc4d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
+++ b/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
index f4c479ee9..f4c479ee9 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml