diff options
| author | JosJuice <josjuice@gmail.com> | 2021-10-24 16:58:21 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-10-24 21:39:09 +0200 |
| commit | d39150c368e9d8303f22127bb71c2058c2661df4 (patch) | |
| tree | 855d969ca7e51c52789ef90849c1414853bc32d9 /Source/Android/app/src/main/java | |
| parent | a80fcf38ae51d5a1da76c878f89a5bd073de1c72 (diff) | |
Android: Set android:hasFragileUserData
This makes Android ask the user whether they want to delete user
data when uninstalling the app instead of always deleting user data,
which is pretty great now that we're forced to use scoped storage.
It only works on Android 10 and up, though.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java index 532dcc8962..8c67505471 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java @@ -37,17 +37,19 @@ public class UserDataActivity extends AppCompatActivity implements View.OnClickL TextView textAndroid11 = findViewById(R.id.text_android_11); Button buttonOpenSystemFileManager = findViewById(R.id.button_open_system_file_manager); - textType.setText(DirectoryInitialization.isUsingLegacyUserDirectory() ? - R.string.user_data_old_location : R.string.user_data_new_location); + boolean android_10 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q; + boolean android_11 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R; + boolean legacy = DirectoryInitialization.isUsingLegacyUserDirectory(); + + int user_data_new_location = android_10 ? + R.string.user_data_new_location_android_10 : R.string.user_data_new_location; + textType.setText(legacy ? R.string.user_data_old_location : user_data_new_location); textPath.setText(DirectoryInitialization.getUserDirectory()); - boolean show_android_11_text = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && - !DirectoryInitialization.isUsingLegacyUserDirectory(); - textAndroid11.setVisibility(show_android_11_text ? View.VISIBLE : View.GONE); + textAndroid11.setVisibility(android_11 && !legacy ? View.VISIBLE : View.GONE); - boolean show_file_manager_button = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R; - buttonOpenSystemFileManager.setVisibility(show_file_manager_button ? View.VISIBLE : View.GONE); + buttonOpenSystemFileManager.setVisibility(android_11 ? View.VISIBLE : View.GONE); buttonOpenSystemFileManager.setOnClickListener(this); } |
