Revert "Merge pull request #116 from spacecowboy/nougatbug"

This reverts commit 49c9981, reversing changes made to a4605eb.
spacecowboy · Oct 18, 2016 · c00aee8 · c00aee8
1 parent 9d9678a
commit c00aee8
Show file tree

Hide file tree

Showing 7 changed files with 253 additions and 332 deletions.
diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java
@@ -142,23 +142,23 @@ public void onFilesPicked(@NonNull final List<Uri> files) {
         Intent i = new Intent();
         i.putExtra(EXTRA_ALLOW_MULTIPLE, true);
 
-        ArrayList<String> paths = new ArrayList<>();
-        for (Uri file : files) {
-            paths.add(file.toString());
-        }
-        i.putStringArrayListExtra(EXTRA_PATHS, paths);
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             ClipData clip = null;
             for (Uri file : files) {
                 if (clip == null) {
                     clip = new ClipData("Paths", new String[]{},
-                            new ClipData.Item(file.toString()));
+                            new ClipData.Item(file));
                 } else {
-                    clip.addItem(new ClipData.Item(file.toString()));
+                    clip.addItem(new ClipData.Item(file));
                 }
             }
             i.setClipData(clip);
+        } else {
+            ArrayList<String> paths = new ArrayList<>();
+            for (Uri file : files) {
+                paths.add(file.toString());
+            }
+            i.putStringArrayListExtra(EXTRA_PATHS, paths);
         }
 
         setResult(Activity.RESULT_OK, i);

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -14,10 +14,6 @@ android {
     compileSdkVersion 24
     buildToolsVersion "23.0.3"
 
-    dataBinding {
-        enabled = true
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
@@ -73,7 +69,6 @@ dependencies {
     compile 'com.simplecityapps:recyclerview-fastscroll:1.0.9'
 
     // UI Tests
-    androidTestCompile 'junit:junit:4.12'
     uitestsCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     uitestsCompile 'com.android.support.test:runner:0.5'
     uitestsCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'

diff --git a/...cker/sample/NoNonsenseFilePickerTest.java → ...cker/sample/NoNonsenseFilePickerTest.java b/...cker/sample/NoNonsenseFilePickerTest.java → ...cker/sample/NoNonsenseFilePickerTest.java
diff --git a/...src/androidTestUitests/java/com/nononsenseapps/filepicker/sample/SelectMultipleFiles.java b/...src/androidTestUitests/java/com/nononsenseapps/filepicker/sample/SelectMultipleFiles.java
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -31,9 +31,9 @@
             </intent-filter>
         </activity>
 
-        <!-- Test activity, required to deal with runtime permissions -->
+        <!-- Sample test app -->
         <activity
-            android:name=".NoNonsenseFilePickerTest"
+            android:name="com.nononsenseapps.filepicker.sample.NoNonsenseFilePickerTest"
             android:label="@string/title_activity_no_nonsense_file_picker"/>
 
         <!-- SD-card pickers -->
@@ -48,7 +48,7 @@
         </activity>
 
         <activity
-            android:name=".FilePickerActivity2"
+            android:name="com.nononsenseapps.filepicker.sample.FilePickerActivity2"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleThemeLight">
             <intent-filter>
@@ -119,22 +119,22 @@
 
         <!-- FtpPickers -->
         <activity
-            android:name=".ftp.FtpPickerActivity"
+            android:name="com.nononsenseapps.filepicker.sample.ftp.FtpPickerActivity"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleTheme" />
         <activity
-            android:name=".ftp.FtpPickerActivity2"
+            android:name="com.nononsenseapps.filepicker.sample.ftp.FtpPickerActivity2"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleThemeLight" />
 
         <!-- Dropbox pickers -->
         <activity
-            android:name=".dropbox.DropboxFilePickerActivity"
+            android:name="com.nononsenseapps.filepicker.sample.dropbox.DropboxFilePickerActivity"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleTheme">
         </activity>
         <activity
-            android:name=".dropbox.DropboxFilePickerActivity2"
+            android:name="com.nononsenseapps.filepicker.sample.dropbox.DropboxFilePickerActivity2"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleThemeLight">
         </activity>