From 4280acacf776de2492f99ec3c8554c963209db74 Mon Sep 17 00:00:00 2001 From: Phillip Mates Date: Thu, 21 Jan 2016 11:38:15 -0500 Subject: [PATCH 1/2] Call super.onSaveInstanceState to persist login task dialog --- app/src/org/commcare/dalvik/activities/LoginActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/org/commcare/dalvik/activities/LoginActivity.java b/app/src/org/commcare/dalvik/activities/LoginActivity.java index 40b7e5d13b..b2aa7dfaa1 100644 --- a/app/src/org/commcare/dalvik/activities/LoginActivity.java +++ b/app/src/org/commcare/dalvik/activities/LoginActivity.java @@ -209,6 +209,8 @@ public void onGlobalLayout() { @Override public void onSaveInstanceState(Bundle savedInstanceState) { + super.onSaveInstanceState(savedInstanceState); + String enteredUsername = username.getText().toString(); if (!"".equals(enteredUsername) && enteredUsername != null) { savedInstanceState.putString(KEY_ENTERED_USER, enteredUsername); From b84949a42883dd5c23a4797b95839c10a318b4d0 Mon Sep 17 00:00:00 2001 From: Phillip Mates Date: Thu, 21 Jan 2016 11:40:12 -0500 Subject: [PATCH 2/2] Call save complete callback even when task not connected --- .../odk/collect/android/tasks/SaveToDiskTask.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/org/odk/collect/android/tasks/SaveToDiskTask.java b/app/src/org/odk/collect/android/tasks/SaveToDiskTask.java index 138a5680ee..20f00be88e 100644 --- a/app/src/org/odk/collect/android/tasks/SaveToDiskTask.java +++ b/app/src/org/odk/collect/android/tasks/SaveToDiskTask.java @@ -84,7 +84,11 @@ public SaveToDiskTask(Uri mUri, Boolean saveAndExit, Boolean markCompleted, Stri this.instanceContentUri = instanceContentUri; this.symetricKey = symetricKey; this.headless = headless; - this.taskId = SAVING_TASK_ID; + if (headless) { + this.taskId = -1; + } else { + this.taskId = SAVING_TASK_ID; + } } /** @@ -346,13 +350,17 @@ private boolean exportXmlFile(ByteArrayPayload payload, OutputStream output) { @Override - protected void deliverResult(R receiver, Integer result) { + protected void onPostExecute(Integer result) { synchronized (this) { if (mSavedListener != null) mSavedListener.savingComplete(result, headless); } } + @Override + protected void deliverResult(R receiver, Integer result) { + } + @Override protected void deliverUpdate(R receiver, String... update) { }