Merge pull request commons-app#1391 from commons-app/fixNearbyBugCausedThemeChange

neslihanturan · web-flow · commit 9b2f192478c8 · 2018-03-30T12:35:58.000+03:00
Fix NPE in nearby fragment
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -579,7 +579,9 @@ public void prepareViewsForSheetPosition(int bottomSheetState) {
                 transparentView.setAlpha(0);
                 closeFabs(isFabOpen);
                 hideFAB();
-                this.getView().requestFocus();
+                if (this.getView() != null) {
+                    this.getView().requestFocus();
+                }
                 break;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,9 @@ public void prepareViewsForSheetPosition(int bottomSheetState) {`
`579`	`579`	`transparentView.setAlpha(0);`
`580`	`580`	`closeFabs(isFabOpen);`
`581`	`581`	`hideFAB();`
`582`		`- this.getView().requestFocus();`
	`582`	`+ if (this.getView() != null) {`
	`583`	`+ this.getView().requestFocus();`
	`584`	`+ }`
`583`	`585`	`break;`
`584`	`586`	`}`
`585`	`587`	`}`