Upstream Main

.dockerignore

@@ -0,0 +1,20 @@
+.gradle
+.idea
+.kotlin
+build/
+app/build/
+core/main/build/
+core/components/build/
+core/resources/build/
+terminal-view/build/
+terminal-emulator/build/
+soraX/editor/build/
+soraX/oniguruma-native/build/
+soraX/editor-lsp/build/
+soraX/language-textmate/build/
+baselineprofile/build/
+benchmark/build/
+benchmark2/build/
+core/proot/build/
+local.properties
+*.apk

.github/scripts/scan-translations.js

@@ -0,0 +1,121 @@
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
+const { GoogleGenerativeAI } = require("@google/generative-ai");
+
+const apiKey = process.env.GEMINI_API_KEY;
+if (!apiKey) {
+  console.error("Missing GEMINI_API_KEY environment variable.");
+  process.exit(1);
+}
+
+const genAI = new GoogleGenerativeAI(apiKey);
+
+// Helper to safely run git commands and get output string
+function runGit(command) {
+  try {
+    return execSync(command, { encoding: "utf8" }).trim();
+  } catch (error) {
+    return "";
+  }
+}
+
+async function main() {
+  const eventName = process.env.GITHUB_EVENT_NAME;
+  let baseDiffTarget = "";
+
+  if (eventName === "pull_request") {
+    const baseRef = process.env.GITHUB_BASE_REF;
+    runGit(`git fetch origin ${baseRef}`);
+    baseDiffTarget = `origin/${baseRef}...HEAD`;
+  } else {
+    let beforeSha = process.env.GITHUB_BEFORE_SHA;
+    const currentSha = process.env.GITHUB_CURRENT_SHA;
+
+    if (!beforeSha || beforeSha === "0000000000000000000000000000000000000000") {
+      beforeSha = "HEAD~1";
+    }
+    baseDiffTarget = `${beforeSha} ${currentSha}`;
+  }
+
+  // 1. Get list of changed files ending with strings.xml
+  const rawFiles = runGit(`git diff --name-only ${baseDiffTarget}`);
+  if (!rawFiles) {
+    console.log("No file changes detected.");
+    return;
+  }
+
+  const files = rawFiles.split("\n").filter(file => file.endsWith("strings.xml"));
+
+  if (files.length === 0) {
+    console.log("No strings.xml changes detected.");
+    return;
+  }
+
+  const model = genAI.getGenerativeModel({ model: "gemini-2.0-flash" });
+  let workflowFailed = false;
+
+  // 2. Loop through each modified strings.xml file and scan its diff
+  for (const file of files) {
+    const diff = runGit(`git diff ${baseDiffTarget} -- "${file}"`);
+    if (!diff.trim()) continue;
+
+    const prompt = [
+      "You are a translation moderation system.",
+      "",
+      "Analyze this Android strings.xml git diff.",
+      "",
+      "Check ONLY newly added or modified translations.",
+      "",
+      "Detect:",
+      "- profanity",
+      "- slurs",
+      "- hate speech",
+      "- sexual content",
+      "- abusive language",
+      "- offensive slang",
+      "",
+      "Ignore:",
+      "- XML syntax",
+      "- placeholders like %s or %d",
+      "- harmless casual language",
+      "",
+      "Reply ONLY with:",
+      "SAFE",
+      "",
+      "or",
+      "",
+      "UNSAFE: <reason>",
+      "",
+      "Git diff:",
+      diff
+    ].join("\n");
+
+    try {
+      const result = await model.generateContent(prompt);
+      const text = result.response.text().trim();
+
+      console.log(`\n=== Scanning: ${file} ===`);
+      console.log(text);
+
+      if (!text.startsWith("SAFE")) {
+        workflowFailed = true;
+      }
+    } catch (err) {
+      console.error(`Error scanning ${file}:`, err.message);
+      workflowFailed = true;
+    }
+  }
+
+  if (workflowFailed) {
+    console.error("\nTranslation moderation failed. Unsafe content detected.");
+    process.exit(1);
+  }
+
+  console.log("\nAll translations are safe.");
+}
+
+main().catch((err) => {
+  console.error("Execution error:", err);
+  process.exit(1);
+});

.github/workflows/android.yml

@@ -27,6 +27,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
           cache: gradle
+
       - name: Cache Gradle Build Files
         uses: actions/cache@v5
         with:
@@ -52,6 +53,9 @@ jobs:
       - name: Clone submodules
         run: git submodule update --init --recursive
 
+      - name: Accept Android SDK licenses
+        run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses || true
+
       - name: Build with Gradle
         run: ./gradlew assembleRelease --no-daemon && mv app/build/outputs/apk/release/*.apk app/xed-editor-${{ env.COMMIT_HASH }}.apk
         env:
@@ -73,12 +77,11 @@ jobs:
         env:
           COMMIT_MSG: ${{ github.event.head_commit.message }}
         run: |
-          CAPTION=$(printf "%s" "$COMMIT_MSG" | jq -Rs .)
           curl -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument" \
             -F chat_id="-1002408175863" \
             -F message_thread_id="582" \
-            -F caption="$CAPTION" \
-            -F document=@"app/xed-editor-${{ env.COMMIT_HASH }}.apk"
+            -F document=@"app/xed-editor-${{ env.COMMIT_HASH }}.apk" \
+            --form-string "caption=$COMMIT_MSG"
 
       - name: Generate Plugin Sdk
         run: |

.github/workflows/ktfmt-check.yml

@@ -29,6 +29,9 @@ jobs:
       - name: Clone submodules
         run: git submodule update --init --recursive
 
+      - name: Accept Android SDK licenses
+        run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses || true
+
       - name: Run ktfmt format
         run: ./gradlew ktfmtFormat --no-daemon
 

.github/workflows/update-soraX.yml

@@ -0,0 +1,33 @@
+# .github/workflows/update-submodule.yml
+name: Update soraX Submodule
+
+on:
+  workflow_dispatch:
+
+jobs:
+  update-submodule:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Update soraX to latest commit
+        run: |
+          git submodule update --remote soraX
+
+      - name: Commit and push if changed
+        run: |
+          git diff --quiet && echo "soraX already up to date, nothing to commit." && exit 0
+          COMMIT=$(git -C soraX rev-parse --short HEAD)
+          git add soraX
+          git commit -m "chore: update soraX submodule to $COMMIT"
+          git push origin main

.gitignore

@@ -21,4 +21,17 @@ Todo.md
 */build
 **/build
 .vscode
-core/wasm3
+core/wasm3
+
+# Binary artifacts
+*.exe
+*.o
+*.so
+*.a
+*.la
+*.lo
+*.lai
+*.pyc
+__pycache__/
+.DS_Store
+*~

Dockerfile

@@ -0,0 +1,63 @@
+# ==========================================
+# Stage 1: Build Environment
+# ==========================================
+FROM eclipse-temurin:21-jdk AS builder
+
+# Set environment variables for Android SDK
+ENV ANDROID_HOME=/opt/android-sdk
+ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    wget \
+    unzip \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and install Android SDK command-line tools
+RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \
+    wget -q https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip -O /tmp/cmdline-tools.zip && \
+    unzip -q /tmp/cmdline-tools.zip -d /tmp && \
+    mv /tmp/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest && \
+    rm /tmp/cmdline-tools.zip
+
+# Accept Android SDK licenses
+RUN yes | sdkmanager --licenses || true
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the project files
+# Note: Ensure submodules are checked out on host before building:
+#   git submodule update --init --recursive
+COPY . .
+
+# Set up build arguments for release signing (optional)
+# BUILD_TASK can be assembleDebug, assembleRelease, etc.
+ARG BUILD_TASK=assembleDebug
+ARG RELEASE_KEYSTORE_BASE64=""
+ARG RELEASE_PROPERTIES_BASE64=""
+
+# Set env to match the signing logic in app/build.gradle.kts
+ENV GITHUB_ACTIONS=true
+
+# Decode credentials (if provided), ensure submodules are present, and run the Gradle build task
+RUN if [ -n "$RELEASE_KEYSTORE_BASE64" ] && [ -n "$RELEASE_PROPERTIES_BASE64" ]; then \
+        echo "Decoding release keys..." && \
+        echo "$RELEASE_KEYSTORE_BASE64" | base64 -d > /tmp/xed.keystore && \
+        echo "$RELEASE_PROPERTIES_BASE64" | base64 -d > /tmp/signing.properties; \
+    fi && \
+    if [ ! -f soraX/editor/build.gradle.kts ]; then \
+        echo "soraX submodule not found locally, cloning dynamically..." && \
+        rm -rf soraX && \
+        git clone --recursive https://github.com/RohitKushvaha01/soraX.git soraX; \
+    fi && \
+    chmod +x gradlew && \
+    ./gradlew ${BUILD_TASK} --no-daemon
+
+# ==========================================
+# Stage 2: Export Built APKs (BuildKit friendly)
+# ==========================================
+FROM scratch AS export-stage
+COPY --from=builder /app/app/build/outputs/apk/ /

README.md

@@ -57,6 +57,27 @@ documentation: https://xed-editor.github.io/Xed-Docs/
 
 ---
 
+## Building the Project
+
+
+1. Build the **Debug APK** (signed with the included testkey):
+   ```bash
+   ./gradlew assembleDebug
+   ```
+   The compiled APK will be located at `app/build/outputs/apk/debug/app-debug.apk`.
+---
+
+### Option 2: Building with Docker
+
+If you do not have the Android SDK or JDK 21 installed locally, you can compile the project in a container using Docker.
+This command builds the APK and exports it directly to your host machine:
+```bash
+DOCKER_BUILDKIT=1 docker build --target export-stage --output ./out .
+```              
+The output debug APK will be generated at `out/debug/app-debug.apk`.
+
+---
+
 ## Contributing
 
 We welcome contributions! Please read the [`/docs/CONTRIBUTING.md`](/docs/CONTRIBUTING.md) file to

app/.gitignore

@@ -3,3 +3,6 @@
 src/main/jniLibs/arm64-v8a/libproot-loader*.so
 src/main/jniLibs/armeabi-v7a/libproot-loader*.so
 src/main/jniLibs/x86_64/libproot-loader*.so
+src/main/jniLibs/arm64-v8a/libloader*.so
+src/main/jniLibs/armeabi-v7a/libloader*.so
+src/main/jniLibs/x86_64/libloader*.so

app/build.gradle.kts

@@ -3,25 +3,23 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.android.baselineprofile)
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.ktfmt)
 }
 
 android {
     namespace = "com.rk.application"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.rk.xededitor"
         minSdk = 26
 
-        //noinspection ExpiredTargetSdkVersion
-        targetSdk = 28
+        targetSdk = 37
 
         // versioning
-        versionCode = 87
-        versionName = "3.2.9"
+        versionCode = 95
+        versionName = "3.3.1"
         vectorDrawables { useSupportLibrary = true }
     }
 
@@ -40,7 +38,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin { jvmToolchain(21) }
 
     packaging { jniLibs { useLegacyPackaging = true } }
 
@@ -85,9 +82,10 @@ android {
         release {
             isMinifyEnabled = false
             isShrinkResources = false
-
             isCrunchPngs = false
+
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+
             signingConfig = signingConfigs.getByName("release")
         }
 
@@ -105,6 +103,8 @@ android {
     }
 }
 
+kotlin { jvmToolchain(21) }
+
 dependencies {
     implementation(libs.androidx.profileinstaller)
     coreLibraryDesugaring(libs.desugar)