diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index f55b2b5d..50051f52 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -39,7 +39,7 @@ public class DialogHelper { context.showMenu(); }) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); + .show(); } @@ -59,7 +59,7 @@ public class DialogHelper { }).start(); }) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); + .show(); } public static void showChangelog(QKActivity context) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java index 5d0bcc39..af5255cd 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java @@ -199,7 +199,7 @@ public class DonationManager { .setContext(mContext) .setCustomView(view); - dialog.show(mContext.getFragmentManager(), "donate dialog"); + dialog.show(); } public void donatePaypal() { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java index 469b1d84..67a7d632 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java @@ -46,7 +46,7 @@ public class ConversationDetailsDialog implements ConversationDetails { .setTitle(R.string.dialog_conversation_details_title) .setCustomView(listView) .setPositiveButton(R.string.okay, null) - .show(mFragmentManager, "conversation details"); + .show(); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index bb19e1a9..f103af36 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -194,7 +194,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen .setMessage(R.string.icon_ready_message) .setCustomView(imageView) .setPositiveButton(R.string.okay, null) - .show(getFragmentManager(), null); + .show(); // Only show the MMS setup fragment if it hasn't already been dismissed } else if (!wasMmsSetupFragmentDismissed(savedInstanceState)) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index b4a772e3..ecd25eaf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -449,7 +449,7 @@ public class ThemeManager { } }) .setNegativeButton(R.string.cancel, null) - .show(((MainActivity) context).getFragmentManager(), "icon"); + .show(); } public static int getBackgroundColor() { @@ -558,7 +558,7 @@ public class ThemeManager { .setCustomView(palette) .setNegativeButton(R.string.cancel, null); - dialog.show(context.getFragmentManager(), "colorpicker"); + dialog.show(); } private static void showColourPickerDialog(final QKActivity context, int swatchColour) { @@ -580,7 +580,7 @@ public class ThemeManager { .setTitle(R.string.pref_theme) .setCustomView(palette) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), "colorpicker"); + .show(); } public static void setStatusBarTintEnabled(boolean enabled) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java index 93d1729a..e3bdb4bc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java @@ -35,7 +35,7 @@ public class BlockedNumberDialog { } }) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), "remove from future blocked"); + .show(); } }) .setPositiveButton(R.string.add, new View.OnClickListener() { @@ -55,10 +55,10 @@ public class BlockedNumberDialog { } }) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), "add to future blocked"); + .show(); } }) .setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), "future blocked conversations"); + .show(); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java index 7a4958b3..69d85eed 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java @@ -2,6 +2,7 @@ package com.moez.QKSMS.ui.dialog; import android.app.Dialog; import android.app.DialogFragment; +import android.app.FragmentManager; import android.content.Context; import android.content.res.Resources; import android.graphics.Color; @@ -33,11 +34,6 @@ import java.util.ArrayList; public class QKDialog extends DialogFragment { private final String TAG = "QKDialog"; - public static final String LIST_TAG = "list"; - public static final String DETAILS_TAG = "details"; - public static final String RESTART_TAG = "restart"; - public static final String CONFIRMATION_TAG = "confirmation"; - protected QKActivity mContext; protected Resources mResources; @@ -461,4 +457,13 @@ public class QKDialog extends DialogFragment { } } + public void show() { + super.show(mContext.getFragmentManager(), null); + } + + @Deprecated + @Override + public void show(FragmentManager manager, String tag) { + super.show(manager, tag); + } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index c3ad61c2..68b4f390 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -44,7 +44,6 @@ import android.view.ViewGroup; import android.webkit.MimeTypeMap; import android.widget.AdapterView; import android.widget.Toast; - import com.google.android.mms.ContentType; import com.google.android.mms.MmsException; import com.google.android.mms.pdu_alt.PduBody; @@ -83,6 +82,8 @@ import com.moez.QKSMS.ui.view.ComposeView; import com.moez.QKSMS.ui.view.MessageListRecyclerView; import com.moez.QKSMS.ui.view.SmoothLinearLayoutManager; import com.moez.QKSMS.ui.widget.WidgetProvider; +import ezvcard.Ezvcard; +import ezvcard.VCard; import java.io.File; import java.io.FileInputStream; @@ -93,9 +94,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import ezvcard.Ezvcard; -import ezvcard.VCard; - public class MessageListFragment extends QKContentFragment implements ActivityLauncher, SensorEventListener, LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.MultiSelectListener, RecyclerCursorAdapter.ItemClickListener { @@ -358,7 +356,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa MessageUtils.viewMmsMessageAttachment(getActivity(), messageItem.mMessageUri, messageItem.mSlideshow, getAsyncDialog()); } }) - .show(getFragmentManager(), null); + .show(); break; } } else if (messageItem != null && messageItem.isOutgoingMessage() && messageItem.isFailedMessage()) { @@ -451,7 +449,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa } dialog.buildMenu(l); - dialog.show(getFragmentManager(), "messagelistitem options"); + dialog.show(); } private void addCallAndContactMenuItems(QKDialog dialog, MessageItem msgItem) { @@ -634,7 +632,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa case R.id.menu_notification_settings: ConversationNotificationSettingsDialog.newInstance(mThreadId, mConversation.getRecipients().formatNames(", ")) .setContext(mContext) - .show(getFragmentManager(), "notification prefs"); + .show(); return true; case R.id.menu_delete_conversation: @@ -989,7 +987,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa break; } } - }).show(getFragmentManager(), QKDialog.LIST_TAG); + }).show(); return true; } @@ -1017,7 +1015,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa .setTitle(R.string.message_details_title) .setMessage(messageDetails) .setCancelOnTouchOutside(true) - .show(getFragmentManager(), QKDialog.DETAILS_TAG); + .show(); return true; } @@ -1054,7 +1052,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa .setTitle(R.string.delivery_header_title) .setItems(items, null) .setPositiveButton(R.string.okay, null) - .show(getFragmentManager(), "delivery report"); + .show(); } /** diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index f133e4e1..b077daf3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -546,7 +546,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O ThemeManager.showColourSwatchesDialog(mContext); break; case BUBBLES: - new BubblePreferenceDialog().setContext(mContext).show(mContext.getFragmentManager(), "bubbles"); + new BubblePreferenceDialog().setContext(mContext).show(); break; case ICON: ThemeManager.setIcon(mContext); @@ -600,7 +600,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O startActivity(browserIntent); } }) - .show(getFragmentManager(), "thanks"); + .show(); break; case SIMPLE_PREFS: mContext.onOptionsItemSelected(mContext.getMenu().findItem(R.id.simple_settings)); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index 346c2e87..a565a5cf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -538,7 +538,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L toggleDelayedMessaging(); } }) - .show(((QKActivity) mContext).getFragmentManager(), "delayed message info"); + .show(); mPrefs.edit().putBoolean(KEY_DELAYED_INFO_DIALOG_SHOWN, true).apply(); //This should be changed, the dialog should be shown each time when delayed messaging is disabled. }