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

Merge pull request #4111 from trashkalmar/on-back-press-crash

Browse source 
[android] fix: Accidental crash after OnSaveInstanceState().
This commit is contained in:
Dmitry Yunitsky 2016-08-21 15:25:57 +03:00 • committed by GitHub
commit 92a9d34565
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -19,9 +19,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
import java.io.Serializable;
import java.util.Stack;
import com.mapswithme.maps.Framework.MapObjectListener;
import com.mapswithme.maps.activity.CustomNavigateUpListener;
import com.mapswithme.maps.ads.LikesManager;
@ -86,6 +83,9 @@ import com.mapswithme.util.statistics.Statistics;
import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
import java.io.Serializable;
import java.util.Stack;
public class MwmActivity extends BaseMwmFragmentActivity
implements MapObjectListener,
View.OnTouchListener,
@ -883,7 +883,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!closePlacePage() && !closeSidePanel() &&
!RoutingController.get().cancel() && !closePositionChooser())
super.onBackPressed();
{
try
{
super.onBackPressed();
} catch (IllegalStateException e)
{
// Sometimes this can be called after onSaveInstanceState() for unknown reason.
}
}
}
private boolean interceptBackPress()