phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2014-03-07 19:31:15 +00:00
commit 5f6adf3846
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
View File

@ -414,7 +414,7 @@ public class IITC_FileManager {
public void onActivityResult(final int resultCode, final Intent data) { public void onActivityResult(final int resultCode, final Intent data) {
mIitc.deleteResponseHandler(this); mIitc.deleteResponseHandler(this);
if (resultCode != Activity.RESULT_OK) return; if (resultCode != Activity.RESULT_OK || data == null) return;
mData = data; mData = data;

5
mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java
View File

@ -24,12 +24,11 @@ public class SaveToFile extends Activity implements Runnable {
@Override @Override
protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) { protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
if (requestCode == REQUEST_SAVE_FILE) { if (requestCode == REQUEST_SAVE_FILE) {
mData = data.getData(); if (resultCode != Activity.RESULT_OK || data == null) {
if (resultCode != Activity.RESULT_OK || mData == null) {
finish(); finish();
return; return;
} }
mData = data.getData();
(new Thread(this)).start(); (new Thread(this)).start();
} }