mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-26 09:47:13 +00:00
Code Issues Releases Wiki Activity

Defered finish

Browse source
This commit is contained in:
M66B 2018-08-22 05:18:31 +00:00
parent a1aee23488
commit e578051c2c
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,6 @@ import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.cursoradapter.widget.SimpleCursorAdapter;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -804,8 +803,7 @@ public class FragmentCompose extends FragmentEx {
public void onChanged(final EntityMessage draft) {
// Draft was deleted
if (draft == null || draft.ui_hide) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
finish();
return;
}
}

13
app/src/main/java/eu/faircode/email/FragmentEx.java
View file

@ -30,9 +30,11 @@ import android.view.inputmethod.InputMethodManager;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle;
public class FragmentEx extends Fragment {
private String subtitle = " ";
private boolean finish = false;
protected void setSubtitle(int resid) {
setSubtitle(getString(resid));
@ -43,6 +45,13 @@ public class FragmentEx extends Fragment {
updateSubtitle();
}
protected void finish() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
else
finish = true;
}
@Override
public void onCreate(Bundle savedInstanceState) {
Log.i(Helper.TAG, "Create " + this);
@ -66,6 +75,10 @@ public class FragmentEx extends Fragment {
Log.i(Helper.TAG, "Resume " + this);
super.onResume();
updateSubtitle();
if (finish) {
getFragmentManager().popBackStack();
finish = false;
}
}
@Override

4
app/src/main/java/eu/faircode/email/FragmentFolder.java
View file

@ -33,7 +33,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
public class FragmentFolder extends FragmentEx {
@ -149,8 +148,7 @@ public class FragmentFolder extends FragmentEx {
@Override
public void onChanged(@Nullable EntityFolder folder) {
if (folder == null) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
finish();
return;
}

4
app/src/main/java/eu/faircode/email/FragmentFolders.java
View file

@ -33,7 +33,6 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -109,8 +108,7 @@ public class FragmentFolders extends FragmentEx {
@Override
public void onChanged(@Nullable List<TupleFolderEx> folders) {
if (folders == null) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
finish();
return;
}

4
app/src/main/java/eu/faircode/email/FragmentMessage.java
View file

@ -65,7 +65,6 @@ import androidx.browser.customtabs.CustomTabsIntent;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -313,8 +312,7 @@ public class FragmentMessage extends FragmentEx {
public void onChanged(@Nullable final TupleMessageEx message) {
if (message == null || (!(debug && BuildConfig.DEBUG) && message.ui_hide)) {
// Message gone (moved, deleted)
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
finish();
return;
}

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -40,7 +40,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
import androidx.paging.LivePagedListBuilder;
@ -155,8 +154,7 @@ public class FragmentMessages extends FragmentEx {
@Override
public void onChanged(@Nullable PagedList<TupleMessageEx> messages) {
if (messages == null) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getFragmentManager().popBackStack();
finish();
return;
}