Merge pull request techmania-team#16 from rogeraabbccdd/ios

Improve Android permission request
fhalfkg · Sep 29, 2021 · 5f08379 · 5f08379
2 parents 4484117 + 01dacd4
commit 5f08379
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/TECHMANIA/Assets/Scripts/Components/Main Menu/OptionsPanel.cs b/TECHMANIA/Assets/Scripts/Components/Main Menu/OptionsPanel.cs
@@ -7,9 +7,6 @@
 using UnityEngine.UI;
 using FantomLib;
 using UnityEngine.Networking;
-#if UNITY_ANDROID
-using UnityEngine.Android;
-#endif
 
 public class OptionsPanel : MonoBehaviour
 {
@@ -374,14 +371,6 @@ public void OnCustomDataLocationChanged()
     public void OnTracksFolderBrowseButtonClick()
     {
 #if UNITY_ANDROID
-        if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite))
-        {
-            Permission.RequestUserPermission(Permission.ExternalStorageWrite);
-        }
-        if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead))
-        {
-            Permission.RequestUserPermission(Permission.ExternalStorageRead);
-        }
         AndroidPlugin.OpenStorageFolder(gameObject.name, "OnAndroidTracksFolderSelected", "", true);
 #else
         string[] folders = SFB.StandaloneFileBrowser
@@ -398,14 +387,6 @@ public void OnTracksFolderBrowseButtonClick()
     public void OnSkinsFolderBrowseButtonClick()
     {
 #if UNITY_ANDROID
-        if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite))
-        {
-            Permission.RequestUserPermission(Permission.ExternalStorageWrite);
-        }
-        if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead))
-        {
-            Permission.RequestUserPermission(Permission.ExternalStorageRead);
-        }
         AndroidPlugin.OpenStorageFolder(gameObject.name, "OnAndroidSkinsFolderSelected", "", true);
 #else
         string[] folders = SFB.StandaloneFileBrowser
@@ -418,7 +399,6 @@ public void OnSkinsFolderBrowseButtonClick()
         }
 #endif
     }
-
 
     private void OnAndroidTracksFolderSelected(string result)
     {

diff --git a/TECHMANIA/Assets/Scripts/Paths.cs b/TECHMANIA/Assets/Scripts/Paths.cs
@@ -5,6 +5,9 @@
 using System.Text;
 using UnityEngine.Events;
 using System;
+#if UNITY_ANDROID
+using UnityEngine.Android;
+#endif
 
 public static class Paths
 {
@@ -109,6 +112,16 @@ public static void ApplyCustomDataLocation()
     {
         if (Options.instance.customDataLocation)
         {
+#if UNITY_ANDROID
+            if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite))
+            {
+                Permission.RequestUserPermission(Permission.ExternalStorageWrite);
+            }
+            if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead))
+            {
+                Permission.RequestUserPermission(Permission.ExternalStorageRead);
+            }
+#endif
             trackRootFolder = Options.instance.tracksFolderLocation;
             skinFolder = Options.instance.skinsFolderLocation;
         }