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

Revert "Experiment" 

This reverts commit 3a8a0b817b.
This commit is contained in:
M66B 2023-07-09 21:33:49 +02:00
parent 5360cfcd2b
commit 66acc984e6
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/FragmentAccounts.java
View File

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

23
app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java
View File

@ -38,9 +38,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
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.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -249,21 +246,7 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
}.execute(context, owner, args, "identity:compose");
}
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;
}
}
static void onDrafts(Context context, LifecycleOwner owner, FragmentManager manager, FloatingActionButton fabCompose, long account) {
Bundle args = new Bundle();
args.putLong("account", account);
@ -294,7 +277,7 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
if (drafts == null)
return;
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(activity);
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", drafts.account)
@ -306,6 +289,6 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(manager, ex);
}
}.execute(activity, owner, args, "view:drafts");
}.execute(context, owner, args, "view:drafts");
}
}

2
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

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

2
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

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