Merge pull request #1943 from dimagi/updateRotationFix

Fixes NPE on rotation for Update Prompts
dimagi · Feb 12, 2018 · 56ea51f · 56ea51f
2 parents a7bda26 + 97042ee
commit 56ea51f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/src/org/commcare/activities/PromptUpdateActivity.java b/app/src/org/commcare/activities/PromptUpdateActivity.java
@@ -36,7 +36,9 @@ public abstract class PromptUpdateActivity extends SessionAwareCommCareActivity
     @Override
     public void onCreateSessionSafe(Bundle savedInstanceState) {
         super.onCreateSessionSafe(savedInstanceState);
-        refreshUpdateToPromptObject();
+        if (updateToPrompt == null) {
+            refreshUpdateToPromptObject();
+        }
         setupUI();
     }
 
@@ -97,6 +99,9 @@ protected String getCurrentClientName() {
     }
 
     protected boolean inForceMode() {
+        if (updateToPrompt == null) {
+            refreshUpdateToPromptObject();
+        }
         return updateToPrompt.isForced();
     }