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

…clicks App crash on multiple button clicks bug fix
opensrp · Apr 12, 2018 · 1c16669 · 1c16669
2 parents cd290b3 + 9884fc2
commit 1c16669
Show file tree

Hide file tree

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

diff --git a/...g/src/main/java/org/smartregister/growthmonitoring/fragment/EditWeightDialogFragment.java b/...g/src/main/java/org/smartregister/growthmonitoring/fragment/EditWeightDialogFragment.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;
@@ -249,7 +250,16 @@ public void onStart() {
         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);
 
             }
         });

diff --git a/sample/src/main/java/org/smartregister/growthmonitoring/sample/MainActivity.java b/sample/src/main/java/org/smartregister/growthmonitoring/sample/MainActivity.java
@@ -65,7 +65,9 @@ protected void onResume() {
         recordWeight.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                view.setEnabled(false);
                 SampleUtil.showWeightDialog(MainActivity.this, view, DIALOG_TAG);
+                view.setEnabled(true);
             }
         });
 
@@ -74,7 +76,9 @@ public void onClick(View view) {
         growthChartButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                v.setEnabled(false);
                 Utils.startAsyncTask(new ShowGrowthChartTask(), null);
+                v.setEnabled(true);
             }
         });
 
@@ -200,7 +204,9 @@ private void refreshEditWeightLayout() {
 
                     @Override
                     public void onClick(View v) {
+                        v.setEnabled(false);
                         SampleUtil.showEditWeightDialog(MainActivity.this, finalI, DIALOG_TAG);
+                        v.setEnabled(true);
                     }
                 };
                 listeners.add(onclicklistener);