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

@@ -711,7 +711,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:move");
}
@@ -727,7 +727,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogDuration fragment = new FragmentDialogDuration();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_SNOOZE);
fragment.show(getFragmentManager(), "message:snooze");
fragment.show(getParentFragmentManager(), "message:snooze");
}
});
@@ -760,7 +760,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogIdentity fragment = new FragmentDialogIdentity();
fragment.setArguments(args);
fragment.show(getFragmentManager(), "messages:identities");
fragment.show(getParentFragmentManager(), "messages:identities");
}
}
});
@@ -799,7 +799,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:drafts");
@@ -857,7 +857,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogFolder fragment = new FragmentDialogFolder();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_SEARCH);
fragment.show(getFragmentManager(), "messages:search");
fragment.show(getParentFragmentManager(), "messages:search");
return true;
}
@@ -868,11 +868,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:search");
} else
search(getContext(), getViewLifecycleOwner(), getFragmentManager(), folder, true, query);
search(getContext(), getViewLifecycleOwner(), getParentFragmentManager(), folder, true, query);
}
});
@@ -1196,7 +1196,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:refresh");
}
@@ -1337,7 +1337,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:move");
}
@@ -1595,7 +1595,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogDuration fragment = new FragmentDialogDuration();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_SNOOZE);
fragment.show(getFragmentManager(), "message:snooze");
fragment.show(getParentFragmentManager(), "message:snooze");
}
private void onMenuColor() {
@@ -1607,7 +1607,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogColor fragment = new FragmentDialogColor();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_MESSAGE_COLOR);
fragment.show(getFragmentManager(), "message:color");
fragment.show(getParentFragmentManager(), "message:color");
}
private void onMenuMove() {
@@ -1622,7 +1622,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogFolder fragment = new FragmentDialogFolder();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_MOVE);
fragment.show(getFragmentManager(), "message:move");
fragment.show(getParentFragmentManager(), "message:move");
}
});
@@ -1685,7 +1685,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:swipe");
}
@@ -1864,7 +1864,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:more");
}
@@ -1920,7 +1920,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:seen");
}
@@ -1962,7 +1962,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogDuration fragment = new FragmentDialogDuration();
fragment.setArguments(args);
fragment.setTargetFragment(this, REQUEST_MESSAGES_SNOOZE);
fragment.show(getFragmentManager(), "messages:snooze");
fragment.show(getParentFragmentManager(), "messages:snooze");
}
private void onActionFlagSelection(boolean flagged, Integer color) {
@@ -2007,7 +2007,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:flag");
}
@@ -2020,7 +2020,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogColor fragment = new FragmentDialogColor();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_COLOR);
fragment.show(getFragmentManager(), "messages:color");
fragment.show(getParentFragmentManager(), "messages:color");
}
private void onActionDeleteSelection() {
@@ -2067,12 +2067,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_DELETE);
ask.show(getFragmentManager(), "messages:delete");
ask.show(getParentFragmentManager(), "messages:delete");
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:delete:ask");
}
@@ -2087,7 +2087,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_JUNK);
ask.show(getFragmentManager(), "messages:junk");
ask.show(getParentFragmentManager(), "messages:junk");
}
private void onActionMoveSelection(final String type) {
@@ -2141,7 +2141,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:move");
}
@@ -2155,7 +2155,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogFolder fragment = new FragmentDialogFolder();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_MESSAGES_MOVE);
fragment.show(getFragmentManager(), "messages:move");
fragment.show(getParentFragmentManager(), "messages:move");
}
private void onActionMoveSelection(long target) {
@@ -2205,7 +2205,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:move");
}
@@ -2544,7 +2544,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
snackbar.dismiss();
new FragmentDialogReporting().show(getFragmentManager(), "reporting");
new FragmentDialogReporting().show(getParentFragmentManager(), "reporting");
}
});
@@ -2567,7 +2567,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onSearch(String query) {
FragmentMessages.search(
getContext(), getViewLifecycleOwner(), getFragmentManager(),
getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
folder, false, query);
}
});
@@ -2586,7 +2586,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAccount fragment = new FragmentDialogAccount();
fragment.setArguments(new Bundle());
fragment.setTargetFragment(FragmentMessages.this, REQUEST_ACCOUNT);
fragment.show(getFragmentManager(), "messages:accounts");
fragment.show(getParentFragmentManager(), "messages:accounts");
return true;
}
});
@@ -2778,7 +2778,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private void onMenuFolders(long account) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getFragmentManager().popBackStack("unified", 0);
getParentFragmentManager().popBackStack("unified", 0);
Bundle args = new Bundle();
args.putLong("account", account);
@@ -2786,7 +2786,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentFolders fragment = new FragmentFolders();
fragment.setArguments(args);
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folders");
fragmentTransaction.commit();
}
@@ -2894,7 +2894,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(this, FragmentMessages.REQUEST_EMPTY_FOLDER);
ask.show(getFragmentManager(), "messages:empty");
ask.show(getParentFragmentManager(), "messages:empty");
}
private void onMenuForceSync() {
@@ -2998,7 +2998,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, new Bundle(), "search:reset");
} else
@@ -3056,7 +3056,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogError fragment = new FragmentDialogError();
fragment.setArguments(args);
fragment.show(getFragmentManager(), "boundary:error");
fragment.show(getParentFragmentManager(), "boundary:error");
}
}
};
@@ -3285,7 +3285,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.setLog(false).execute(this, args, "messages:navigation");
}
@@ -3367,7 +3367,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.setLog(false).execute(this, args, "messages:expand");
}
@@ -3406,7 +3406,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
getParentFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
getArguments().putBoolean("fade", true);
getArguments().putBoolean("left", left);
@@ -3426,7 +3426,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int res = (pane ? R.id.content_pane : R.id.content_frame);
if (getActivity() != null && getActivity().findViewById(res) != null) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(res, fragment).addToBackStack("thread");
fragmentTransaction.commit();
}
@@ -3434,7 +3434,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:navigate");
}
@@ -3459,7 +3459,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(FragmentMessages.this, REQUEST_ASKED_MOVE);
ask.show(getFragmentManager(), "messages:move");
ask.show(getParentFragmentManager(), "messages:move");
}
private void moveAskConfirmed(ArrayList<MessageTarget> result) {
@@ -3500,7 +3500,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:move");
}
@@ -3545,7 +3545,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:undo");
}
@@ -3784,7 +3784,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args");
search(
getContext(), getViewLifecycleOwner(), getFragmentManager(),
getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
args.getLong("folder"), true, args.getString("query"));
}
break;
@@ -3873,7 +3873,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "raw:save");
}
@@ -4041,7 +4041,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
REQUEST_DECRYPT,
null, 0, 0, 0, null);
} catch (IntentSender.SendIntentException ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}
@@ -4050,7 +4050,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "decrypt");
}
@@ -4106,7 +4106,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:delete");
}
@@ -4141,7 +4141,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:delete:execute");
}
@@ -4176,7 +4176,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:junk");
}
@@ -4197,7 +4197,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(FragmentMessages.this, REQUEST_ASKED_MOVE_ACROSS);
ask.show(getFragmentManager(), "messages:move:across");
ask.show(getParentFragmentManager(), "messages:move:across");
} else
moveAskConfirmed(result);
}
@@ -4234,7 +4234,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:color");
}
@@ -4282,7 +4282,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:snooze");
}
@@ -4336,7 +4336,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "messages:snooze");
}
@@ -4390,7 +4390,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:move");
}
@@ -4526,7 +4526,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, pargs, "message:print");
}
@@ -4566,7 +4566,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "folder:delete");
}
@@ -4716,7 +4716,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, new Bundle(), "messages:accounts");
@@ -4811,7 +4811,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, new Bundle(), "identity:select");