mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4334 from libretro/revert-4315-patch-2

Browse Source 
Revert "(Android) Ask for external sdcard permission"
This commit is contained in:
Twinaphex 2016-12-30 01:32:29 +01:00 committed by GitHub
commit 97e758286c
1 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
View File

@ -14,9 +14,6 @@ import android.os.Environment;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.app.AlertDialog.Builder;
/**
* {@link PreferenceActivity} subclass that provides all of the
@ -24,8 +21,6 @@ import android.app.AlertDialog.Builder;
*/
public final class MainMenuActivity extends PreferenceActivity
{
int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0;
public static void startRetroActivity(Intent retro, String contentPath, String corePath,
String configFilePath, String imePath, String dataDirPath, String dataSourcePath)
{
@ -51,28 +46,6 @@ int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0;
// Bind audio stream to hardware controls.
setVolumeControlStream(AudioManager.STREAM_MUSIC);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
{
if (this.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) {
// Should we show an explanation?
if (this.shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
// Show an explanation to the user *asynchronously* -- don't block
// this thread waiting for the user's response! After the user
// sees the explanation, try again to request the permission.
} else {
// No explanation needed, we can request the permission.
this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE);
// MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE is an
// app-defined int constant. The callback method gets the
// result of the request.
}
}
}
UserPreferences.updateConfigFile(this);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@ -99,29 +72,4 @@ int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0;
startActivity(retro);
finish();
}
@Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
switch (requestCode) {
case MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE: {
// If request is cancelled, the result arrays are empty.
            if (grantResults.length > 0
          && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// permission granted
            } else {
// permission denied
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage("External SDCard acesss will not be available.") //hardcoded because the rest of retroarch is...
.setNeutralButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
// Nothing lul
}
})
builder.create();
}
return;
}
}
}
}