html2apk 0.4.0 → 0.7.0

package/src/desktop/renderer/styles.css

@@ -492,6 +492,7 @@ h2 {
 }
 
 .icon-field,
+.keystore-field,
 .onesignal-field,
 .permissions-field {
   grid-column: span 2;
@@ -569,6 +570,24 @@ h2 {
   gap: 10px;
 }
 
+.keystore-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 12px;
+}
+
+.keystore-grid label {
+  display: grid;
+  gap: 8px;
+}
+
+.inline-picker {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 10px;
+  align-items: center;
+}
+
 .validation-panel {
   margin-top: 16px;
   border: 1px solid color-mix(in srgb, var(--red) 42%, var(--line));
@@ -621,6 +640,165 @@ h2 {
   color: var(--muted);
 }
 
+.file-editor-layout {
+  display: grid;
+  grid-template-columns: minmax(220px, 290px) minmax(0, 1fr);
+  gap: 16px;
+  min-height: 620px;
+}
+
+.file-tree-panel,
+.file-editor-panel {
+  border: 1px solid var(--line);
+  background: var(--panel);
+  border-radius: 8px;
+  box-shadow: var(--shadow);
+}
+
+.file-tree-panel {
+  padding: 14px;
+  overflow: auto;
+}
+
+.file-tree-panel > strong {
+  display: block;
+  margin-bottom: 12px;
+}
+
+.file-tree {
+  display: grid;
+  gap: 4px;
+}
+
+.file-tree-empty {
+  color: var(--muted);
+  line-height: 1.45;
+}
+
+.file-row {
+  width: 100%;
+  min-height: 34px;
+  border: 0;
+  border-radius: 7px;
+  padding: 0 8px;
+  background: transparent;
+  color: var(--text);
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-align: left;
+}
+
+.file-row:hover,
+.file-row.active {
+  background: var(--blue-soft);
+  color: var(--blue);
+}
+
+.file-row:disabled {
+  cursor: not-allowed;
+  color: var(--muted);
+  opacity: .62;
+}
+
+.folder-row {
+  margin-top: 8px;
+  min-height: 28px;
+  color: var(--muted);
+  font-size: 12px;
+  font-weight: 800;
+  text-transform: uppercase;
+}
+
+.file-editor-panel {
+  display: grid;
+  grid-template-rows: auto minmax(280px, 1fr) minmax(180px, 240px);
+  overflow: hidden;
+}
+
+.file-editor-meta {
+  min-height: 50px;
+  border-bottom: 1px solid var(--line);
+  padding: 12px 14px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.file-editor-meta strong {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#fileLanguageBadge {
+  flex: 0 0 auto;
+  min-width: 46px;
+  min-height: 26px;
+  padding: 5px 9px;
+  border-radius: 8px;
+  background: var(--blue-soft);
+  color: var(--blue);
+  text-align: center;
+  font-size: 12px;
+  font-weight: 800;
+}
+
+#fileEditorInput {
+  width: 100%;
+  min-height: 0;
+  resize: none;
+  border: 0;
+  border-bottom: 1px solid var(--line);
+  outline: none;
+  padding: 16px;
+  background: var(--bg);
+  color: var(--text);
+  font: 13px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace;
+  tab-size: 2;
+}
+
+.syntax-preview-wrap {
+  min-height: 0;
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr);
+  background: color-mix(in srgb, var(--panel-soft) 55%, var(--panel));
+}
+
+.syntax-preview-wrap > strong {
+  padding: 10px 14px 0;
+  color: var(--muted);
+  font-size: 12px;
+}
+
+.syntax-preview {
+  margin: 0;
+  padding: 12px 14px 16px;
+  overflow: auto;
+  color: var(--text);
+  font: 12px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace;
+}
+
+.syntax-token-tag,
+.syntax-token-keyword {
+  color: var(--blue);
+  font-weight: 800;
+}
+
+.syntax-token-string {
+  color: var(--green);
+}
+
+.syntax-token-comment {
+  color: var(--muted);
+  font-style: italic;
+}
+
+.syntax-token-number {
+  color: var(--amber);
+}
+
 .preference-row {
   min-height: 112px;
   padding: 20px;
@@ -1340,11 +1518,22 @@ body.logs-visible .bottom-log-bar {
   }
 
   .icon-field,
+  .keystore-field,
   .onesignal-field,
   .permissions-field {
     grid-column: span 1;
   }
 
+  .keystore-grid,
+  .inline-picker,
+  .file-editor-layout {
+    grid-template-columns: 1fr;
+  }
+
+  .file-editor-layout {
+    min-height: 820px;
+  }
+
   .view-header,
   .result-panel,
   .progress-panel,

package/src/templates/cordova-plugin-html2apk-bridge/plugin.xml

@@ -27,6 +27,7 @@
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
       <service android:name="dev.html2apk.bridge.FloatingIconService" android:exported="false" />
       <receiver android:name="dev.html2apk.bridge.NotificationReceiver" android:exported="false" />
+      <receiver android:name="dev.html2apk.bridge.NotificationClickReceiver" android:exported="false" />
       <receiver android:name="dev.html2apk.bridge.BootReceiver" android:enabled="true" android:exported="true">
         <intent-filter>
           <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -38,6 +39,7 @@
     <source-file src="src/android/Html2ApkBridge.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/FloatingIconService.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/NotificationReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
+    <source-file src="src/android/NotificationClickReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/BootReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/NotificationStore.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <framework src="androidx.core:core:1.12.0" />

package/src/templates/cordova-plugin-html2apk-bridge/src/android/Html2ApkBridge.java

@@ -73,6 +73,7 @@ public class Html2ApkBridge extends CordovaPlugin {
     private static final int REQUEST_PICK_FOLDER = 7413;
     private static final String PREFS_NAME = "html2apk_bridge";
     private static final String PREF_PERMISSION_PREFIX = "permission_requested_";
+    private static Html2ApkBridge activeBridge;
 
     private CallbackContext notificationPermissionCallback;
     private CallbackContext cameraPermissionCallback;
@@ -100,6 +101,7 @@ public class Html2ApkBridge extends CordovaPlugin {
     @Override
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
+        activeBridge = this;
         handleNotificationIntent(cordova.getActivity().getIntent(), false);
         handleLinkIntent(cordova.getActivity().getIntent(), false);
         registerSystemReceiver();
@@ -131,6 +133,9 @@ public class Html2ApkBridge extends CordovaPlugin {
         stopMicRecorderSilently();
         unregisterSystemReceiver();
         dispatchEvent("app:fechado", baseEvent("app:fechado"));
+        if (activeBridge == this) {
+            activeBridge = null;
+        }
         super.onDestroy();
     }
 
@@ -420,6 +425,22 @@ public class Html2ApkBridge extends CordovaPlugin {
         return false;
     }
 
+    private void rejectBusyCallback(CallbackContext callbackContext, String operation) {
+        callbackContext.error(operation + " is already waiting for Android. Wait for the previous call to finish.");
+    }
+
+    private boolean hasPendingNotificationPermissionRequest() {
+        return pendingNotificationCallback != null || notificationPermissionCallback != null;
+    }
+
+    private boolean hasPendingCameraPermissionRequest() {
+        return pendingFlashlightCallback != null || cameraPermissionCallback != null;
+    }
+
+    private boolean hasPendingMicrophonePermissionRequest() {
+        return pendingMicStartCallback != null || microphonePermissionCallback != null;
+    }
+
     @Override
     public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == REQUEST_CAMERA) {
@@ -756,9 +777,8 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(notificationPermissionStatus());
             return;
         }
-
-        if (shouldOpenSettingsForRuntimePermission(Manifest.permission.POST_NOTIFICATIONS)) {
-            callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.POST_NOTIFICATIONS, true, false));
+        if (hasPendingNotificationPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "POST_NOTIFICATIONS permission");
             return;
         }
 
@@ -776,9 +796,8 @@ public class Html2ApkBridge extends CordovaPlugin {
         if (hasNotificationPermission()) {
             return false;
         }
-
-        if (shouldOpenSettingsForRuntimePermission(Manifest.permission.POST_NOTIFICATIONS)) {
-            callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.POST_NOTIFICATIONS, true, false));
+        if (hasPendingNotificationPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "POST_NOTIFICATIONS permission");
             return true;
         }
 
@@ -806,7 +825,7 @@ public class Html2ApkBridge extends CordovaPlugin {
             .setContentText(text)
             .setStyle(new NotificationCompat.BigTextStyle().bigText(text))
             .setAutoCancel(true)
-            .setContentIntent(createContentIntent(context(), id, detailPayload(options)))
+            .setContentIntent(createNotificationClickIntent(context(), id, detailPayload(options)))
             .setPriority(NotificationCompat.PRIORITY_DEFAULT);
 
         addNotificationActions(builder, context(), id, options);
@@ -1068,9 +1087,8 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(runtimePermissionResult(Manifest.permission.CAMERA, true, false, true));
             return;
         }
-
-        if (shouldOpenSettingsForRuntimePermission(Manifest.permission.CAMERA)) {
-            callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.CAMERA, true, false));
+        if (hasPendingCameraPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "CAMERA permission");
             return;
         }
 
@@ -1091,9 +1109,8 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(result);
             return;
         }
-
-        if (shouldOpenSettingsForRuntimePermission(Manifest.permission.RECORD_AUDIO)) {
-            callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.RECORD_AUDIO, true, false));
+        if (hasPendingMicrophonePermissionRequest()) {
+            rejectBusyCallback(callbackContext, "RECORD_AUDIO permission");
             return;
         }
 
@@ -1131,11 +1148,10 @@ public class Html2ApkBridge extends CordovaPlugin {
         }
 
         if (!hasMicrophonePermission()) {
-            if (shouldOpenSettingsForRuntimePermission(Manifest.permission.RECORD_AUDIO)) {
-                callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.RECORD_AUDIO, true, false));
+            if (hasPendingMicrophonePermissionRequest()) {
+                rejectBusyCallback(callbackContext, "RECORD_AUDIO permission");
                 return;
             }
-
             pendingMicStartCallback = callbackContext;
             rememberRuntimePermissionRequest(Manifest.permission.RECORD_AUDIO);
             cordova.requestPermission(this, REQUEST_RECORD_AUDIO, Manifest.permission.RECORD_AUDIO);
@@ -1319,11 +1335,10 @@ public class Html2ApkBridge extends CordovaPlugin {
 
     private void setFlashlightWithPermission(boolean enabled, boolean toggle, CallbackContext callbackContext) throws Exception {
         if (!hasCameraPermission()) {
-            if (shouldOpenSettingsForRuntimePermission(Manifest.permission.CAMERA)) {
-                callbackContext.success(openSettingsForRuntimePermission(Manifest.permission.CAMERA, true, false));
+            if (hasPendingCameraPermissionRequest()) {
+                rejectBusyCallback(callbackContext, "CAMERA permission");
                 return;
             }
-
             pendingFlashlightCallback = callbackContext;
             pendingFlashlightEnabled = enabled;
             pendingFlashlightToggle = toggle;
@@ -1422,6 +1437,11 @@ public class Html2ApkBridge extends CordovaPlugin {
     }
 
     private void pickFile(JSONObject options, CallbackContext callbackContext) {
+        if (filePickerCallback != null) {
+            rejectBusyCallback(callbackContext, "File picker");
+            return;
+        }
+
         JSONObject safeOptions = options == null ? new JSONObject() : options;
         String kind = safeOptions.optString("tipo", safeOptions.optString("kind", "file"));
         boolean multiple = safeOptions.optBoolean("multiplo", safeOptions.optBoolean("multiple", false));
@@ -1463,12 +1483,22 @@ public class Html2ApkBridge extends CordovaPlugin {
     }
 
     private void pickFolder(CallbackContext callbackContext) {
+        if (folderPickerCallback != null) {
+            rejectBusyCallback(callbackContext, "Folder picker");
+            return;
+        }
+
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
         folderPickerCallback = callbackContext;
         cordova.startActivityForResult(this, intent, REQUEST_PICK_FOLDER);
     }
 
     private void saveFile(JSONObject options, CallbackContext callbackContext) throws Exception {
+        if (saveFileCallback != null) {
+            rejectBusyCallback(callbackContext, "File save dialog");
+            return;
+        }
+
         JSONObject safeOptions = options == null ? new JSONObject() : options;
         String name = safeOptions.optString("nome", safeOptions.optString("name", "arquivo.txt"));
         String mimeType = safeOptions.optString("mimeType", "text/plain");
@@ -2016,6 +2046,167 @@ public class Html2ApkBridge extends CordovaPlugin {
         );
     }
 
+    static PendingIntent createNotificationClickIntent(Context context, int id, JSONObject detail) {
+        if (shouldOpenAppForNotificationClick(detail)) {
+            return createContentIntent(context, id, detail);
+        }
+
+        Intent intent = new Intent(context, NotificationClickReceiver.class);
+        intent.putExtra(EXTRA_NOTIFICATION_CLICKED, true);
+        intent.putExtra(EXTRA_NOTIFICATION_DETAIL, detail == null ? "{}" : detail.toString());
+
+        return PendingIntent.getBroadcast(
+            context,
+            id,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
+        );
+    }
+
+    static void handleNotificationClickBroadcast(Context context, JSONObject detail) {
+        if (detail == null) {
+            return;
+        }
+
+        if (activeBridge != null && activeBridge.webView != null) {
+            activeBridge.dispatchNotificationClick(detail);
+            return;
+        }
+
+        handleNativeNotificationAction(context, detail);
+    }
+
+    private static void handleNativeNotificationAction(Context context, JSONObject detail) {
+        JSONObject action = notificationClickAction(detail);
+        if (action == null) {
+            return;
+        }
+
+        String functionName = action.optString("funcao",
+            action.optString("functionName",
+                action.optString("function",
+                    action.optString("fn", action.optString("nomeFuncao", "")))));
+
+        if (!isExternalUrlFunction(functionName)) {
+            return;
+        }
+
+        String url = firstActionArgument(action);
+        if (url.length() == 0) {
+            url = action.optString("url", action.optString("href", ""));
+        }
+        if (url.length() == 0) {
+            return;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        try {
+            context.startActivity(intent);
+        } catch (Exception ignored) {
+        }
+    }
+
+    private static boolean isExternalUrlFunction(String functionName) {
+        return "abrirForaDoApp".equals(functionName)
+            || "abrirUrlExterno".equals(functionName)
+            || "abrirUrl".equals(functionName)
+            || "openOutsideApp".equals(functionName)
+            || "openExternalUrl".equals(functionName)
+            || "openUrl".equals(functionName);
+    }
+
+    private static String firstActionArgument(JSONObject action) {
+        JSONArray args = action.optJSONArray("argumentos");
+        if (args == null) {
+            args = action.optJSONArray("args");
+        }
+        if (args == null) {
+            args = action.optJSONArray("parametros");
+        }
+        if (args == null) {
+            args = action.optJSONArray("params");
+        }
+        if (args == null || args.length() == 0) {
+            return "";
+        }
+        return args.optString(0, "");
+    }
+
+    private static JSONObject notificationClickAction(JSONObject detail) {
+        if (detail == null) {
+            return null;
+        }
+
+        JSONObject action = detail.optJSONObject("action");
+        if (action != null) {
+            JSONObject nested = action.optJSONObject("aoClicar");
+            if (nested == null) {
+                nested = action.optJSONObject("onClick");
+            }
+            return nested == null ? action : nested;
+        }
+
+        action = detail.optJSONObject("acao");
+        if (action != null) {
+            JSONObject nested = action.optJSONObject("aoClicar");
+            if (nested == null) {
+                nested = action.optJSONObject("onClick");
+            }
+            return nested == null ? action : nested;
+        }
+
+        action = detail.optJSONObject("aoClicar");
+        if (action == null) {
+            action = detail.optJSONObject("onClick");
+        }
+        return action;
+    }
+
+    private static boolean shouldOpenAppForNotificationClick(JSONObject detail) {
+        Boolean open = openFlag(detail);
+        JSONObject action;
+
+        if (open != null) {
+            return open.booleanValue();
+        }
+
+        action = detail == null ? null : detail.optJSONObject("action");
+        open = openFlag(action);
+        if (open != null) {
+            return open.booleanValue();
+        }
+
+        action = detail == null ? null : detail.optJSONObject("acao");
+        open = openFlag(action);
+        if (open != null) {
+            return open.booleanValue();
+        }
+
+        action = notificationClickAction(detail);
+        open = openFlag(action);
+        return open == null || open.booleanValue();
+    }
+
+    private static Boolean openFlag(JSONObject object) {
+        if (object == null) {
+            return null;
+        }
+        if (object.has("open")) {
+            return Boolean.valueOf(object.optBoolean("open", true));
+        }
+        if (object.has("abrir")) {
+            return Boolean.valueOf(object.optBoolean("abrir", true));
+        }
+        if (object.has("openApp")) {
+            return Boolean.valueOf(object.optBoolean("openApp", true));
+        }
+        if (object.has("abrirApp")) {
+            return Boolean.valueOf(object.optBoolean("abrirApp", true));
+        }
+        return null;
+    }
+
     static boolean canScheduleExactAlarms(Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
             return true;
@@ -2219,9 +2410,13 @@ public class Html2ApkBridge extends CordovaPlugin {
     static JSONObject detailPayload(JSONObject options) throws Exception {
         JSONObject detail = new JSONObject();
         JSONObject click = options.optJSONObject("aoClicar");
+        Boolean open = openFlag(options);
         if (click == null) {
             click = options.optJSONObject("onClick");
         }
+        if (open == null) {
+            open = openFlag(click);
+        }
 
         detail.put("id", notificationId(options));
         detail.put("title", title(options));
@@ -2232,6 +2427,10 @@ public class Html2ApkBridge extends CordovaPlugin {
         detail.put("clickedAt", System.currentTimeMillis());
         detail.put("onClick", click == null ? new JSONObject().put("action", "open-app") : click);
         detail.put("aoClicar", click == null ? new JSONObject().put("acao", "abrir-app") : click);
+        if (open != null) {
+            detail.put("open", open.booleanValue());
+            detail.put("abrir", open.booleanValue());
+        }
         return detail;
     }
 
@@ -2259,7 +2458,7 @@ public class Html2ApkBridge extends CordovaPlugin {
                 builder.addAction(
                     context.getApplicationInfo().icon,
                     title,
-                    createContentIntent(context, notificationId * 100 + index + 1, detail)
+                    createNotificationClickIntent(context, notificationId * 100 + index + 1, detail)
                 );
             } catch (Exception ignored) {
             }

package/src/templates/cordova-plugin-html2apk-bridge/src/android/NotificationClickReceiver.java

@@ -0,0 +1,28 @@
+package dev.html2apk.bridge;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.core.app.NotificationManagerCompat;
+
+import org.json.JSONObject;
+
+public class NotificationClickReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent == null || !intent.getBooleanExtra(Html2ApkBridge.EXTRA_NOTIFICATION_CLICKED, false)) {
+            return;
+        }
+
+        JSONObject detail;
+        try {
+            detail = new JSONObject(intent.getStringExtra(Html2ApkBridge.EXTRA_NOTIFICATION_DETAIL));
+        } catch (Exception ignored) {
+            detail = new JSONObject();
+        }
+
+        Html2ApkBridge.handleNotificationClickBroadcast(context, detail);
+        NotificationManagerCompat.from(context).cancel(detail.optInt("id", 0));
+    }
+}

package/src/templates/cordova-plugin-html2apk-bridge/src/android/NotificationReceiver.java

@@ -58,7 +58,7 @@ public class NotificationReceiver extends BroadcastReceiver {
             .setContentText(text)
             .setStyle(new NotificationCompat.BigTextStyle().bigText(text))
             .setAutoCancel(true)
-            .setContentIntent(Html2ApkBridge.createContentIntent(context, id, detail))
+            .setContentIntent(Html2ApkBridge.createNotificationClickIntent(context, id, detail))
             .setPriority(NotificationCompat.PRIORITY_DEFAULT);
 
         Html2ApkBridge.addNotificationActions(builder, context, id, displayOptions);