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

Refactoring

Browse Source
pull/162/head
M66B 6 years ago
parent 2752f7435b
commit 41f5425ffa
9 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -4343,7 +4343,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }
@ -4420,7 +4420,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }

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

@ -346,7 +346,7 @@ public class FragmentAccounts extends FragmentBase {
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getContext().startActivity( startActivity(
new Intent(getContext(), ActivitySetup.class) new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }

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

@ -118,6 +118,13 @@ public class FragmentBase extends Fragment {
finish = true; finish = true;
} }
protected void restart() {
Intent intent = new Intent(getContext(), ActivityMain.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
Runtime.getRuntime().exit(0);
}
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
Log.i("Save instance " + this); Log.i("Save instance " + this);

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

@ -1068,7 +1068,7 @@ public class FragmentCompose extends FragmentBase {
private void onMenuAnswer() { private void onMenuAnswer() {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }

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

@ -181,7 +181,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
protected void sendResult(int result) { protected void sendResult(int result) {
if (result == RESULT_OK) { if (result == RESULT_OK) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getActivity().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
result = RESULT_CANCELED; result = RESULT_CANCELED;
} }
} }

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

@ -360,7 +360,7 @@ public class FragmentFolders extends FragmentBase {
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getContext().startActivity( startActivity(
new Intent(getContext(), ActivitySetup.class) new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }

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

@ -387,7 +387,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
tvSupport.setOnClickListener(new View.OnClickListener() { tvSupport.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
} }
}); });
@ -1187,7 +1187,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getContext().startActivity( startActivity(
new Intent(getContext(), ActivitySetup.class) new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
@ -2993,7 +2993,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getContext().startActivity( startActivity(
new Intent(getContext(), ActivitySetup.class) new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
@ -3695,7 +3695,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
case REQUEST_MESSAGES_COLOR: case REQUEST_MESSAGES_COLOR:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }
@ -4149,7 +4149,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private void onColor(long id, int color) { private void onColor(long id, int color) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }
@ -4234,7 +4234,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private void onSnoozeSelection(Bundle args) { private void onSnoozeSelection(Bundle args) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }

8
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
Unescape View File

@ -22,7 +22,6 @@ package eu.faircode.email;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.Bundle; import android.os.Bundle;
@ -333,11 +332,4 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
getString(R.string.title_advanced_last_cleanup, getString(R.string.title_advanced_last_cleanup,
time < 0 ? "-" : DTF.format(time))); time < 0 ? "-" : DTF.format(time)));
} }
private void restart() {
Intent intent = new Intent(getContext(), ActivityMain.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
Runtime.getRuntime().exit(0);
}
} }

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

@ -496,7 +496,7 @@ public class FragmentRule extends FragmentBase {
case REQUEST_COLOR: case REQUEST_COLOR:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }
@ -773,7 +773,7 @@ public class FragmentRule extends FragmentBase {
private void onActionSave() { private void onActionSave() {
if (!ActivityBilling.isPro(getContext())) { if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
return; return;
} }

Write Preview
Loading…
Cancel
Save