Set file readable if needed

When trying to execute a file in $HOME/.shortcuts/ we already set the file as executable if needed. Now also set if readable if needed.
tuping · Jan 17, 2016 · bfbb10f · bfbb10f
1 parent b018b0c
commit bfbb10f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/termux/widget/TermuxLaunchShortcutActivity.java b/app/src/main/java/com/termux/widget/TermuxLaunchShortcutActivity.java
@@ -42,10 +42,7 @@ protected void onResume() {
 		}
 
 		File clickedFile = new File(intent.getData().getPath());
-		if (!clickedFile.canExecute()) {
-			// Cover for the user if he forgot to mark the file executable:
-			clickedFile.setExecutable(true);
-		}
+		TermuxWidgetProvider.ensureFileReadableAndExecutable(clickedFile);
 
 		Intent executeIntent = new Intent(TermuxWidgetProvider.ACTION_EXECUTE, getIntent().getData());
 		executeIntent.setClassName("com.termux", TermuxWidgetProvider.TERMUX_SERVICE);

diff --git a/app/src/main/java/com/termux/widget/TermuxWidgetProvider.java b/app/src/main/java/com/termux/widget/TermuxWidgetProvider.java
@@ -84,10 +84,7 @@ public void onReceive(Context context, Intent intent) {
 		case LIST_ITEM_CLICKED_ACTION:
 			String clickedFilePath = intent.getStringExtra(EXTRA_CLICKED_FILE);
 			File clickedFile = new File(clickedFilePath);
-			if (!clickedFile.canExecute()) {
-				// Cover for the user if he forgot to mark the file executable:
-				clickedFile.setExecutable(true);
-			}
+			ensureFileReadableAndExecutable(clickedFile);
 			Uri scriptUri = new Uri.Builder().scheme("file").path(clickedFilePath).build();
 
 			// Note: Must match TermuxService#ACTION_EXECUTE constant:
@@ -106,4 +103,10 @@ public void onReceive(Context context, Intent intent) {
 		}
 	}
 
+	/** Ensure readable and executable file if user forgot to do so. */
+	static void ensureFileReadableAndExecutable(File file) {
+		if (!file.canRead()) file.setReadable(true);
+		if (!file.canExecute()) file.setExecutable(true);
+	}
+
 }