SDL: permission dialog in start menu to write to external storage / SD card / USB stick

This commit is contained in:
Sergii Pylypenko
2019-11-07 21:57:37 +02:00
parent c2d67139f7
commit 8b8597fbc3
9 changed files with 66 additions and 62 deletions

View File

@@ -598,6 +598,7 @@ public class MainActivity extends Activity
public void onActivityResult(int request, int response, Intent data) {
super.onActivityResult(request, response, data);
cloudSave.onActivityResult(request, response, data);
SettingsMenuMisc.StorageAccessConfig.onActivityResult(this, request, response, data);
}
private int TextInputKeyboardList[][] =

View File

@@ -248,6 +248,7 @@ class SettingsMenu
new SettingsMenuKeyboard.ScreenGesturesConfig(),
new SettingsMenuMisc.VideoSettingsConfig(),
new SettingsMenuMisc.CommandlineConfig(),
new SettingsMenuMisc.StorageAccessConfig(),
new SettingsMenuMisc.ResetToDefaultsConfig(),
new OkButton(),
};

View File

@@ -542,6 +542,42 @@ class SettingsMenuMisc extends SettingsMenu
}
}
public static class StorageAccessConfig extends Menu
{
public static int REQUEST_STORAGE_ID = 42;
public static void onActivityResult(final MainActivity p, final int requestCode, final int resultCode, final Intent resultData)
{
if (requestCode == REQUEST_STORAGE_ID)
{
if (resultCode == Activity.RESULT_OK)
{
Uri treeUri = resultData.getData();
p.getContentResolver().takePersistableUriPermission(treeUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
Log.i("SDL", "Storage write permission granted to path " + treeUri.toString());
}
else
{
Log.i("SDL", "Storage write permission rejected");
}
}
}
String title(final MainActivity p)
{
return p.getResources().getString(R.string.storage_access);
}
void run (final MainActivity p)
{
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP)
{
p.startActivityForResult(new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE), REQUEST_STORAGE_ID);
}
goBack(p);
}
}
static class CommandlineConfig extends Menu
{
String title(final MainActivity p)

View File

@@ -41,6 +41,7 @@ public class CloudSave implements GameHelper.GameHelperListener {
// The game helper object. This class is mainly a wrapper around this object.
protected GameHelper mHelper;
public int REQUEST_CLOUD_SAVE_ID = 38;
MainActivity parent;
@@ -72,6 +73,8 @@ public class CloudSave implements GameHelper.GameHelperListener {
boolean createNewSave = false;
public void onActivityResult(int request, int response, Intent intent)
{
if (request != REQUEST_CLOUD_SAVE_ID)
return;
Log.d("SDL", "CloudSave: onActivityResult() response " + response + " intent " + (intent != null));
try
{
@@ -119,7 +122,7 @@ public class CloudSave implements GameHelper.GameHelperListener {
{
public void run()
{
parent.startActivityForResult(snapshotIntent, 0);
parent.startActivityForResult(snapshotIntent, REQUEST_CLOUD_SAVE_ID);
}
});
semaphore.acquireUninterruptibly();
@@ -192,7 +195,7 @@ public class CloudSave implements GameHelper.GameHelperListener {
{
public void run()
{
parent.startActivityForResult(snapshotIntent, 0);
parent.startActivityForResult(snapshotIntent, REQUEST_CLOUD_SAVE_ID);
}
});
semaphore.acquireUninterruptibly();

View File

@@ -16,6 +16,7 @@
<string name="storage_phone">Внутреннее хранение - %d Мб</string>
<string name="storage_sd">SD карта - %d Мб</string>
<string name="storage_question">Куда сохранять данные приложения</string>
<string name="storage_access">Разрешение на запись на SD карту</string>
<string name="optional_downloads">Дополнительные загрузки</string>
<string name="ok">Продолжить</string>
<string name="controls_arrows">Стрелки / джойстик / Dpad</string>

View File

@@ -16,6 +16,7 @@
<string name="storage_phone">Внутрішнє зберігання - %d Мб</string>
<string name="storage_sd">SD карта - %d Мб</string>
<string name="storage_question">Куди зберігати дані програми</string>
<string name="storage_access">Дозвіл на запис на SD карту</string>
<string name="optional_downloads">Додаткові завантаження</string>
<string name="ok">ОК</string>
<string name="controls_arrows">Стрілки / джойстік / Dpad</string>

View File

@@ -26,6 +26,7 @@
<string name="storage_custom">Specify directory</string>
<string name="storage_commandline">Command line parameters, one argument per line</string>
<string name="storage_question">Data installation location</string>
<string name="storage_access">Permission to write to SD card</string>
<string name="optional_downloads">Downloads</string>
<string name="downloads">Downloads</string>
<string name="ok">OK</string>