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

[android] Fix a crash in LocationHelper.attach()

Browse source 
Closes #4240

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-03-01 11:22:21 +02:00
parent d363a822c3
commit e49708808e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/app/organicmaps/location/LocationHelper.java
View file

@ -567,7 +567,10 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
Logger.d(TAG, "activity = " + activity);
if (mActivity != null)
throw new IllegalStateException("Another Activity is already attached");
{
Logger.e(TAG, "Another Activity = " + mActivity + " is already attached");
detach();
}
mActivity = activity;
@ -586,7 +589,10 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
Logger.d(TAG, "activity = " + mActivity);
if (mActivity == null)
throw new IllegalStateException("Activity is not attached");
{
Logger.e(TAG, "Activity is not attached");
return;
}
assert mPermissionRequest != null;
mPermissionRequest.unregister();