Update to Android SDK 25 #5151
Update to Android SDK 25 #5151
Conversation
| if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { | ||
| int hasWriteContactsPermission = ContextCompat.checkSelfPermission(activity, WRITE_EXTERNAL_STORAGE); | ||
| return hasWriteContactsPermission == PackageManager.PERMISSION_GRANTED; | ||
| } else { |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(parent); | ||
| boolean assetsCopied = preferences.getBoolean("assetsCopied", false); | ||
|
|
||
| if(!assetsCopied) { |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| for (int platformIndex = 0; platformIndex <= Game.PLATFORM_ALL; ++platformIndex) | ||
| { | ||
| mPresenter.loadGames(platformIndex); | ||
| if(PermissionsHandler.hasWriteAccess(this)) { |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| } | ||
| break; | ||
| default: | ||
| super.onRequestPermissionsResult(requestCode, permissions, grantResults); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| } | ||
| break; | ||
| default: | ||
| super.onRequestPermissionsResult(requestCode, permissions, grantResults); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| @@ -66,6 +66,13 @@ public void onClick(View view) | |||
| // TODO Split some of this stuff into Application.onCreate() | |||
| if (savedInstanceState == null) | |||
| StartupHandler.HandleInit(this); | |||
|
|
|||
| if(PermissionsHandler.hasWriteAccess(this)) { | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| return true; | ||
| } | ||
|
|
||
| int hasWriteContactsPermission = ContextCompat.checkSelfPermission(activity, WRITE_EXTERNAL_STORAGE); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
yes, you are right. I noticed that I need the handle the write permissions anyway since the first step would be to copy the files from the old location to the new location in the sdcard for those who have dolphin installed on their devices to avoid duplicating them. And copy from assets for fresh installs. After a while we can drop this, remove the permission and all its related code. |
|
if everything looks good to you, I can squash the commits? |
|
While we're on this subject, is there any reason why Dolphin doesn't store its files in the app-exclusive shared storage folder (/storage/emulated/0/Android/data/org.dolphinemu.dolphinemu)? AFAIK apps don't require write permission to store data on that specific location and it's still user acessible... |
|
@mbc07 that's the next step after this PR get merged. |
This handles the new permission system in Android M.
|
@mahdihijazi Sorry for taking this long to get back to you. As far as I can tell this looks fine. |
|
@mahdihijazi done 👌 |
As a first step we are going to keep the write permission because we need to copy the files from the old location for those users who already have the emulator installed on Android to the new location that will not require the permission any more.
Later, once we feel most of users migrated their files to the new location, we can go on and remove the write permission.