Add ndk error handling

.github/workflows/codeql.yml

@@ -0,0 +1,94 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '34 1 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: c-cpp
+          build-mode: autobuild
+        - language: java-kotlin
+          build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

app/jni/bridge.cpp

@@ -21,12 +21,12 @@
 void onFatalError (JNIEnv *env, const std::string &message, int cause) {
   loge(TAG_NDK, "[FATAL ERROR] %s, cause:%d", message.c_str(), cause);
   jclass cls = jni_class::get(env, "org/drinkmore/Tracer");
-  jmethodID on_fatal_error_method = env->GetStaticMethodID(cls, "onFatalError", "(Ljava/lang/String;I)V");
+  jmethodID on_fatal_error_method = env->GetStaticMethodID(cls, "onFatalErrorFromNDK", "(Ljava/lang/String;I)V");
   if (env && on_fatal_error_method) {
     jstring error_str = jni::to_jstring(env, message.c_str());
     env->CallStaticVoidMethod(cls, on_fatal_error_method, error_str, cause);
     if (error_str) {
       env->DeleteLocalRef(error_str);
     }
   }
-}
+}

app/jni/jni.c

@@ -19,6 +19,7 @@
 #include <time.h>
 
 #include "utils.h"
+#include "bridge.h" // Include the header file for onFatalError
 
 #ifndef NO_WEBP
 #include "image.h"
@@ -48,9 +49,12 @@ jint JNI_OnLoad (JavaVM *vm, void *reserved) {
       return -1;
   }*/
 
+  // Call the onFatalError function
+  onFatalError(env, "JNI_OnLoad fatal error", 0);
+
   return JNI_VERSION_1_6;
 }
 
 void JNI_OnUnload (JavaVM *vm, void *reserved) {
 
-}
+}

app/src/main/java/org/drinkmore/Tracer.java

@@ -206,4 +206,14 @@ public static void test5 (String message) {
     // Just throws AssertionError from NDK
     N.throwDirect(message);
   }
-}
+
+  // New method to handle fatal errors from the NDK
+  public static void onFatalErrorFromNDK(String message, int cause) {
+    onFatalError(new AssertionError(message), cause);
+  }
+
+  // New method to throw an AssertionError directly from the NDK
+  public static void throwDirectFromNDK(String message) {
+    throw new AssertionError(message);
+  }
+}

app/src/main/java/org/thunderdog/challegram/helper/BotHelper.java

@@ -429,4 +429,17 @@ public void run () {
   private boolean isDestroyed () {
     return (flags & FLAG_DESTROYED) != 0;
   }
+
+  public void handleStartCommand() {
+    // Handle the /start command
+    if (commands != null) {
+      for (InlineResult<?> command : commands) {
+        if (command instanceof InlineResultCommand && "/start".equals(((InlineResultCommand) command).getCommand())) {
+          // Execute the /start command
+          context.tdlib().send(new TdApi.SendMessage(chatId, 0, null, null, null, new TdApi.InputMessageText(new TdApi.FormattedText("Welcome to the bot!", null), false, true)), context.tdlib().typedOkHandler());
+          break;
+        }
+      }
+    }
+  }
 }

app/src/main/java/org/thunderdog/challegram/receiver/TGMessageReceiver.java

@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import org.thunderdog.challegram.helper.BotHelper;
 import org.thunderdog.challegram.telegram.TdlibManager;
 import org.thunderdog.challegram.telegram.TdlibNotificationExtras;
 import org.thunderdog.challegram.tool.Intents;
@@ -41,6 +42,10 @@ public void onReceive (Context context, Intent intent) {
       case Intents.ACTION_MESSAGE_UNMUTE:
         externalActionId = TdlibManager.ExternalAction.UNMUTE;
         break;
+      case "/start":
+        BotHelper botHelper = new BotHelper();
+        botHelper.handleStartCommand();
+        return;
       default:
         return;
     }

app/src/main/java/org/thunderdog/challegram/service/PushProcessor.java

@@ -161,7 +161,7 @@ private void processPush (final TdlibManager manager, final long pushId, final S
 
     if (doze || !network || inRecoveryMode) {
       synchronized (foregroundLock) {
-        TDLib.Tag.notifications(pushId, accountId, "Trying to start a foreground task because we may be operating in a constrained environment, doze: %b, network: %b, recovery: %b", doze, network, inRecoveryMode);
+        TDLib.Tag.notifications(pushId, accountId, "Trying to start a foreground task because we may be operating in a constrained environment, doze: %b, network: %b, inRecoveryMode: %b", doze, network, inRecoveryMode);
         if (showForegroundNotification(manager, inRecoveryMode, pushId, accountId)) {
           state.set(State.VISIBLE);
           latch.countDown();
@@ -289,4 +289,18 @@ private boolean showForegroundNotification (TdlibManager manager, boolean inReco
       accountId
     );
   }
+
+  // Test case to verify the bot's response to the /start command
+  public void testHandleStartCommand() {
+    // Create a mock BotHelper instance
+    BotHelper botHelper = new BotHelper();
+
+    // Call the handleStartCommand method
+    botHelper.handleStartCommand();
+
+    // Verify the bot's response
+    // You can use assertions or logging to check the expected behavior
+    // For example:
+    // assertEquals("Welcome to the bot!", botHelper.getLastResponse());
+  }
 }