Fixed: Handle unlikely case where failed to get version code to generate plugin result bundle

agnostic-apollo · agnostic-apollo · commit f6e33687d5be · 2021-09-09T08:11:12.000+05:00
diff --git a/app/src/main/java/com/termux/tasker/EditConfigurationActivity.java b/app/src/main/java/com/termux/tasker/EditConfigurationActivity.java
@@ -30,6 +30,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static com.termux.tasker.utils.TaskerPlugin.Setting.RESULT_CODE_FAILED;
+
 /**
  * This is the "Edit" activity for a Locale Plug-in.
  * <p>
@@ -190,6 +192,12 @@ public void finish() {
                  */
                 final Bundle resultBundle = PluginBundleManager.generateBundle(getApplicationContext(),
                         executable, arguments, workingDirectory, inTerminal, waitForResult);
+                if (resultBundle == null) {
+                    Logger.showToast(this, getString(R.string.error_generate_plugin_bundle_failed), true);
+                    setResult(RESULT_CODE_FAILED, resultIntent);
+                    super.finish();
+                    return;
+                }
 
                 // The blurb is a concise status text to be displayed in the host's UI.
                 final String blurb = generateBlurb(executable, arguments, inTerminal, waitForResult);
diff --git a/app/src/main/java/com/termux/tasker/PluginBundleManager.java b/app/src/main/java/com/termux/tasker/PluginBundleManager.java
@@ -5,6 +5,9 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
+import com.termux.shared.logger.Logger;
 import com.termux.shared.packages.PackageUtils;
 import com.termux.shared.termux.TermuxConstants;
 
@@ -105,6 +108,7 @@ public static String parseBundle(final Context context, final Bundle bundle) {
         return null;
     }
 
+    @Nullable
     public static Bundle generateBundle(final Context context, final String executable,
                                         final String arguments, final String workingDirectory,
                                         final boolean inTerminal, final boolean waitForResult) {
@@ -114,7 +118,14 @@ public static Bundle generateBundle(final Context context, final String executab
         result.putString(EXTRA_WORKDIR, workingDirectory);
         result.putBoolean(EXTRA_TERMINAL, inTerminal);
         result.putBoolean(EXTRA_WAIT_FOR_RESULT, waitForResult);
-        result.putInt(BUNDLE_EXTRA_INT_VERSION_CODE, PackageUtils.getVersionCodeForPackage(context));
+
+        Integer versionCode = PackageUtils.getVersionCodeForPackage(context);
+        if (versionCode == null) {
+            Logger.showToast(context, context.getString(R.string.error_get_version_code_failed, context.getPackageName()), true);
+            return null;
+        }
+
+        result.putInt(BUNDLE_EXTRA_INT_VERSION_CODE, versionCode);
         return result;
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -36,6 +36,8 @@
 
     <string name="error_plugin_permission_ungranted_warning">The %1$s App (%2$s) has not been granted the \"%3$s\" permission which is required to run the plugin action."</string>
     <string name="error_allow_external_apps_ungranted_warning">Absolute paths for executables outside &TERMUX_TASKER_SCRIPTS_DIR_PATH_SHORT; directory require allow-external-apps property to be set to \"true\" in &TERMUX_PROPERTIES_PRIMARY_PATH_SHORT; file.</string>
+    <string name="error_generate_plugin_bundle_failed">Failed to generate plugin bundle</string>
+    <string name="error_get_version_code_failed">Failed to get version code for %1$s</string>
 
     <string name="blurb_executable_and_arguments">%1$s %2$s</string>
     <string name="blurb_in_terminal">\u2713 Terminal Session</string>
