Handle clicking of actionbar icon.

matburt · Mar 9, 2012 · 41887fd · 41887fd
1 parent ac17a10
commit 41887fd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java b/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java
@@ -100,7 +100,11 @@ private void init() {
 		if (this.actionMode == null) {
 			String subject = intent
 					.getStringExtra("android.intent.extra.SUBJECT");
+			if(subject == null)
+				subject = "";
 			String text = intent.getStringExtra("android.intent.extra.TEXT");
+			if(text == null)
+				text = "";
 
 			node = new NodeWrapper(null);
 			this.detailsFragment.init(this.node, this.actionMode, defaultTodo, subject);
@@ -198,6 +202,7 @@ public boolean onCreateOptionsMenu(android.support.v4.view.Menu menu) {
 	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
+			doCancel();
 			return true;
 
 		case R.id.nodeedit_save:

diff --git a/src/com/matburt/mobileorg/Gui/NodeViewActivity.java b/src/com/matburt/mobileorg/Gui/NodeViewActivity.java
@@ -84,6 +84,9 @@ public boolean onCreateOptionsMenu(android.support.v4.view.Menu menu) {
 	@Override
 	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
 		switch (item.getItemId()) {
+		case android.R.id.home:
+			finish();
+			break;
 		case R.id.viewmenu_edit:
 			runEditNodeActivity();
 			break;

diff --git a/src/com/matburt/mobileorg/Gui/OutlineActivity.java b/src/com/matburt/mobileorg/Gui/OutlineActivity.java
@@ -156,6 +156,11 @@ public boolean onCreateOptionsMenu(android.support.v4.view.Menu menu) {
 	@Override
 	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
 		switch (item.getItemId()) {
+		case android.R.id.home:
+			if(this.node_id != -1)
+				finish();
+			return true;
+
 		case R.id.menu_sync:
 			runSync();
 			return true;