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

Merge pull request #1420 from reicast/ac/android 

Cleanup and fixes for permissions, themes, etc.
This commit is contained in:
Abandoned Cart 2018-09-30 00:33:40 -04:00 committed by GitHub
parent 03f935c298 e392d4702c
commit 6db2f3999f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/nullDC.cpp
View File

@ -354,7 +354,7 @@ void LoadCustom()
char *reios_id = reios_disk_id(); char *reios_id = reios_disk_id();
cfgSaveStr(reios_id, "software.name", reios_software_name); cfgSaveStr(reios_id, "software.name", reios_software_name);
settings.dynarec.Enable = cfgLoadInt(reios_id,"Dynarec.Enabled", settings.dynarec.Enable ? 1 : 0) != 0; settings.dynarec.Enable = cfgGameInt(reios_id,"Dynarec.Enabled", settings.dynarec.Enable ? 1 : 0) != 0;
settings.dynarec.idleskip = cfgGameInt(reios_id,"Dynarec.idleskip", settings.dynarec.idleskip ? 1 : 0) != 0; settings.dynarec.idleskip = cfgGameInt(reios_id,"Dynarec.idleskip", settings.dynarec.idleskip ? 1 : 0) != 0;
settings.dynarec.unstable_opt = cfgGameInt(reios_id,"Dynarec.unstable-opt", settings.dynarec.unstable_opt); settings.dynarec.unstable_opt = cfgGameInt(reios_id,"Dynarec.unstable-opt", settings.dynarec.unstable_opt);
settings.dynarec.safemode = cfgGameInt(reios_id,"Dynarec.safemode", settings.dynarec.safemode); settings.dynarec.safemode = cfgGameInt(reios_id,"Dynarec.safemode", settings.dynarec.safemode);

17
shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
View File

@ -563,6 +563,23 @@ public class MainActivity extends AppCompatActivity implements
} }
} }
@Override
public void onRequestPermissionsResult(
int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
if (requestCode == PERMISSION_REQUEST) {
if (!(grantResults.length > 0 && grantResults[0]
== PackageManager.PERMISSION_GRANTED)) {
StringBuilder disabled = new StringBuilder();
for (String permission : permissions) {
disabled.append("\n");
disabled.append(permission);
}
showToastMessage(getString(R.string.permission_blocked,
disabled.toString()), Snackbar.LENGTH_LONG);
}
}
}
public boolean isCallable(Intent intent) { public boolean isCallable(Intent intent) {
List<ResolveInfo> list = getPackageManager().queryIntentActivities( List<ResolveInfo> list = getPackageManager().queryIntentActivities(
intent, PackageManager.MATCH_DEFAULT_ONLY); intent, PackageManager.MATCH_DEFAULT_ONLY);

3
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
View File

@ -197,11 +197,14 @@ public class OptionsFragment extends Fragment {
@Override @Override
public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
String theme = String.valueOf(parentView.getItemAtPosition(position)); String theme = String.valueOf(parentView.getItemAtPosition(position));
int current = mPrefs.getInt(Config.pref_app_theme, 0);
if (theme.equals("Dream")) { if (theme.equals("Dream")) {
mPrefs.edit().putInt(Config.pref_app_theme, 7).apply(); mPrefs.edit().putInt(Config.pref_app_theme, 7).apply();
if (current != 7)
mCallback.recreateActivity(); mCallback.recreateActivity();
} else { } else {
mPrefs.edit().putInt(Config.pref_app_theme, position).apply(); mPrefs.edit().putInt(Config.pref_app_theme, position).apply();
if (current != position)
mCallback.recreateActivity(); mCallback.recreateActivity();
} }
} }

1
shell/android-studio/reicast/src/main/res/values/strings.xml
View File

@ -15,6 +15,7 @@
<string name="config_home">Please configure a home directory.</string> <string name="config_home">Please configure a home directory.</string>
<string name="config_data">Please move BIOS to %1$s/data/</string> <string name="config_data">Please move BIOS to %1$s/data/</string>
<string name="config_game">Please configure a game directory.</string> <string name="config_game">Please configure a game directory.</string>
<string name="permission_blocked">Permission(s) blocked:%1$s</string>
<string name="unsupported">Unsupported kernel version!</string> <string name="unsupported">Unsupported kernel version!</string>
<string name="locate">Locate</string> <string name="locate">Locate</string>
<string name="browse">Browse</string> <string name="browse">Browse</string>