Fixed cancel import file select

Fixes #837
M66B · Nov 27, 2013 · 4d20b21 · 4d20b21
1 parent 259cfb0
commit 4d20b21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Changelog
 * Caching of application information for better response times
 * Restriction of draw over / on top ([issue](https://github.com/M66B/XPrivacy/issues/830))
 * Modified tri-state check box implementation ([issue](https://github.com/M66B/XPrivacy/issues/833))
+* Fixed cancel import file select ([issue](https://github.com/M66B/XPrivacy/issues/837))
 * Updated Arabic translation
 * Updated Dutch translation
 * Updated Polish translation

diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -382,11 +382,12 @@ public void run() {
 		} else if (requestCode == ACTIVITY_IMPORT) {
 			// Imported: clean-up UI
 			sharingDone();
-			// recreate UI
 			ActivityMain.this.recreate();
 		} else if (requestCode == ACTIVITY_IMPORT_SELECT) {
 			// Result for import file choice
-			if (data != null)
+			if (resultCode == RESULT_CANCELED)
+				sharingDone();
+			else if (data != null)
 				try {
 					String fileName = data.getData().getPath();
 					Intent intent = new Intent("biz.bokhorst.xprivacy.action.IMPORT");
@@ -398,7 +399,6 @@ public void run() {
 		} else if (requestCode == ACTIVITY_FETCH) {
 			// Fetched: clean-up UI
 			sharingDone();
-			// recreate UI
 			ActivityMain.this.recreate();
 		}
 	}