diff --git a/.gitignore b/.gitignore index f93572a..6bb19b2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,10 @@ build/ captures/ .externalNativeBuild/ .cxx/ +.android/ +.cache/ local.properties app/release/ +app/libs/*.aar *.apk *.ap_ diff --git a/README.md b/README.md index 7e5e205..3368c62 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,25 @@ gradle wrapper --gradle-version 8.9 The APK is at `app/build/outputs/apk/debug/app-debug.apk`. +### NixOS / CLI build + +This repo includes a `flake.nix` dev shell with: + +- JDK 17 +- Gradle +- Android SDK 35 + Build Tools 35.0.0 + +Enter the shell and build: + +```bash +cd matrix-android +nix develop +gradle wrapper --gradle-version 8.9 +./gradlew assembleDebug +``` + +The shell exports `ANDROID_HOME` / `ANDROID_SDK_ROOT` and rewrites `local.properties` to the Nix SDK path so Gradle uses the packaged Android SDK instead of a user-specific installation. + ## Login ### SSO (recommended) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5c72ada..11571d6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.androidx.browser) implementation(libs.androidx.appcompat) - implementation(libs.olm.sdk) + implementation(files("libs/olm-sdk-3.2.16.jar")) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.okhttp.logging) } diff --git a/app/libs/olm-sdk-3.2.16.jar b/app/libs/olm-sdk-3.2.16.jar new file mode 100644 index 0000000..f57e2a8 Binary files /dev/null and b/app/libs/olm-sdk-3.2.16.jar differ diff --git a/app/src/main/java/com/ltadeu6/matrix/matrix/CryptoService.kt b/app/src/main/java/com/ltadeu6/matrix/matrix/CryptoService.kt index ba5b5dc..c233648 100644 --- a/app/src/main/java/com/ltadeu6/matrix/matrix/CryptoService.kt +++ b/app/src/main/java/com/ltadeu6/matrix/matrix/CryptoService.kt @@ -182,7 +182,7 @@ class CryptoService( /** * Handles `m.forwarded_room_key` — a key shared by another of our own devices in response - * to an `m.room_key_request`. Uses [OlmInboundGroupSession.importSession] because the + * to an `m.room_key_request`. Uses [OlmInboundGroupSession.importSession] because the * forwarded key is in exported (message-index-aware) format. */ private fun handleForwardedRoomKey(content: JsonObject) { diff --git a/app/src/main/java/com/ltadeu6/matrix/matrix/VerificationService.kt b/app/src/main/java/com/ltadeu6/matrix/matrix/VerificationService.kt index 3970931..67cf918 100644 --- a/app/src/main/java/com/ltadeu6/matrix/matrix/VerificationService.kt +++ b/app/src/main/java/com/ltadeu6/matrix/matrix/VerificationService.kt @@ -58,14 +58,10 @@ class VerificationService(private val scope: CoroutineScope) { private var theirUserId: String? = null private var theirDeviceId: String? = null private var ourPublicKey: String? = null - private var pendingTheirMac: JsonObject? = null // mac received before we showed emojis + private var pendingTheirMac: JsonObject? = null private var selectedMacMethod: String? = null private var hasConfirmedLocally: Boolean = false - // ------------------------------------------------------------------------- - // Incoming event dispatch - // ------------------------------------------------------------------------- - fun processToDeviceEvent(event: JsonObject) { val type = (event["type"] as? JsonPrimitive)?.content ?: return val content = event["content"]?.jsonObject ?: return @@ -74,18 +70,14 @@ class VerificationService(private val scope: CoroutineScope) { when (type) { "m.key.verification.request" -> handleRequest(sender, txnId, content) - "m.key.verification.start" -> handleStart(sender, txnId, content) - "m.key.verification.key" -> handleKey(txnId, content) - "m.key.verification.mac" -> handleMac(txnId, content) - "m.key.verification.done" -> handleDone(txnId) - "m.key.verification.cancel" -> handleCancel(txnId, content) + "m.key.verification.start" -> handleStart(sender, txnId, content) + "m.key.verification.key" -> handleKey(txnId, content) + "m.key.verification.mac" -> handleMac(txnId, content) + "m.key.verification.done" -> handleDone(txnId) + "m.key.verification.cancel" -> handleCancel(txnId, content) } } - // ------------------------------------------------------------------------- - // Request — show banner - // ------------------------------------------------------------------------- - private fun handleRequest(sender: String, txnId: String, content: JsonObject) { if (_state.value !is VerificationState.Idle) return val fromDevice = (content["from_device"] as? JsonPrimitive)?.content ?: return @@ -95,10 +87,6 @@ class VerificationService(private val scope: CoroutineScope) { _state.value = VerificationState.Requested(sender, fromDevice, txnId) } - // ------------------------------------------------------------------------- - // Accept — user tapped "Accept" on the banner - // ------------------------------------------------------------------------- - fun accept(txnId: String) { if ((_state.value as? VerificationState.Requested)?.txnId != txnId) return val toUser = theirUserId ?: return @@ -111,13 +99,8 @@ class VerificationService(private val scope: CoroutineScope) { scope.launch { onSend(toUser, toDevice, "m.key.verification.ready", "${txnId}_ready", content) } - // Stay in Requested state; wait for m.key.verification.start } - // ------------------------------------------------------------------------- - // Start — create OlmSAS, send accept + key - // ------------------------------------------------------------------------- - private fun handleStart(sender: String, txnId: String, content: JsonObject) { if (txnId != currentTxnId) return val method = (content["method"] as? JsonPrimitive)?.content @@ -145,7 +128,6 @@ class VerificationService(private val scope: CoroutineScope) { olmSas = sas ourPublicKey = sas.publicKey - // commitment = unpadded-base64(SHA-256(our_pubkey_base64 + canonical_json(start_content))) val sha256 = MessageDigest.getInstance("SHA-256") val commitInput = (ourPublicKey ?: return) + content.toCanonicalJson() val commitment = Base64.encodeToString( @@ -177,10 +159,6 @@ class VerificationService(private val scope: CoroutineScope) { } } - // ------------------------------------------------------------------------- - // Key exchange — compute SAS and show emojis - // ------------------------------------------------------------------------- - private fun handleKey(txnId: String, content: JsonObject) { if (txnId != currentTxnId) return val sas = olmSas ?: return @@ -188,11 +166,10 @@ class VerificationService(private val scope: CoroutineScope) { sas.setTheirPublicKey(theirKey) - // Initiator = them (sent the start), Accepting = us val info = "MATRIX_KEY_VERIFICATION_SAS" + - "|${theirUserId}|${theirDeviceId}|${theirKey}" + - "|${userId}|${deviceId}|${ourPublicKey}" + - "|${txnId}" + "|${theirUserId}|${theirDeviceId}|${theirKey}" + + "|${userId}|${deviceId}|${ourPublicKey}" + + "|${txnId}" val sasBytes = sas.generateShortCode(info, 6) val emojis = sasBytes.toSasEmojis() @@ -200,10 +177,6 @@ class VerificationService(private val scope: CoroutineScope) { _state.value = VerificationState.ShowingEmojis(txnId, emojis) } - // ------------------------------------------------------------------------- - // Confirm — user tapped "Confirm emojis match" - // ------------------------------------------------------------------------- - fun confirm() { val state = _state.value as? VerificationState.ShowingEmojis ?: return val sas = olmSas ?: return @@ -246,10 +219,6 @@ class VerificationService(private val scope: CoroutineScope) { } } - // ------------------------------------------------------------------------- - // Their MAC — verify and send done - // ------------------------------------------------------------------------- - private fun handleMac(txnId: String, content: JsonObject) { if (txnId != currentTxnId) return if (_state.value !is VerificationState.ShowingEmojis || !hasConfirmedLocally) { @@ -309,10 +278,6 @@ class VerificationService(private val scope: CoroutineScope) { } } - // ------------------------------------------------------------------------- - // Done / Cancel - // ------------------------------------------------------------------------- - private fun handleDone(txnId: String) { if (txnId != currentTxnId) return cleanup() @@ -378,10 +343,6 @@ private fun OlmSAS.calculateMacByMethod(input: String, info: String, method: Str } }.getOrNull() -// --------------------------------------------------------------------------- -// SAS emoji derivation (Matrix spec: 42 bits = 7 × 6-bit indices) -// --------------------------------------------------------------------------- - private fun ByteArray.toSasEmojis(): List { val b = map { it.toInt() and 0xFF } val indices = listOf( @@ -396,7 +357,6 @@ private fun ByteArray.toSasEmojis(): List { return indices.map { SAS_EMOJIS[it] } } -// Matrix SAS emoji list (indices 0–63), from the Matrix spec. private val SAS_EMOJIS = listOf( SasEmoji("\uD83D\uDC36", "Dog"), SasEmoji("\uD83D\uDC31", "Cat"), diff --git a/app/src/main/jniLibs/arm64-v8a/libolm.so b/app/src/main/jniLibs/arm64-v8a/libolm.so new file mode 100755 index 0000000..414368d Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libolm.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libolm.so b/app/src/main/jniLibs/armeabi-v7a/libolm.so new file mode 100755 index 0000000..74bc998 Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/libolm.so differ diff --git a/app/src/main/jniLibs/x86/libolm.so b/app/src/main/jniLibs/x86/libolm.so new file mode 100755 index 0000000..6a489e8 Binary files /dev/null and b/app/src/main/jniLibs/x86/libolm.so differ diff --git a/app/src/main/jniLibs/x86_64/libolm.so b/app/src/main/jniLibs/x86_64/libolm.so new file mode 100755 index 0000000..811dc86 Binary files /dev/null and b/app/src/main/jniLibs/x86_64/libolm.so differ diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..62ec88a --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..5191144 --- /dev/null +++ b/flake.nix @@ -0,0 +1,60 @@ +{ + description = "Nix dev shell for building matrix-android from the CLI"; + + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = { self, flake-utils, nixpkgs }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + config.android_sdk.accept_license = true; + }; + + androidComposition = pkgs.androidenv.composeAndroidPackages { + platformVersions = [ "31" "35" ]; + buildToolsVersions = [ "30.0.2" "34.0.0" "35.0.0" ]; + includeEmulator = false; + includeNDK = true; + includeSources = false; + includeSystemImages = false; + }; + + androidSdk = androidComposition.androidsdk; + androidSdkRoot = "${androidSdk}/libexec/android-sdk"; + in + { + devShells.default = pkgs.mkShell { + packages = [ + pkgs.gradle + pkgs.jdk17 + androidSdk + ]; + + ANDROID_HOME = androidSdkRoot; + ANDROID_SDK_ROOT = androidSdkRoot; + JAVA_HOME = pkgs.jdk17.home; + + shellHook = '' + export ANDROID_USER_HOME="$PWD/.android" + export GRADLE_USER_HOME="$PWD/.gradle" + export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH" + export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/35.0.0/aapt2" + + cat > local.properties < '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5eed7ee --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega