diff options
Diffstat (limited to 'app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java')
-rw-r--r-- | app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java b/app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java index 5fee7df..5e9c5b0 100644 --- a/app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java +++ b/app/src/main/java/com/javispedro/wallmotion/SettingsActivity.java @@ -75,10 +75,8 @@ public class SettingsActivity extends AppCompatActivity { @Override public void onStart() { super.onStart(); - Intent launchIntent = getActivity().getIntent(); - if (launchIntent != null && launchIntent.getAction().equals(ACTION_CHOOSE_FILE)) { + if (isOpenedForVideoFilePicker()) { openVideoFilePicker(); - getActivity().finish(); } } @@ -91,10 +89,25 @@ public class SettingsActivity extends AppCompatActivity { Uri uri = resultData.getData(); setVideoFile(uri); } + if (isOpenedForVideoFilePicker()) { + getActivity().finish(); + } break; } } + private boolean isOpenedForVideoFilePicker() { + Activity activity = getActivity(); + Intent launchIntent = activity.getIntent(); + if (launchIntent != null) { + String launchAction = launchIntent.getAction(); + if (launchAction != null) { + return launchAction.equals(ACTION_CHOOSE_FILE); + } + } + return false; + } + private void openVideoFilePicker() { Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); |