ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: New requirements for Uri access

This commit is contained in:
Ender's Games 2018-09-14 06:30:28 -04:00
parent 2ea2414699
commit b84bd0e39c
3 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/android-studio/reicast/src/main/AndroidManifest.xml
View File

@ -123,6 +123,15 @@
android:configChanges="orientation|navigation|screenSize|screenLayout|uiMode|keyboard|keyboardHidden"
android:screenOrientation="sensorLandscape"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
</provider>
</application>

51
shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java
View File

@ -16,6 +16,7 @@ import android.support.constraint.ConstraintLayout;
import android.support.design.widget.Snackbar;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.app.Fragment;
import android.support.v4.content.FileProvider;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@ -367,7 +368,16 @@ public class FileBrowser extends Fragment {
public void onClick(View view) {
if (isGame) {
vib.vibrate(50);
mCallback.onGameSelected(game != null ? Uri.fromFile(game) : Uri.EMPTY);
Uri gameUri = Uri.EMPTY;
if (game != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
gameUri = FileProvider.getUriForFile(getActivity(),
"com.reicast.emulator.provider", game);
} else {
gameUri = Uri.fromFile(game);
}
}
mCallback.onGameSelected(gameUri);
vib.vibrate(250);
} else {
vib.vibrate(50);
@ -379,7 +389,13 @@ public class FileBrowser extends Fragment {
home_directory), Snackbar.LENGTH_LONG);
}
mPrefs.edit().putString(Config.pref_home, home_directory).apply();
mCallback.onFolderSelected(Uri.fromFile(new File(home_directory)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
mCallback.onFolderSelected(FileProvider.getUriForFile(getActivity(),
"com.reicast.emulator.provider", new File(home_directory)));
} else {
mCallback.onFolderSelected(
Uri.fromFile(new File(home_directory)));
}
JNIdc.config(home_directory);
}
}
@ -499,21 +515,36 @@ public class FileBrowser extends Fragment {
browser.get().game_directory = heading;
browser.get().mPrefs.edit().putString(
Config.pref_games, heading).apply();
browser.get().mCallback.onFolderSelected(
Uri.fromFile(new File(browser.get().game_directory)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
browser.get().mCallback.onFolderSelected(FileProvider
.getUriForFile(browser.get().getActivity(),
"com.reicast.emulator.provider",
new File(browser.get().game_directory)));
} else {
browser.get().mCallback.onFolderSelected(Uri.fromFile(
new File(browser.get().game_directory)));
}
} else {
browser.get().home_directory = heading
.replace("/data", "");
browser.get().mPrefs.edit().putString(
Config.pref_home, browser.get().home_directory).apply();
if (browser.get().requireDataBIOS()) {
browser.get().showToastMessage(browser.get()
.getActivity().getString(R.string.config_data,
browser.get().home_directory),
Snackbar.LENGTH_LONG);
browser.get().showToastMessage(browser.get().getActivity()
.getString(R.string.config_data, browser.get()
.home_directory), Snackbar.LENGTH_LONG);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
browser.get().mCallback.onFolderSelected(FileProvider
.getUriForFile(browser.get().getActivity(),
"com.reicast.emulator.provider",
new File(browser.get().home_directory)));
} else {
browser.get().mCallback.onFolderSelected(Uri.fromFile(
new File(browser.get().home_directory)));
}
browser.get().mCallback.onFolderSelected(
Uri.fromFile(new File(browser.get().home_directory)));
JNIdc.config(browser.get().home_directory);
}

5
shell/android-studio/reicast/src/main/res/xml/provider_paths.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<files-path name="files_root" path="."/>
<external-path name="external_files" path="."/>
</paths>