Merge pull request #22 from OpenSRP/266-app-crash-on-multiple-button-…

…clicks Check for null dialogs to prevent NullPointerExceptions
opensrp · Mar 22, 2018 · 58636b0 · 58636b0
2 parents d22bc24 + 0ecd881
commit 58636b0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.0.5-SNAPSHOT
+VERSION_NAME=1.0.6-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Growth Monitoring Application

diff --git a/...oring/src/main/java/org/smartregister/growthmonitoring/fragment/GrowthDialogFragment.java b/...oring/src/main/java/org/smartregister/growthmonitoring/fragment/GrowthDialogFragment.java
@@ -541,7 +541,15 @@ public void onStart() {
         new Handler().post(new Runnable() {
             @Override
             public void run() {
-                Window window = getDialog().getWindow();
+                Window window = null;
+                if (getDialog() != null) {
+                    window = getDialog().getWindow();
+                }
+
+                if (window == null) {
+                    return;
+                }
+
                 Point size = new Point();
 
                 Display display = window.getWindowManager().getDefaultDisplay();

diff --git a/...src/main/java/org/smartregister/growthmonitoring/fragment/RecordWeightDialogFragment.java b/...src/main/java/org/smartregister/growthmonitoring/fragment/RecordWeightDialogFragment.java
@@ -10,6 +10,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.DatePicker;
@@ -244,14 +245,23 @@ private void formatEditWeightView(EditText editWeight, String userInput) {
     @Override
     public void onStart() {
         super.onStart();
-        // without a handler, the window sizes itself correctly
+        // without a handler, the window size itself correctly
         // but the keyboard does not show up
         new Handler().post(new Runnable() {
             @Override
             public void run() {
-                getDialog().getWindow().setLayout(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+                Window window = null;
+                if (getDialog() != null) {
+                    window = getDialog().getWindow();
+                }
+
+                if (window == null) {
+                    return;
+                }
+                window.setLayout(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
 
             }
+
         });
 
     }