msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Prevent crash

Browse Source
pull/156/head
M66B 5 years ago
parent 7f5d9293a4
commit 709506deb2
9 changed files with 196 additions and 172 deletions
Show Stats Download Patch File Download Diff File

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

@ -133,7 +133,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
return Helper.sha256(BuildConfig.APPLICATION_ID + getChallenge()); return Helper.sha256(BuildConfig.APPLICATION_ID + getChallenge());
} }
BroadcastReceiver receiver = new BroadcastReceiver() { private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (ACTION_PURCHASE.equals(intent.getAction())) if (ACTION_PURCHASE.equals(intent.getAction()))

39
app/src/main/java/eu/faircode/email/ActivityCompose.java
Unescape View File

@ -19,7 +19,10 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B) Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/ */
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.net.MailTo; import android.net.MailTo;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -31,6 +34,7 @@ import androidx.core.app.TaskStackBuilder;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.safety.Whitelist; import org.jsoup.safety.Whitelist;
@ -52,6 +56,8 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
static final int PI_REPLY = 1; static final int PI_REPLY = 1;
static final String ACTION_SHOW_PRO = BuildConfig.APPLICATION_ID + ".SHOW_PRO";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -214,4 +220,37 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
return false; return false;
} }
} }
@Override
protected void onResume() {
super.onResume();
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
IntentFilter iff = new IntentFilter();
iff.addAction(ACTION_SHOW_PRO);
lbm.registerReceiver(receiver, iff);
}
@Override
protected void onPause() {
super.onPause();
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
lbm.unregisterReceiver(receiver);
}
private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (ACTION_SHOW_PRO.equals(intent.getAction()))
onShowPro(intent);
}
};
private void onShowPro(Intent intent) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }

16
app/src/main/java/eu/faircode/email/ActivitySetup.java
Unescape View File

@ -367,20 +367,16 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
} }
private void onMenuExport() { private void onMenuExport() {
if (Helper.isPro(this)) if (!Helper.isPro(this)) {
onShowPro(null);
return;
}
try { try {
askPassword(true); askPassword(true);
} catch (Throwable ex) { } catch (Throwable ex) {
Helper.unexpectedError(this, this, ex); Helper.unexpectedError(this, this, ex);
} }
else {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
private void onMenuImport() { private void onMenuImport() {
@ -921,7 +917,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
BroadcastReceiver receiver = new BroadcastReceiver() { private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (ACTION_EDIT_ACCOUNT.equals(intent.getAction())) if (ACTION_EDIT_ACCOUNT.equals(intent.getAction()))

17
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -344,7 +344,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override @Override
public void run() { public void run() {
drawerLayout.closeDrawer(drawerContainer); drawerLayout.closeDrawer(drawerContainer);
onMenuPro(); onShowPro(null);
} }
})); }));
@ -930,15 +930,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
private void onMenuPro() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
private void onMenuInvite() { private void onMenuInvite() {
startActivity(getIntentInvite()); startActivity(getIntentInvite());
} }
@ -1008,7 +999,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
BroadcastReceiver receiver = new BroadcastReceiver() { private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) { if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
@ -1182,9 +1173,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onColor(final Intent intent) { private void onColor(final Intent intent) {
if (!Helper.isPro(this)) { if (!Helper.isPro(this)) {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); onShowPro(null);
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
return; return;
} }

19
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -61,8 +61,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.colorpicker.ColorPickerDialog; import com.android.colorpicker.ColorPickerDialog;
import com.android.colorpicker.ColorPickerSwatch; import com.android.colorpicker.ColorPickerSwatch;
@ -327,7 +327,12 @@ public class FragmentAccount extends FragmentBase {
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SHOW_PRO));
return;
}
int[] colors = getContext().getResources().getIntArray(R.array.colorPicker); int[] colors = getContext().getResources().getIntArray(R.array.colorPicker);
ColorPickerDialog colorPickerDialog = new ColorPickerDialog(); ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length); colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length);
@ -338,11 +343,6 @@ public class FragmentAccount extends FragmentBase {
} }
}); });
colorPickerDialog.show(getFragmentManager(), "colorpicker"); colorPickerDialog.show(getFragmentManager(), "colorpicker");
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
}); });
@ -399,9 +399,8 @@ public class FragmentAccount extends FragmentBase {
if (isChecked && !Helper.isPro(getContext())) { if (isChecked && !Helper.isPro(getContext())) {
cbNotify.setChecked(false); cbNotify.setChecked(false);
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SHOW_PRO));
fragmentTransaction.commit();
} }
} }
}); });

26
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -98,9 +98,9 @@ import androidx.constraintlayout.widget.Group;
import androidx.core.content.FileProvider; import androidx.core.content.FileProvider;
import androidx.cursoradapter.widget.SimpleCursorAdapter; import androidx.cursoradapter.widget.SimpleCursorAdapter;
import androidx.exifinterface.media.ExifInterface; import androidx.exifinterface.media.ExifInterface;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -1019,11 +1019,11 @@ public class FragmentCompose extends FragmentBase {
private void onMenuAnswer() { private void onMenuAnswer() {
if (!Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); lbm.sendBroadcast(new Intent(ActivityCompose.ACTION_SHOW_PRO));
fragmentTransaction.commit();
return; return;
} }
new SimpleTask<List<EntityAnswer>>() { new SimpleTask<List<EntityAnswer>>() {
@Override @Override
protected List<EntityAnswer> onExecute(Context context, Bundle args) { protected List<EntityAnswer> onExecute(Context context, Bundle args) {
@ -1075,6 +1075,12 @@ public class FragmentCompose extends FragmentBase {
new DialogDuration.IDialogDuration() { new DialogDuration.IDialogDuration() {
@Override @Override
public void onDurationSelected(long duration, long time) { public void onDurationSelected(long duration, long time) {
if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityCompose.ACTION_SHOW_PRO));
return;
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", working); args.putLong("id", working);
args.putLong("wakeup", time); args.putLong("wakeup", time);
@ -1307,7 +1313,12 @@ public class FragmentCompose extends FragmentBase {
} }
private void onEncrypt() { private void onEncrypt() {
if (Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityCompose.ACTION_SHOW_PRO));
return;
}
if (pgpService.isBound()) if (pgpService.isBound())
try { try {
String to = etTo.getText().toString(); String to = etTo.getText().toString();
@ -1339,11 +1350,6 @@ public class FragmentCompose extends FragmentBase {
}); });
snackbar.show(); snackbar.show();
} }
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
private void doPgp(Intent data) { private void doPgp(Intent data) {

15
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -21,6 +21,7 @@ package eu.faircode.email;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.GradientDrawable;
import android.os.Bundle; import android.os.Bundle;
@ -50,7 +51,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.colorpicker.ColorPickerDialog; import com.android.colorpicker.ColorPickerDialog;
import com.android.colorpicker.ColorPickerSwatch; import com.android.colorpicker.ColorPickerSwatch;
@ -276,7 +277,12 @@ public class FragmentIdentity extends FragmentBase {
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SHOW_PRO));
return;
}
int[] colors = getContext().getResources().getIntArray(R.array.colorPicker); int[] colors = getContext().getResources().getIntArray(R.array.colorPicker);
ColorPickerDialog colorPickerDialog = new ColorPickerDialog(); ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length); colorPickerDialog.initialize(R.string.title_account_color, colors, color, 4, colors.length);
@ -287,11 +293,6 @@ public class FragmentIdentity extends FragmentBase {
} }
}); });
colorPickerDialog.show(getFragmentManager(), "colorpicker"); colorPickerDialog.show(getFragmentManager(), "colorpicker");
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
}); });

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

@ -299,9 +299,8 @@ public class FragmentMessages extends FragmentBase {
tvSupport.setOnClickListener(new View.OnClickListener() { tvSupport.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
fragmentTransaction.commit();
} }
}); });
@ -1544,7 +1543,12 @@ public class FragmentMessages extends FragmentBase {
new DialogDuration.IDialogDuration() { new DialogDuration.IDialogDuration() {
@Override @Override
public void onDurationSelected(long duration, long time) { public void onDurationSelected(long duration, long time) {
if (Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
return;
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLongArray("ids", getSelection()); args.putLongArray("ids", getSelection());
args.putLong("wakeup", duration == 0 ? -1 : time); args.putLong("wakeup", duration == 0 ? -1 : time);
@ -1589,11 +1593,6 @@ public class FragmentMessages extends FragmentBase {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
} }
}.execute(FragmentMessages.this, args, "messages:snooze"); }.execute(FragmentMessages.this, args, "messages:snooze");
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
@Override @Override
@ -1649,9 +1648,8 @@ public class FragmentMessages extends FragmentBase {
private void onActionFlagColorSelection() { private void onActionFlagColorSelection() {
if (!Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
fragmentTransaction.commit();
return; return;
} }
@ -3258,7 +3256,12 @@ public class FragmentMessages extends FragmentBase {
static void search( static void search(
final Context context, final LifecycleOwner owner, final FragmentManager manager, final Context context, final LifecycleOwner owner, final FragmentManager manager,
long folder, boolean server, String query) { long folder, boolean server, String query) {
if (Helper.isPro(context)) { if (!Helper.isPro(context)) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
return;
}
if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
manager.popBackStack("search", FragmentManager.POP_BACK_STACK_INCLUSIVE); manager.popBackStack("search", FragmentManager.POP_BACK_STACK_INCLUSIVE);
@ -3273,14 +3276,6 @@ public class FragmentMessages extends FragmentBase {
FragmentTransaction fragmentTransaction = manager.beginTransaction(); FragmentTransaction fragmentTransaction = manager.beginTransaction();
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search"); fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
fragmentTransaction.commit(); fragmentTransaction.commit();
} else {
if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
manager.popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = manager.beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
private class MoreResult { private class MoreResult {

7
app/src/main/java/eu/faircode/email/FragmentRule.java
Unescape View File

@ -48,7 +48,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -666,9 +666,8 @@ public class FragmentRule extends FragmentBase {
private void onActionSave() { private void onActionSave() {
if (!Helper.isPro(getContext())) { if (!Helper.isPro(getContext())) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
fragmentTransaction.commit();
return; return;
} }

Write Preview
Loading…
Cancel
Save