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

[android] Fixed crash during back pressing on fragment that doesn't implement onBackPressedListener interface

Browse source
This commit is contained in:
Александр Зацепин 2018-11-20 12:49:16 +03:00 • committed by yoksnod
parent df4a680a18
commit 7206ae61b4
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
View file

@ -23,6 +23,8 @@ import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
public abstract class BaseMwmFragmentActivity extends AppCompatActivity
implements BaseActivity
@ -236,7 +238,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
}
FragmentManager manager = getSupportFragmentManager();
String name = getFragmentClass().getName();
BaseMwmFragment fragment = (BaseMwmFragment) manager.findFragmentByTag(name);
Fragment fragment = manager.findFragmentByTag(name);
if (fragment == null)
{
@ -250,9 +252,20 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
super.onBackPressed();
}
protected boolean onBackPressedInternal(@NonNull BaseMwmFragment currentFragment)
private boolean onBackPressedInternal(@NonNull Fragment currentFragment)
{
return currentFragment.onBackPressed();
try
{
OnBackPressListener listener = (OnBackPressListener) currentFragment;
return listener.onBackPressed();
}
catch (ClassCastException e)
{
Logger logger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
String tag = this.getClass().getSimpleName();
logger.i(tag, "Fragment '" + currentFragment + "' doesn't handle back press by itself.");
return false;
}
}
/**