pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix a cold start from certain launchers

Browse source 
Flags like FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
are harmful when forwarding to DownloadResourcesLegacyActivity.

Forward only a safe subset of flags that are actually needed for fixing
issues #6944 #7149. See c90c6bbd7 "Fix SecurityException" (#7287).

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2024-02-03 10:13:31 +02:00
parent 55951c950d
commit e3edeac232
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/SplashActivity.java
View file

@ -157,6 +157,9 @@ public class SplashActivity extends AppCompatActivity
// https://github.com/organicmaps/organicmaps/issues/6944
final Intent intent = Objects.requireNonNull(getIntent());
intent.setComponent(new ComponentName(this, DownloadResourcesLegacyActivity.class));
// Flags like FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_RESET_TASK_IF_NEEDED will break the cold start of the app.
// https://github.com/organicmaps/organicmaps/pull/7287
intent.setFlags(intent.getFlags() & (Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_GRANT_READ_URI_PERMISSION));
Config.setFirstStartDialogSeen(this);
startActivity(intent);