Skip to content

Commit 622e7d7

Browse files
committed
Simplify connectivity transition guards to primitive booleans
1 parent 195933e commit 622e7d7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class BlogPreferencesActivity extends BaseAppCompatActivity {
4343
@Inject Dispatcher mDispatcher;
4444
@Inject NetworkConnectionMonitor mNetworkConnectionMonitor;
4545

46-
private Boolean mLastConnected;
46+
private boolean mLastConnected;
4747

4848
@Override
4949
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -124,7 +124,7 @@ private void onConnectionChanged(boolean connected) {
124124
if (siteSettingsFragment != null) {
125125
// Toast only on a genuine transition to disconnected, so LiveData replay on re-foregrounding
126126
// doesn't spuriously toast.
127-
if (!connected && mLastConnected != null && mLastConnected) {
127+
if (!connected && mLastConnected) {
128128
ToastUtils.showToast(this, getString(R.string.site_settings_disconnected_toast), Duration.LONG);
129129
}
130130
siteSettingsFragment.setEditingEnabled(connected);

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
208208
@Inject
209209
lateinit var networkConnectionMonitor: NetworkConnectionMonitor
210210

211-
private var lastConnected: Boolean? = null
211+
private var lastConnected = false
212212

213213
private var readerPostAdapter: ReaderPostAdapter? = null
214214
private var siteSearchAdapter: ReaderSiteSearchAdapter? = null
@@ -581,7 +581,7 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
581581
networkConnectionMonitor.isConnected.observe(viewLifecycleOwner) { connected ->
582582
// Only resubmit the search when connectivity actually transitions to connected, so LiveData replay
583583
// on re-foregrounding doesn't re-fire the search.
584-
if (connected && lastConnected != connected) {
584+
if (connected && !lastConnected) {
585585
currentSearchQuery?.let { submitSearchQuery(it) }
586586
}
587587
lastConnected = connected

0 commit comments

Comments
 (0)