Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-29 09:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash

Browse Source
This commit is contained in:
M66B
2019-05-27 12:15:25 +02:00
parent 7f5d9293a4
commit 709506deb2
9 changed files with 196 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -344,7 +344,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
public void run() {
drawerLayout.closeDrawer(drawerContainer);
onMenuPro();
onShowPro(null);
}
}));
@@ -930,15 +930,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragmentTransaction.commit();
}
private void onMenuPro() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
private void onMenuInvite() {
startActivity(getIntentInvite());
}
@@ -1008,7 +999,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragmentTransaction.commit();
}
BroadcastReceiver receiver = new BroadcastReceiver() {
private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
@@ -1182,9 +1173,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onColor(final Intent intent) {
if (!Helper.isPro(this)) {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
onShowPro(null);
return;
}