From 92d197b8ccbf185ea00dcbafcec6c683812dfaa2 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Thu, 6 Mar 2014 14:10:53 +0100 Subject: [PATCH] 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;