Merge pull request #34 from wordpress-mobile/merge/WordPress-Android/…

…11492 WPAndroid change: Fixes NullPointerException in onDiscoverySucceeded
woocommerce · Mar 25, 2020 · fd0c8c9 · fd0c8c9
2 parents e80a693 + c134376
commit fd0c8c9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java
@@ -38,6 +38,10 @@ void initiateDiscovery() {
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onDiscoverySucceeded(OnDiscoveryResponse event) {
+        if (mLoginBaseDiscoveryListener == null) {
+            // Ignore the event if the fragment is detached
+            return;
+        }
         // hold the URL in a variable to use below otherwise it gets cleared up by endProgress
         // bail if user canceled
         String mRequestedSiteAddress = mLoginBaseDiscoveryListener.getRequestedSiteAddress();