Loading legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java +1 −1 Original line number Diff line number Diff line Loading @@ -1769,7 +1769,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, } } ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(title, ProgressDialogFragment fragment = ProgressDialogFragment.Companion.newInstance(title, getString(R.string.fetching_attachment_dialog_message)); fragment.show(getSupportFragmentManager(), FRAGMENT_WAITING_FOR_ATTACHMENT); } Loading legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.kt +33 −43 Original line number Diff line number Diff line package com.fsck.k9.fragment; package com.fsck.k9.fragment import android.app.Activity; import android.app.Dialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Bundle; import androidx.fragment.app.DialogFragment; import android.app.Dialog import android.app.ProgressDialog import android.content.DialogInterface import android.os.Bundle import androidx.fragment.app.DialogFragment class ProgressDialogFragment : DialogFragment() { public class ProgressDialogFragment extends DialogFragment { protected static final String ARG_TITLE = "title"; protected static final String ARG_MESSAGE = "message"; override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val args = requireArguments() val title = args.getString(ARG_TITLE) val message = args.getString(ARG_MESSAGE) public static ProgressDialogFragment newInstance(String title, String message) { ProgressDialogFragment fragment = new ProgressDialogFragment(); Bundle args = new Bundle(); args.putString(ARG_TITLE, title); args.putString(ARG_MESSAGE, message); fragment.setArguments(args); return fragment; return ProgressDialog(requireActivity()).apply { isIndeterminate = true setTitle(title) setMessage(message) } } override fun onCancel(dialog: DialogInterface) { (activity as? CancelListener)?.onProgressCancel(this) super.onCancel(dialog) } @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Bundle args = getArguments(); String title = args.getString(ARG_TITLE); String message = args.getString(ARG_MESSAGE); interface CancelListener { fun onProgressCancel(fragment: ProgressDialogFragment) } ProgressDialog dialog = new ProgressDialog(getActivity()); dialog.setIndeterminate(true); dialog.setTitle(title); dialog.setMessage(message); companion object { private const val ARG_TITLE = "title" private const val ARG_MESSAGE = "message" return dialog; fun newInstance(title: String?, message: String?): ProgressDialogFragment { return ProgressDialogFragment().apply { arguments = Bundle().apply { putString(ARG_TITLE, title) putString(ARG_MESSAGE, message) } @Override public void onCancel(DialogInterface dialog) { Activity activity = getActivity(); if (activity != null && activity instanceof CancelListener) { CancelListener listener = (CancelListener) activity; listener.onProgressCancel(this); } super.onCancel(dialog); } public interface CancelListener { void onProgressCancel(ProgressDialogFragment fragment); } } Loading
legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java +1 −1 Original line number Diff line number Diff line Loading @@ -1769,7 +1769,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, } } ProgressDialogFragment fragment = ProgressDialogFragment.newInstance(title, ProgressDialogFragment fragment = ProgressDialogFragment.Companion.newInstance(title, getString(R.string.fetching_attachment_dialog_message)); fragment.show(getSupportFragmentManager(), FRAGMENT_WAITING_FOR_ATTACHMENT); } Loading
legacy/ui/legacy/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.kt +33 −43 Original line number Diff line number Diff line package com.fsck.k9.fragment; package com.fsck.k9.fragment import android.app.Activity; import android.app.Dialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Bundle; import androidx.fragment.app.DialogFragment; import android.app.Dialog import android.app.ProgressDialog import android.content.DialogInterface import android.os.Bundle import androidx.fragment.app.DialogFragment class ProgressDialogFragment : DialogFragment() { public class ProgressDialogFragment extends DialogFragment { protected static final String ARG_TITLE = "title"; protected static final String ARG_MESSAGE = "message"; override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val args = requireArguments() val title = args.getString(ARG_TITLE) val message = args.getString(ARG_MESSAGE) public static ProgressDialogFragment newInstance(String title, String message) { ProgressDialogFragment fragment = new ProgressDialogFragment(); Bundle args = new Bundle(); args.putString(ARG_TITLE, title); args.putString(ARG_MESSAGE, message); fragment.setArguments(args); return fragment; return ProgressDialog(requireActivity()).apply { isIndeterminate = true setTitle(title) setMessage(message) } } override fun onCancel(dialog: DialogInterface) { (activity as? CancelListener)?.onProgressCancel(this) super.onCancel(dialog) } @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Bundle args = getArguments(); String title = args.getString(ARG_TITLE); String message = args.getString(ARG_MESSAGE); interface CancelListener { fun onProgressCancel(fragment: ProgressDialogFragment) } ProgressDialog dialog = new ProgressDialog(getActivity()); dialog.setIndeterminate(true); dialog.setTitle(title); dialog.setMessage(message); companion object { private const val ARG_TITLE = "title" private const val ARG_MESSAGE = "message" return dialog; fun newInstance(title: String?, message: String?): ProgressDialogFragment { return ProgressDialogFragment().apply { arguments = Bundle().apply { putString(ARG_TITLE, title) putString(ARG_MESSAGE, message) } @Override public void onCancel(DialogInterface dialog) { Activity activity = getActivity(); if (activity != null && activity instanceof CancelListener) { CancelListener listener = (CancelListener) activity; listener.onProgressCancel(this); } super.onCancel(dialog); } public interface CancelListener { void onProgressCancel(ProgressDialogFragment fragment); } }