From 72d92b19f7a33fb570c028270ec764ee15f1f293 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Thu, 6 Mar 2014 13:00:19 +0100 Subject: [PATCH 1/2] fixed null pointer exception in SaveToFile activity --- mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java b/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java index f01e9dc9..e6448375 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java +++ b/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java @@ -24,12 +24,11 @@ public class SaveToFile extends Activity implements Runnable { @Override protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) { if (requestCode == REQUEST_SAVE_FILE) { - mData = data.getData(); - if (resultCode != Activity.RESULT_OK || mData == null) { + if (resultCode != Activity.RESULT_OK || data == null) { finish(); return; } - + mData = data.getData(); (new Thread(this)).start(); } From 92d197b8ccbf185ea00dcbafcec6c683812dfaa2 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Thu, 6 Mar 2014 14:10:53 +0100 Subject: [PATCH 2/2] added intent null pointer check to FileManagers onActivityResult --- mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java index 0c244cef..3b3476b1 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java @@ -414,7 +414,7 @@ public class IITC_FileManager { public void onActivityResult(final int resultCode, final Intent data) { mIitc.deleteResponseHandler(this); - if (resultCode != Activity.RESULT_OK) return; + if (resultCode != Activity.RESULT_OK || data == null) return; mData = data;