fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not fail with NPE when scheme is null

Browse Source 
Also remove some debug logging left by mistake.
This commit is contained in:
Fredrik Fornwall
2016-03-23 18:31:03 +01:00
parent 3aaa0ab267
commit 421dfcca39
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
View File

@@ -46,16 +46,6 @@ public class TermuxFileReceiverActivity extends Activity {
final String type = intent.getType(); final String type = intent.getType();
final String scheme = intent.getScheme(); final String scheme = intent.getScheme();
if (intent.getExtras() == null) {
Log.e("termux", "NULL EXTRAS");
} else {
for (String key : intent.getExtras().keySet()) {
Object value = intent.getExtras().get(key);
Log.d("termux", String.format("Extra %s %s (%s)", key,
value.toString(), value.getClass().getName()));
}
}
if (Intent.ACTION_SEND.equals(action) && type != null) { if (Intent.ACTION_SEND.equals(action) && type != null) {
final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
@@ -74,9 +64,9 @@ public class TermuxFileReceiverActivity extends Activity {
} else { } else {
showErrorDialogAndQuit("Send action without content - nothing to save."); showErrorDialogAndQuit("Send action without content - nothing to save.");
} }
} else if (scheme.equals("content")) { } else if ("content".equals(scheme)) {
handleContentUri(intent.getData(), intent.getStringExtra(Intent.EXTRA_TITLE)); handleContentUri(intent.getData(), intent.getStringExtra(Intent.EXTRA_TITLE));
} else if (scheme.equals("file")) { } else if ("file".equals(scheme)) {
// When e.g. clicking on a downloaded apk: // When e.g. clicking on a downloaded apk:
String path = intent.getData().getPath(); String path = intent.getData().getPath();
File file = new File(path); File file = new File(path);
@@ -87,7 +77,7 @@ public class TermuxFileReceiverActivity extends Activity {
showErrorDialogAndQuit("Cannot open file: " + e.getMessage() + "."); showErrorDialogAndQuit("Cannot open file: " + e.getMessage() + ".");
} }
} else { } else {
showErrorDialogAndQuit("Unhandled scheme: " + intent.getScheme() + "."); showErrorDialogAndQuit("Unable to receive any file or URL.");
} }
} }