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 decc11f74a
commit fbc8a983a7
20 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -1052,7 +1052,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
return intent; return intent;
} }
public static class FragmentDialogPassword extends FragmentDialogEx { public static class FragmentDialogPassword extends FragmentDialogBase {
private TextInputLayout etPassword1; private TextInputLayout etPassword1;
private TextInputLayout etPassword2; private TextInputLayout etPassword2;

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

@ -1119,7 +1119,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
return intent; return intent;
} }
public static class FragmentDialogFirst extends FragmentDialogEx { public static class FragmentDialogFirst extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -1136,7 +1136,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} }
} }
public static class FragmentDialogRate extends FragmentDialogEx { public static class FragmentDialogRate extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -3638,7 +3638,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
void finish(); void finish();
} }
public static class FragmentDialogLink extends FragmentDialogEx { public static class FragmentDialogLink extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3815,7 +3815,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
public static class FragmentDialogImage extends FragmentDialogEx { public static class FragmentDialogImage extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3851,7 +3851,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
public static class FragmentDialogFull extends FragmentDialogEx { public static class FragmentDialogFull extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3885,7 +3885,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
public static class FragmentDialogWebView extends FragmentDialogEx { public static class FragmentDialogWebView extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -4050,7 +4050,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
public static class FragmentKeywordManage extends FragmentDialogEx { public static class FragmentKeywordManage extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -4144,7 +4144,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
public static class FragmentKeywordAdd extends FragmentDialogEx { public static class FragmentKeywordAdd extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -265,7 +265,7 @@ public class FragmentAnswer extends FragmentBase {
}.execute(this, args, "answer:delete"); }.execute(this, args, "answer:delete");
} }
public static class FragmentInfo extends FragmentDialogEx { public static class FragmentInfo extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -3400,7 +3400,7 @@ public class FragmentCompose extends FragmentBase {
} }
}; };
public static class FragmentDialogContactGroup extends FragmentDialogEx { public static class FragmentDialogContactGroup extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3458,7 +3458,7 @@ public class FragmentCompose extends FragmentBase {
} }
} }
public static class FragmentDialogAnswer extends FragmentDialogEx { public static class FragmentDialogAnswer extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3502,7 +3502,7 @@ public class FragmentCompose extends FragmentBase {
} }
} }
public static class FragmentDialogLink extends FragmentDialogEx { public static class FragmentDialogLink extends FragmentDialogBase {
private EditText etLink; private EditText etLink;
@Override @Override
@ -3554,7 +3554,7 @@ public class FragmentCompose extends FragmentBase {
} }
} }
public static class FragmentDialogSend extends FragmentDialogEx { public static class FragmentDialogSend extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -164,7 +164,7 @@ public class FragmentContacts extends FragmentBase {
Helper.viewFAQ(getContext(), 84); Helper.viewFAQ(getContext(), 84);
} }
public static class FragmentDelete extends FragmentDialogEx { public static class FragmentDelete extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -34,7 +34,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
public class FragmentDialogAsk extends FragmentDialogEx { public class FragmentDialogAsk extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

6
app/src/main/java/eu/faircode/email/FragmentDialogEx.java → app/src/main/java/eu/faircode/email/FragmentDialogBase.java
Unescape View File

@ -17,7 +17,7 @@ import androidx.lifecycle.OnLifecycleEvent;
import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_CANCELED;
public class FragmentDialogEx extends DialogFragment { public class FragmentDialogBase extends DialogFragment {
private boolean once = false; private boolean once = false;
private LifecycleOwner owner; private LifecycleOwner owner;
private LifecycleRegistry registry; private LifecycleRegistry registry;
@ -115,8 +115,8 @@ public class FragmentDialogEx extends DialogFragment {
fragment.getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() { fragment.getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY) @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
public void onDestroy() { public void onDestroy() {
Log.i("Reset target " + FragmentDialogEx.this); Log.i("Reset target " + FragmentDialogBase.this);
FragmentDialogEx.super.setTargetFragment(null, requestCode); FragmentDialogBase.super.setTargetFragment(null, requestCode);
} }
}); });
} }

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

@ -43,7 +43,7 @@ import java.util.Date;
import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
public class FragmentDialogDuration extends FragmentDialogEx { public class FragmentDialogDuration extends FragmentDialogBase {
private Calendar cal = Calendar.getInstance(); private Calendar cal = Calendar.getInstance();
@Override @Override

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

@ -36,7 +36,7 @@ import java.util.List;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
public class FragmentDialogFolder extends FragmentDialogEx { public class FragmentDialogFolder extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -20,7 +20,7 @@ import java.util.Locale;
import io.noties.markwon.Markwon; import io.noties.markwon.Markwon;
public class FragmentDialogMarkdown extends FragmentDialogEx { public class FragmentDialogMarkdown extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -1143,7 +1143,7 @@ public class FragmentIdentity extends FragmentBase {
etSignature.setTag(html); etSignature.setTag(html);
} }
public static class FragmentDialogHtml extends FragmentDialogEx { public static class FragmentDialogHtml extends FragmentDialogBase {
private EditText etHtml; private EditText etHtml;
@Override @Override

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

@ -4641,7 +4641,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}; };
} }
public static class FragmentDialogReporting extends FragmentDialogEx { public static class FragmentDialogReporting extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -4681,7 +4681,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
} }
public static class FragmentDialogAccount extends FragmentDialogEx { public static class FragmentDialogAccount extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -4719,7 +4719,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
} }
public static class FragmentDialogError extends FragmentDialogEx { public static class FragmentDialogError extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -126,7 +126,7 @@ public class FragmentOperations extends FragmentBase {
Helper.viewFAQ(getContext(), 3); Helper.viewFAQ(getContext(), 3);
} }
public static class DialogDelete extends FragmentDialogEx { public static class DialogDelete extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -411,7 +411,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swActionbar.setChecked(prefs.getBoolean("actionbar", true)); swActionbar.setChecked(prefs.getBoolean("actionbar", true));
} }
public static class FragmentDialogTheme extends FragmentDialogEx { public static class FragmentDialogTheme extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -315,7 +315,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime()); return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
} }
public static class TimePickerFragment extends FragmentDialogEx implements TimePickerDialog.OnTimeSetListener { public static class TimePickerFragment extends FragmentDialogBase implements TimePickerDialog.OnTimeSetListener {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {

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

@ -499,7 +499,7 @@ public class FragmentQuickSetup extends FragmentBase {
} }
} }
public static class FragmentDialogDone extends FragmentDialogEx { public static class FragmentDialogDone extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -998,7 +998,7 @@ public class FragmentRule extends FragmentBase {
return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime()); return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
} }
public static class TimePickerFragment extends FragmentDialogEx implements TimePickerDialog.OnTimeSetListener { public static class TimePickerFragment extends FragmentDialogBase implements TimePickerDialog.OnTimeSetListener {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
@ -1027,7 +1027,7 @@ public class FragmentRule extends FragmentBase {
} }
} }
public static class FragmentDialogCheck extends FragmentDialogEx { public static class FragmentDialogCheck extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -413,7 +413,7 @@ public class FragmentSetup extends FragmentBase {
btnPermissions.setEnabled(!has); btnPermissions.setEnabled(!has);
} }
public static class FragmentDialogDoze extends FragmentDialogEx { public static class FragmentDialogDoze extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -471,7 +471,7 @@ public class Helper {
fragment.show(manager, "error:unexpected"); fragment.show(manager, "error:unexpected");
} }
public static class FragmentDialogUnexpected extends FragmentDialogEx { public static class FragmentDialogUnexpected extends FragmentDialogBase {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

Write Preview
Loading…
Cancel
Save