This commit is contained in:
M66B
2019-10-12 17:16:53 +02:00
parent 11995f372f
commit c32fe99e81
36 changed files with 236 additions and 235 deletions

View File

@@ -40,6 +40,7 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.documentfile.provider.DocumentFile;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Lifecycle;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -109,7 +110,7 @@ public class FragmentBase extends Fragment {
protected void finish() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getFragmentManager().popBackStack();
getParentFragmentManager().popBackStack();
else
finish = true;
}
@@ -170,7 +171,7 @@ public class FragmentBase extends Fragment {
super.onResume();
updateSubtitle();
if (finish) {
getFragmentManager().popBackStack();
getParentFragmentManager().popBackStack();
finish = false;
}
@@ -376,7 +377,7 @@ public class FragmentBase extends Fragment {
if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException)
ToastEx.makeText(getContext(), ex.getMessage(), Toast.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "attachment:save");
}
@@ -449,7 +450,7 @@ public class FragmentBase extends Fragment {
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "attachments:save");
}