Merge branch 'master' of github.com:matburt/mobileorg-android

* 'master' of github.com:matburt/mobileorg-android: Fix EditActivity.hasEdits for node being newly created. Capture: Main save button also saves unsaved payload edits.
matburt · Dec 1, 2012 · dfc74f8 · dfc74f8
2 parents 0ef4903 + 400d26c
commit dfc74f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java b/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java
@@ -216,7 +216,11 @@ public boolean hasEdits() {
 
 		int numberOfEdits = 0;
 		try {
-			OrgNode clonedNode = new OrgNode(this.node.id, resolver);
+			OrgNode clonedNode;
+			if (node.id == -1)
+				clonedNode = new OrgNode();
+			else
+				clonedNode = new OrgNode(this.node.id, resolver);
 			numberOfEdits = clonedNode.generateApplyEditNodes(newNode, resolver).size();
 		} catch (OrgNodeNotFoundException e) {}
 

diff --git a/src/com/matburt/mobileorg/Gui/Capture/PayloadFragment.java b/src/com/matburt/mobileorg/Gui/Capture/PayloadFragment.java
@@ -121,6 +121,8 @@ public void setPayload(String payload) {
 	}
 
 	public String getPayload() {
+		if(this.payloadEdit.getVisibility() == View.VISIBLE)
+			return payloadEdit.getText().toString();
 		return this.payload.get();
 	}