Fix invalid casts to MainActivity

This commit is contained in:
Moez Bhatti
2016-05-04 22:28:42 -04:00
parent fb2f57fb6d
commit aa272bab66
5 changed files with 40 additions and 27 deletions
@@ -25,7 +25,7 @@ import java.util.Set;
public class DialogHelper { public class DialogHelper {
private static final String TAG = "DialogHelper"; private static final String TAG = "DialogHelper";
public static void showDeleteConversationDialog(MainActivity context, long threadId) { public static void showDeleteConversationDialog(QKActivity context, long threadId) {
Set<Long> threadIds = new HashSet<>(); Set<Long> threadIds = new HashSet<>();
threadIds.add(threadId); threadIds.add(threadId);
showDeleteConversationsDialog(context, threadIds); showDeleteConversationsDialog(context, threadIds);
@@ -9,8 +9,6 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ComponentInfo; import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@@ -26,7 +24,6 @@ import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduHeaders;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
import com.moez.QKSMS.common.ConversationPrefsHelper;
import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.DonationManager;
import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.LiveViewManager;
import com.moez.QKSMS.common.QKRateSnack; import com.moez.QKSMS.common.QKRateSnack;
@@ -39,7 +36,6 @@ import com.moez.QKSMS.transaction.NotificationManager;
import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.transaction.SmsHelper;
import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKActivity;
import com.moez.QKSMS.ui.conversationlist.ConversationListFragment; import com.moez.QKSMS.ui.conversationlist.ConversationListFragment;
import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog;
import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper;
import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.dialog.QKDialog;
import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment; import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment;
@@ -72,7 +68,6 @@ public class MainActivity extends QKActivity {
private ConversationListFragment mConversationList; private ConversationListFragment mConversationList;
private ContentFragment mContent; private ContentFragment mContent;
private long mWaitingForThreadId = -1;
private boolean mIsDestroyed = false; private boolean mIsDestroyed = false;
@@ -193,26 +188,9 @@ public class MainActivity extends QKActivity {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
public void getResultForThreadId(long threadId) {
mWaitingForThreadId = threadId;
}
/**
* When In-App billing is done, it'll return information via onActivityResult().
*/
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ConversationSettingsDialog.RINGTONE_REQUEST_CODE) { if (requestCode == WelcomeActivity.WELCOME_REQUEST_CODE) {
if (data != null) {
if (mWaitingForThreadId > 0) {
ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(this, mWaitingForThreadId);
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
conversationPrefs.putString(SettingsFragment.NOTIFICATION_TONE, uri.toString());
mWaitingForThreadId = -1;
}
}
} else if (requestCode == WelcomeActivity.WELCOME_REQUEST_CODE) {
new DefaultSmsHelper(this, R.string.not_default_first).showIfNotDefault(null); new DefaultSmsHelper(this, R.string.not_default_first).showIfNotDefault(null);
} }
} }
@@ -12,8 +12,8 @@ import android.widget.LinearLayout;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.ConversationPrefsHelper;
import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.common.utils.Units;
import com.moez.QKSMS.ui.MainActivity;
import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.ThemeManager;
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.settings.SettingsFragment;
import com.moez.QKSMS.ui.view.QKPreference; import com.moez.QKSMS.ui.view.QKPreference;
import com.moez.QKSMS.ui.view.QKRingtonePreference; import com.moez.QKSMS.ui.view.QKRingtonePreference;
@@ -125,7 +125,7 @@ public class ConversationSettingsDialog extends QKDialog implements Preference.O
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, getString(R.string.pref_ringtone)); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, getString(R.string.pref_ringtone));
intent.putExtra(ARG_THREAD_ID, mThreadId); intent.putExtra(ARG_THREAD_ID, mThreadId);
((MainActivity) getActivity()).getResultForThreadId(mThreadId); ((MessageListActivity) getActivity()).getResultForThreadId(mThreadId);
getActivity().startActivityForResult(intent, RINGTONE_REQUEST_CODE); getActivity().startActivityForResult(intent, RINGTONE_REQUEST_CODE);
break; break;
} }
@@ -3,6 +3,8 @@ package com.moez.QKSMS.ui.messagelist;
import android.app.FragmentManager; import android.app.FragmentManager;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.content.Intent; import android.content.Intent;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.util.Log; import android.util.Log;
@@ -10,10 +12,15 @@ import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import com.crashlytics.android.Crashlytics; import com.crashlytics.android.Crashlytics;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
import com.moez.QKSMS.common.ConversationPrefsHelper;
import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.common.utils.PhoneNumberUtils;
import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.mmssms.Utils;
import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKActivity;
import com.moez.QKSMS.ui.base.QKSwipeBackActivity; import com.moez.QKSMS.ui.base.QKSwipeBackActivity;
import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog;
import com.moez.QKSMS.ui.dialog.DefaultSmsHelper;
import com.moez.QKSMS.ui.settings.SettingsFragment;
import com.moez.QKSMS.ui.welcome.WelcomeActivity;
import java.net.URLDecoder; import java.net.URLDecoder;
@@ -30,6 +37,8 @@ public class MessageListActivity extends QKSwipeBackActivity {
private String mHighlight; private String mHighlight;
private boolean mShowImmediate; private boolean mShowImmediate;
private long mWaitingForThreadId = -1;
public static void launch(QKActivity context, long threadId, long rowId, String pattern, boolean showImmediate) { public static void launch(QKActivity context, long threadId, long rowId, String pattern, boolean showImmediate) {
Intent intent = new Intent(context, MessageListActivity.class); Intent intent = new Intent(context, MessageListActivity.class);
intent.putExtra(ARG_THREAD_ID, threadId); intent.putExtra(ARG_THREAD_ID, threadId);
@@ -107,6 +116,32 @@ public class MessageListActivity extends QKSwipeBackActivity {
} }
} }
public void getResultForThreadId(long threadId) {
mWaitingForThreadId = threadId;
}
/**
* When In-App billing is done, it'll return information via onActivityResult().
*/
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ConversationSettingsDialog.RINGTONE_REQUEST_CODE) {
if (data != null) {
if (mWaitingForThreadId > 0) {
ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(this, mWaitingForThreadId);
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
conversationPrefs.putString(SettingsFragment.NOTIFICATION_TONE, uri.toString());
mWaitingForThreadId = -1;
}
}
} else if (requestCode == WelcomeActivity.WELCOME_REQUEST_CODE) {
new DefaultSmsHelper(this, R.string.not_default_first).showIfNotDefault(null);
}
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
@@ -476,7 +476,7 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
return true; return true;
case R.id.menu_delete_conversation: case R.id.menu_delete_conversation:
DialogHelper.showDeleteConversationDialog((MainActivity) mContext, mThreadId); DialogHelper.showDeleteConversationDialog(mContext, mThreadId);
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);