mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added back navigation

This commit is contained in:
M66B 2019-08-21 20:32:20 +02:00
parent 85ed6d9a1f
commit 701c2d6121
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/ActivityBilling.java
View File

@ -30,6 +30,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import android.util.Base64;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.NonNull;
@ -96,6 +97,8 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportFragmentManager().addOnBackStackChangedListener(this);
}
@ -111,8 +114,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
@Override
public void onBackStackChanged() {
int count = getSupportFragmentManager().getBackStackEntryCount();
if (count == 0)
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
finish();
}
@ -146,6 +148,18 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
super.onDestroy();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
default:
return false;
}
}
@NonNull
static String getSkuPro() {
if (BuildConfig.DEBUG)