re-arranged if checks to only try getting selected site if fragment i…

…s added, then checked for site != null to avoid NPE
wordpress-mobile · Jul 31, 2017 · 28a9d58 · 28a9d58
1 parent 935de72
commit 28a9d58
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
@@ -494,10 +494,14 @@ public void onSiteChanged(OnSiteChanged event) {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onPostUploaded(PostStore.OnPostUploaded event) {
         final PostModel post = event.post;
-        SiteModel site = getSelectedSite();
-        if (isAdded() && event.post != null && event.post.getLocalSiteId() == site.getId()) {
-            UploadUtils.onPostUploadedSnackbarHandler(getActivity(),
-                    getActivity().findViewById(R.id.coordinator), event, site, mDispatcher);
+        if (isAdded() && event.post != null) {
+            SiteModel site = getSelectedSite();
+            if (site != null) {
+                if (event.post.getLocalSiteId() == site.getId()) {
+                    UploadUtils.onPostUploadedSnackbarHandler(getActivity(),
+                            getActivity().findViewById(R.id.coordinator), event, site, mDispatcher);
+                }
+            }
         }
     }
 }