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

Simplification, dialog fragment for quick setup

Browse Source
pull/157/head
M66B 6 years ago
parent 44fa9c4ce0
commit 53a71bd632
19 changed files with 90 additions and 160 deletions
Show Stats Download Patch File Download Diff File

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

@ -1021,7 +1021,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
return intent;
}
public static class FragmentDialogPassword extends DialogFragment {
public static class FragmentDialogPassword extends DialogFragmentEx {
private TextInputLayout etPassword1;
private TextInputLayout etPassword2;

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

@ -1051,7 +1051,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
return intent;
}
public static class FragmentDialogFirst extends DialogFragment {
public static class FragmentDialogFirst extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -1068,7 +1068,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
}
public static class FragmentDialogRate extends DialogFragment {
public static class FragmentDialogRate extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -3493,7 +3493,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
void finish();
}
public static class FragmentDialogLink extends DialogFragment {
public static class FragmentDialogLink extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3652,7 +3652,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
public static class FragmentKeywordManage extends DialogFragment {
public static class FragmentKeywordManage extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3747,7 +3747,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
public static class FragmentKeywordAdd extends DialogFragment {
public static class FragmentKeywordAdd extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

27
app/src/main/java/eu/faircode/email/DialogFragmentEx.java
Unescape View File

@ -0,0 +1,27 @@
package eu.faircode.email;
import android.content.DialogInterface;
import android.content.Intent;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import static android.app.Activity.RESULT_CANCELED;
public class DialogFragmentEx extends DialogFragment {
@Override
public void onDismiss(@NonNull DialogInterface dialog) {
super.onDismiss(dialog);
sendResult(RESULT_CANCELED);
}
protected void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, null);
}
}
}

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

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

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

@ -98,8 +98,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.FileProvider;
import androidx.cursoradapter.widget.SimpleCursorAdapter;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -145,7 +143,6 @@ import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class FragmentCompose extends FragmentBase {
@ -3243,7 +3240,7 @@ public class FragmentCompose extends FragmentBase {
}
};
public static class FragmentDialogContactGroup extends DialogFragment {
public static class FragmentDialogContactGroup extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3274,12 +3271,6 @@ public class FragmentCompose extends FragmentBase {
final AlertDialog dialog = new AlertDialog.Builder(getContext())
.setView(dview)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(Activity.RESULT_CANCELED);
}
})
.create();
lvGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@ -3302,18 +3293,9 @@ public class FragmentCompose extends FragmentBase {
return dialog;
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}
public static class FragmentDialogAnswer extends DialogFragment {
public static class FragmentDialogAnswer extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -3352,26 +3334,11 @@ public class FragmentCompose extends FragmentBase {
sendResult(RESULT_OK);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(RESULT_CANCELED);
}
})
.show();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}
public static class FragmentDialogLink extends DialogFragment {
public static class FragmentDialogLink extends DialogFragmentEx {
private EditText etLink;
@Override
@ -3419,22 +3386,7 @@ public class FragmentCompose extends FragmentBase {
sendResult(RESULT_OK);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(RESULT_CANCELED);
}
})
.create();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}
}

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

@ -180,7 +180,7 @@ public class FragmentContacts extends FragmentBase {
return intent;
}
public static class FragmentDelete extends DialogFragment {
public static class FragmentDelete extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -22,7 +22,6 @@ package eu.faircode.email;
import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -33,11 +32,9 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
public class FragmentDialogAsk extends DialogFragment {
public class FragmentDialogAsk extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -69,21 +66,6 @@ public class FragmentDialogAsk extends DialogFragment {
sendResult(Activity.RESULT_CANCELED);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(Activity.RESULT_CANCELED);
}
})
.create();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}

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

@ -21,7 +21,6 @@ package eu.faircode.email;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -33,18 +32,15 @@ import android.widget.TimePicker;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class FragmentDialogDuration extends DialogFragment {
public class FragmentDialogDuration extends DialogFragmentEx {
private Calendar cal = Calendar.getInstance();
@Override
@ -128,21 +124,6 @@ public class FragmentDialogDuration extends DialogFragment {
sendResult(RESULT_OK);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(RESULT_CANCELED);
}
})
.create();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}

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

@ -21,8 +21,6 @@ package eu.faircode.email;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@ -30,18 +28,15 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class FragmentDialogFolder extends DialogFragment {
public class FragmentDialogFolder extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -76,8 +71,7 @@ public class FragmentDialogFolder extends DialogFragment {
folders = new ArrayList<>();
long account = args.getLong("account");
AdapterFolder adapter = new AdapterFolder(
getContext(), getActivity(),
AdapterFolder adapter = new AdapterFolder(getContext(), getActivity(),
account, false, new AdapterFolder.IFolderSelectedListener() {
@Override
public void onFolderSelected(TupleFolderEx folder) {
@ -108,21 +102,6 @@ public class FragmentDialogFolder extends DialogFragment {
return new AlertDialog.Builder(getContext())
.setTitle(title)
.setView(dview)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(RESULT_CANCELED);
}
})
.create();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}

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

@ -56,8 +56,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.android.material.snackbar.Snackbar;
@ -75,7 +73,6 @@ import java.util.Properties;
import javax.mail.Session;
import javax.mail.Transport;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import static com.google.android.material.textfield.TextInputLayout.END_ICON_NONE;
import static com.google.android.material.textfield.TextInputLayout.END_ICON_PASSWORD_TOGGLE;
@ -1086,7 +1083,7 @@ public class FragmentIdentity extends FragmentBase {
etSignature.setTag(html);
}
public static class FragmentDialogHtml extends DialogFragment {
public static class FragmentDialogHtml extends DialogFragmentEx {
private EditText etHtml;
@Override
@ -1119,22 +1116,7 @@ public class FragmentIdentity extends FragmentBase {
sendResult(RESULT_OK);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
sendResult(RESULT_CANCELED);
}
})
.create();
}
private void sendResult(int result) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("args", getArguments());
target.onActivityResult(getTargetRequestCode(), result, data);
}
}
}
}

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

@ -4314,7 +4314,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
};
}
public static class FragmentDialogReporting extends DialogFragment {
public static class FragmentDialogReporting extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -4361,7 +4361,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}
}
public static class FragmentDialogError extends DialogFragment {
public static class FragmentDialogError extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@ -143,7 +143,7 @@ public class FragmentOperations extends FragmentBase {
return intent;
}
public static class DialogDelete extends DialogFragment {
public static class DialogDelete extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

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

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

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

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

@ -19,8 +19,10 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.text.TextUtils;
@ -40,6 +42,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group;
import com.google.android.material.snackbar.Snackbar;
@ -57,6 +60,8 @@ import javax.mail.Folder;
import javax.mail.Session;
import javax.mail.Transport;
import static android.app.Activity.RESULT_OK;
public class FragmentQuickSetup extends FragmentBase {
private ViewGroup view;
@ -73,6 +78,8 @@ public class FragmentQuickSetup extends FragmentBase {
private Button btnSave;
private Group grpSetup;
private static final int REQUEST_DONE = 1;
@Override
@Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -362,18 +369,11 @@ public class FragmentQuickSetup extends FragmentBase {
tvSmtp.setText(result == null ? null
: result.smtp_host + ":" + result.smtp_port + (result.smtp_starttls ? " starttls" : " ssl"));
grpSetup.setVisibility(result == null ? View.GONE : View.VISIBLE);
} else
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(R.string.title_setup_quick_success)
.setPositiveButton(android.R.string.ok, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
finish();
}
})
.create()
.show();
} else {
FragmentDialogDone fragment = new FragmentDialogDone();
fragment.setTargetFragment(FragmentQuickSetup.this, REQUEST_DONE);
fragment.show(getFragmentManager(), "quick:done");
}
}
@Override
@ -392,4 +392,31 @@ public class FragmentQuickSetup extends FragmentBase {
}
}.execute(FragmentQuickSetup.this, args, "setup:quick");
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_DONE:
finish();
break;
}
}
public static class FragmentDialogDone extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
return new AlertDialog.Builder(getContext())
.setMessage(R.string.title_setup_quick_success)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
sendResult(RESULT_OK);
}
})
.create();
}
}
}

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

@ -868,7 +868,7 @@ public class FragmentRule extends FragmentBase {
}
}
public static class FragmentDialogCheck extends DialogFragment {
public static class FragmentDialogCheck extends DialogFragmentEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

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

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

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

Write Preview
Loading…
Cancel
Save