pull/213/head
M66B 2 years ago
parent a72f1471ba
commit 3a8a0b817b

@ -272,7 +272,7 @@ public class FragmentAccounts extends FragmentBase {
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
FragmentDialogIdentity.onDrafts( FragmentDialogIdentity.onDrafts(
getContext(), getActivity(),
getViewLifecycleOwner(), getViewLifecycleOwner(),
getParentFragmentManager(), getParentFragmentManager(),
fabCompose, -1L); fabCompose, -1L);

@ -38,6 +38,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.core.view.GravityCompat;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -246,7 +249,21 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
}.execute(context, owner, args, "identity:compose"); }.execute(context, owner, args, "identity:compose");
} }
static void onDrafts(Context context, LifecycleOwner owner, FragmentManager manager, FloatingActionButton fabCompose, long account) { static void onDrafts(FragmentActivity activity, LifecycleOwner owner, FragmentManager manager, FloatingActionButton fabCompose, long account) {
if (activity == null)
return;
if (BuildConfig.DEBUG) {
DrawerLayoutEx drawerLayout = activity.findViewById(R.id.drawer_layout);
NestedScrollView drawerContainer = activity.findViewById(R.id.drawer_container);
if (drawerLayout != null &&
drawerContainer != null &&
!drawerLayout.isLocked(drawerContainer)) {
drawerLayout.openDrawer(GravityCompat.START);
return;
}
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("account", account); args.putLong("account", account);
@ -277,7 +294,7 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
if (drafts == null) if (drafts == null)
return; return;
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(activity);
lbm.sendBroadcast( lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES) new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", drafts.account) .putExtra("account", drafts.account)
@ -289,6 +306,6 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(manager, ex); Log.unexpectedError(manager, ex);
} }
}.execute(context, owner, args, "view:drafts"); }.execute(activity, owner, args, "view:drafts");
} }
} }

@ -376,7 +376,7 @@ public class FragmentFolders extends FragmentBase {
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
FragmentDialogIdentity.onDrafts( FragmentDialogIdentity.onDrafts(
getContext(), getActivity(),
getViewLifecycleOwner(), getViewLifecycleOwner(),
getParentFragmentManager(), getParentFragmentManager(),
fabCompose, account); fabCompose, account);

@ -1498,7 +1498,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
FragmentDialogIdentity.onDrafts( FragmentDialogIdentity.onDrafts(
getContext(), getActivity(),
getViewLifecycleOwner(), getViewLifecycleOwner(),
getParentFragmentManager(), getParentFragmentManager(),
fabCompose, account); fabCompose, account);

Loading…
Cancel
Save