Przeglądaj źródła

Merge pull request #274 from nextcloud/shareFix

Share fix
Tobias Kaminsky 8 lat temu
rodzic
commit
e2dd49a5ab

+ 2 - 2
AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10030099"
-    android:versionName="1.3.0">
+    android:versionCode="10030199"
+    android:versionName="1.3.1">
 
     <uses-sdk
         android:minSdkVersion="14"

+ 6 - 0
CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.1 (September 20, 2016)
+
+- Move action hard to discover - difference between single/multi selection
+- Show move/copy context in toolbar title
+- Share file with dictadroid to Nextcloud
+
 ## 1.3.0 (September 17, 2016)
 
 - Files drop permission in share viewe

+ 2 - 2
src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -544,8 +544,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
         return (mStreamsToUpload != null && mStreamsToUpload.get(0) != null || uploadTextSnippet());
     }
 
-    private boolean uploadTextSnippet(){
-        return getIntent().getStringExtra(Intent.EXTRA_TEXT) != null;
+    private boolean uploadTextSnippet() {
+        return getIntent().getStringExtra(Intent.EXTRA_TEXT) != null && getIntent().getExtras().keySet().size() == 1;
     }
 
     @SuppressLint("NewApi")