From 3da032b7eea068bc5bf2684434157087a8caf2b5 Mon Sep 17 00:00:00 2001
From: David <david.satiricon@gmail.com>
Date: Wed, 3 Aug 2016 18:36:46 -0300
Subject: [PATCH] Update filepicker to the newest version and Fix for #343

---
 app/build.gradle                                           | 2 +-
 app/src/main/AndroidManifest.xml                           | 2 +-
 app/src/main/java/org/schabi/newpipe/SettingsActivity.java | 5 -----
 app/src/main/res/values/styles.xml                         | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cf45527ff..37ec0e38e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,6 @@ dependencies {
     compile 'com.github.nirhart:parallaxscroll:1.0'
     compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
     compile 'com.google.code.gson:gson:2.4'
-    compile 'com.nononsenseapps:filepicker:2.0.5'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26788cd1b..fe8bce6d7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,7 +141,7 @@
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
             android:label="@string/app_name"
             android:theme="@style/FilePickerTheme"
-            android:launchMode="singleTask">
+            android:launchMode="singleTop">
         </activity>
 
     </application>
diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
index 3eb982f06..06f3a213d 100644
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
@@ -1,13 +1,8 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
-import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1c8dca48f..ad1b50adf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -50,7 +50,7 @@
 
 
     <!-- You can also inherit from NNF_BaseTheme.Light -->
-    <style name="FilePickerTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
         <!-- Set these to match your theme -->
         <item name="colorPrimary">@color/light_youtube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>