From 11537c72655dc2abf08f057b2b37caa01e094cab Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 15 Jun 2016 00:44:10 -0400 Subject: [PATCH] Crashlytics #862 --- QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java | 4 ++-- .../main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java | 4 ++-- .../main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java | 2 +- .../QKSMS/ui/conversationlist/ConversationListFragment.java | 2 +- .../com/moez/QKSMS/ui/messagelist/MessageListActivity.java | 4 ++-- .../com/moez/QKSMS/ui/messagelist/MessageListFragment.java | 2 +- .../main/java/com/moez/QKSMS/ui/search/SearchActivity.java | 4 ++-- .../main/java/com/moez/QKSMS/ui/search/SearchFragment.java | 2 ++ .../java/com/moez/QKSMS/ui/settings/SettingsActivity.java | 4 ++-- .../java/com/moez/QKSMS/ui/settings/SettingsFragment.java | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) 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 1a0064bb..b4567f94 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -81,12 +81,12 @@ public class MainActivity extends QKActivity { ButterKnife.bind(this); FragmentManager fm = getFragmentManager(); - mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.content_frame); + mConversationList = (ConversationListFragment) fm.findFragmentByTag(ConversationListFragment.TAG); if (mConversationList == null) { mConversationList = new ConversationListFragment(); } FragmentTransaction menuTransaction = fm.beginTransaction(); - menuTransaction.replace(R.id.content_frame, mConversationList); + menuTransaction.replace(R.id.content_frame, mConversationList, ConversationListFragment.TAG); menuTransaction.commit(); showDialogIfNeeded(savedInstanceState); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java index 4c44bbf7..61af4880 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java @@ -17,13 +17,13 @@ public class ComposeActivity extends QKSwipeBackActivity { setTitle(R.string.title_compose); FragmentManager fm = getFragmentManager(); - mComposeFragment = (ComposeFragment) fm.findFragmentById(R.id.content_frame); + mComposeFragment = (ComposeFragment) fm.findFragmentByTag(ComposeFragment.TAG); if (mComposeFragment == null) { mComposeFragment = new ComposeFragment(); } fm.beginTransaction() - .replace(R.id.content_frame, mComposeFragment) + .replace(R.id.content_frame, mComposeFragment, ComposeFragment.TAG) .commit(); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java index 166b0a8d..d649320d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java @@ -22,7 +22,7 @@ import com.moez.QKSMS.ui.view.StarredContactsView; public class ComposeFragment extends QKFragment implements ActivityLauncher, RecipientProvider, ComposeView.OnSendListener, AdapterView.OnItemClickListener { - private final String TAG = "ComposeFragment"; + public static final String TAG = "ComposeFragment"; private AutoCompleteContactView mRecipients; private ComposeView mComposeView; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index 951903d7..1731123e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -47,7 +47,7 @@ import java.util.Observer; public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener, Observer { - private final String TAG = "ConversationList"; + public static final String TAG = "ConversationListFragment"; @Bind(R.id.empty_state) View mEmptyState; @Bind(R.id.empty_state_icon) ImageView mEmptyStateIcon; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index eede92f3..9e6732b5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -82,13 +82,13 @@ public class MessageListActivity extends QKSwipeBackActivity { if (mThreadId != -1) { Log.v(TAG, "Opening thread: " + mThreadId); FragmentManager fm = getFragmentManager(); - MessageListFragment fragment = (MessageListFragment) fm.findFragmentById(R.id.content_frame); + MessageListFragment fragment = (MessageListFragment) fm.findFragmentByTag(MessageListFragment.TAG); if (fragment == null) { fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); } mSwipeBackLayout.setScrollChangedListener(fragment); FragmentTransaction menuTransaction = fm.beginTransaction(); - menuTransaction.replace(R.id.content_frame, fragment); + menuTransaction.replace(R.id.content_frame, fragment, MessageListFragment.TAG); menuTransaction.commit(); } else { String msg = "Couldn't open conversation: {action:"; 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 de8fe554..e01db50c 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 @@ -85,7 +85,7 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.MultiSelectListener, SwipeBackLayout.ScrollChangedListener, RecyclerCursorAdapter.ItemClickListener { - private final String TAG = "MessageListFragment"; + public static final String TAG = "MessageListFragment"; private static final int MESSAGE_LIST_QUERY_TOKEN = 9527; private static final int MESSAGE_LIST_QUERY_AFTER_DELETE_TOKEN = 9528; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchActivity.java index 3f2add86..69d59dcf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchActivity.java @@ -17,13 +17,13 @@ public class SearchActivity extends QKSwipeBackActivity { setTitle(R.string.title_search); FragmentManager fm = getFragmentManager(); - mSearchFragment = (SearchFragment) fm.findFragmentById(R.id.content_frame); + mSearchFragment = (SearchFragment) fm.findFragmentByTag(SearchFragment.TAG); if (mSearchFragment == null) { mSearchFragment = new SearchFragment(); } fm.beginTransaction() - .replace(R.id.content_frame, mSearchFragment) + .replace(R.id.content_frame, mSearchFragment, SearchFragment.TAG) .commit(); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java index c7286c74..f61c2571 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java @@ -27,6 +27,8 @@ import java.util.HashMap; import java.util.regex.Pattern; public class SearchFragment extends QKFragment implements RecyclerCursorAdapter.ItemClickListener { + public static final String TAG = "SearchFragment"; + private AsyncQueryHandler mQueryHandler; // Track which TextView's show which Contact objects so that we can update diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java index b7458458..6da76d6e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java @@ -14,13 +14,13 @@ public class SettingsActivity extends QKSwipeBackActivity { super.onCreate(savedInstanceState); FragmentManager fm = getFragmentManager(); - mSettingsFragment = (SettingsFragment) fm.findFragmentById(R.id.content_frame); + mSettingsFragment = (SettingsFragment) fm.findFragmentByTag(SettingsFragment.TAG); if (mSettingsFragment == null) { mSettingsFragment = SettingsFragment.newInstance(R.xml.settings_main); } fm.beginTransaction() - .replace(R.id.content_frame, mSettingsFragment) + .replace(R.id.content_frame, mSettingsFragment, SettingsFragment.TAG) .commit(); } 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 6ba3d813..13eb28e3 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 @@ -65,7 +65,7 @@ import java.util.Stack; public class SettingsFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { - private final String TAG = "PreferenceFragment"; + public static final String TAG = "SettingsFragment"; public static final String CATEGORY_APPEARANCE = "pref_key_category_appearance"; public static final String CATEGORY_THEME = "pref_category_theme";