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

Back fixes

This commit is contained in:
M66B 2019-10-04 16:57:40 +02:00
parent 264b957c73
commit 1c0f5382f5
6 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@ -27,8 +27,10 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.PowerManager;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
@ -260,6 +262,18 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
super.onBackPressed();
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
protected boolean backHandled() {
for (IBackPressedListener listener : backPressedListeners)
if (listener.onBackPressed())

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

@ -148,18 +148,6 @@ 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)

12
app/src/main/java/eu/faircode/email/ActivityCompose.java
View File

@ -198,16 +198,4 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
finishAndRemoveTask();
}
}
@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;
}
}
}

6
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -347,12 +347,6 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
if (drawerToggle.onOptionsItemSelected(item))
return true;
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack();
return true;
}
return super.onOptionsItemSelected(item);
}

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

@ -582,14 +582,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (drawerToggle.onOptionsItemSelected(item))
return true;
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack();
return true;
default:
return false;
}
return super.onOptionsItemSelected(item);
}
private void checkFirst() {

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -939,10 +939,6 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onExit();
return true;
case R.id.menu_encrypt:
onMenuEncrypt();
return true;