Merge pull request #6282 from mahdihijazi/replace_file_browser

[Android] Replace current file browser

Source/Android/app/build.gradle

@@ -96,6 +96,8 @@ dependencies {
 
     // Allows FRP-style asynchronous operations in Android.
     api 'io.reactivex:rxandroid:1.2.1'
+
+    compile 'com.nononsenseapps:filepicker:4.1.0'
 }
 
 def getVersion() {

Source/Android/app/src/main/AndroidManifest.xml

@@ -50,11 +50,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activities.AddDirectoryActivity"
-            android:theme="@style/DolphinGamecube"
-            android:label="@string/add_directory_title"/>
-
         <activity
             android:name=".ui.settings.SettingsActivity"
             android:theme="@style/DolphinSettingsGamecube"
@@ -64,6 +59,15 @@
             android:name=".activities.EmulationActivity"
             android:theme="@style/DolphinEmulationGamecube"/>
 
+        <activity
+            android:name=".activities.CustomFilePickerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FilePickerTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <service android:name=".services.DirectoryInitializationService"/>
 
@@ -74,6 +78,16 @@
             android:exported="false">
         </provider>
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.filesprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/nnf_provider_paths" />
+        </provider>
+
     </application>
 
 </manifest>

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/CustomFilePickerActivity.java

@@ -0,0 +1,28 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.os.Environment;
+import android.support.annotation.Nullable;
+
+import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
+import com.nononsenseapps.filepicker.FilePickerActivity;
+
+import org.dolphinemu.dolphinemu.fragments.CustomFilePickerFragment;
+
+import java.io.File;
+
+public class CustomFilePickerActivity extends FilePickerActivity
+
+{
+    @Override
+    protected AbstractFilePickerFragment<File> getFragment(
+            @Nullable final String startPath, final int mode, final boolean allowMultiple,
+            final boolean allowCreateDir, final boolean allowExistingFile,
+            final boolean singleClick)
+    {
+        AbstractFilePickerFragment<File> fragment = new CustomFilePickerFragment();
+        // startPath is allowed to be null. In that case, default folder should be SD-card and not "/"
+        fragment.setArgs(startPath != null ? startPath : Environment.getExternalStorageDirectory().getPath(),
+                mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick);
+        return fragment;
+    }
+}