.github/workflows/ci.yml

@@ -1,14 +1,6 @@
 name: signal-cli CI
 
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-  workflow_call:
-
-permissions:
-  contents: write # to fetch code (actions/checkout) and submit dependency graph (gradle/gradle-build-action)
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -16,81 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21', '24' ]
+        java: [ '17' ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v1
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v1
         with:
-          distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          dependency-graph: generate-and-submit
-      - name: Install asciidoc
-        run: sudo apt update && sudo apt --no-install-recommends install -y asciidoc-base
       - name: Build with Gradle
-        run: ./gradlew --no-daemon build
-      - name: Build man page
-        run: |
-          cd man
-          make install
-      - name: Add man page to archive
-        run: |
-          version=$(tar tf build/distributions/signal-cli-*.tar | head -n1 | sed 's|signal-cli-\([^/]*\)/.*|\1|')
-          echo $version
-          tar --transform="flags=r;s|man|signal-cli-${version}/man|" -rf build/distributions/signal-cli-${version}.tar man/man{1,5}
+        run: ./gradlew build
       - name: Compress archive
         run: gzip -n -9 build/distributions/signal-cli-*.tar
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: signal-cli-archive-${{ matrix.java }}
           path: build/distributions/signal-cli-*.tar.gz
-
-  build-graalvm:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: graalvm/setup-graalvm@v1
-        with:
-          version: 'latest'
-          java-version: '21'
-          cache: 'gradle'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build with Gradle
-        run: ./gradlew --no-daemon nativeCompile
-      - name: Archive production artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: signal-cli-native
-          path: build/native/nativeCompile/signal-cli
-
-  build-client:
-    strategy:
-      matrix:
-        os:
-          - ubuntu
-          - macos
-          - windows
-    runs-on: ${{ matrix.os }}-latest
-    defaults:
-      run:
-        working-directory: ./client
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install rust
-        run: rustup default stable
-      - name: Build client
-        run: cargo build --release --verbose
-      - name: Archive production artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: signal-cli-client-${{ matrix.os }}
-          path: |
-            client/target/release/signal-cli-client
-            client/target/release/signal-cli-client.exe

.github/workflows/codeql-analysis.yml

@@ -9,10 +9,6 @@ on:
   schedule:
     - cron: '0 7 * * 4'
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-  security-events: write
-
 jobs:
   analyse:
     name: Analyse
@@ -21,13 +17,12 @@ jobs:
     steps:
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v1
         with:
-          distribution: 'zulu'
-          java-version: 21
+          java-version: 17
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -35,7 +30,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v1
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
@@ -43,7 +38,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -57,4 +52,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v1

.github/workflows/release.yml

@@ -1,257 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - v*
-
-permissions:
-  contents: write # to fetch code (actions/checkout) and create release
-
-env:
-  IMAGE_NAME: signal-cli
-  IMAGE_REGISTRY: ghcr.io/asamk
-  REGISTRY_USER: ${{ github.actor }}
-  REGISTRY_PASSWORD: ${{ github.token }}
-
-jobs:
-
-  ci_wf:
-    permissions:
-      contents: write
-    uses: AsamK/signal-cli/.github/workflows/ci.yml@master
-    # ${{ github.repository }} not accepted here
-
-  lib_to_jar:
-    needs: ci_wf
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    outputs:
-      signal_cli_version: ${{ steps.cli_ver.outputs.version }}
-      release_id: ${{ steps.create_release.outputs.id }}
-
-    steps:
-
-      - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v4
-
-      - name: Get signal-cli version
-        id: cli_ver
-        run: |
-          ver="${GITHUB_REF_NAME#v}"
-          echo "version=${ver}" >> $GITHUB_OUTPUT
-
-      - name: Extract archive
-        run: |
-          tree .
-          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
-          tar -xzf ./"${ARCHIVE_DIR}"/*.tar.gz
-          mv ./"${ARCHIVE_DIR}"/*.tar.gz signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
-          rm -rf signal-cli-archive-*/
-
-#      - name: Get signal-client jar version
-#        id: lib_ver
-#        run: |
-#          JAR_PREFIX=libsignal-client-
-#          jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
-#          jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
-#          echo "$jar_version"
-#          echo "signal_client_version=${jar_version}" >> $GITHUB_OUTPUT
-#
-#      - name: Download signal-client builds
-#        env:
-#          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/
-#          FILE_NAMES: signal_jni.dll libsignal_jni.dylib
-#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-#        run: |
-#          for file_name in $FILE_NAMES; do
-#            curl -sOL "${RELEASES_URL}/v${SIGNAL_CLIENT_VER}/${file_name}"  # note: added v
-#          done
-#          tree .
-
-      - name: Compress native app
-        env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
-        run: |
-          chmod +x signal-cli-native/signal-cli
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
-          rm -rf signal-cli-native/
-
-#      - name: Replace Windows lib
-#        env:
-#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
-#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-#        run: |
-#          mv signal_jni.dll libsignal_jni.so
-#          zip -u ./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
-#          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-*/
-#
-#      - name: Replace macOS lib
-#        env:
-#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
-#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-#        run: |
-#          jar_file=./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
-#          zip -d $jar_file libsignal_jni.so
-#          zip $jar_file libsignal_jni.dylib
-#          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-*/
-
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
-          release_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
-          draft: true
-
-      - name: Upload archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-#      - name: Upload Linux archive
-#        uses: actions/upload-release-asset@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
-#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
-#          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-      - name: Upload Linux native archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-#      - name: Upload windows archive
-#        uses: actions/upload-release-asset@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
-#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
-#          asset_content_type: application/x-compressed-tar  # .tar.gz
-#
-#      - name: Upload macos archive
-#        uses: actions/upload-release-asset@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
-#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
-#          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-  build-container:
-    needs: ci_wf
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v4
-
-      - name: Get signal-cli version
-        id: cli_ver
-        run: |
-          ver="${GITHUB_REF_NAME#v}"
-          echo "version=${ver}" >> $GITHUB_OUTPUT
-
-      - name: Move archive file
-        run: |
-          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
-          tar xf ./"${ARCHIVE_DIR}"/*.tar.gz
-          rm -r signal-cli-archive-* signal-cli-native
-          mkdir -p build/install/
-          mv ./signal-cli-"${GITHUB_REF_NAME#v}"/ build/install/signal-cli
-
-      - name: Build Image
-        id: build_image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: latest ${{ github.sha }} ${{ steps.cli_ver.outputs.version }}
-          containerfiles:
-            ./Containerfile
-          oci: true
-
-      - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v2
-        id: push
-        with:
-          image: ${{ steps.build_image.outputs.image }}
-          tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.IMAGE_REGISTRY }}
-          username: ${{ env.REGISTRY_USER }}
-          password: ${{ env.REGISTRY_PASSWORD }}
-
-      - name: Echo outputs
-        run: |
-          echo "${{ toJSON(steps.push.outputs) }}"
-
-  build-container-native:
-    needs: ci_wf
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v4
-
-      - name: Get signal-cli version
-        id: cli_ver
-        run: |
-          ver="${GITHUB_REF_NAME#v}"
-          echo "version=${ver}" >> $GITHUB_OUTPUT
-
-      - name: Move archive file
-        run: |
-          mkdir -p build/native/nativeCompile/
-          chmod +x ./signal-cli-native/signal-cli
-          mv ./signal-cli-native/signal-cli build/native/nativeCompile/
-
-      - name: Build Image
-        id: build_image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: latest-native ${{ github.sha }}-native ${{ steps.cli_ver.outputs.version }}-native
-          containerfiles:
-            ./native.Containerfile
-          oci: true
-
-      - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v2
-        id: push
-        with:
-          image: ${{ steps.build_image.outputs.image }}
-          tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.IMAGE_REGISTRY }}
-          username: ${{ env.REGISTRY_USER }}
-          password: ${{ env.REGISTRY_PASSWORD }}
-
-      - name: Echo outputs
-        run: |
-          echo "${{ toJSON(steps.push.outputs) }}"

.gitignore

@@ -12,4 +12,3 @@ local.properties
 out/
 .DS_Store
 /bin/
-/test-config/

.idea/codeStyles/Project.xml

@@ -4,9 +4,8 @@
     <JavaCodeStyleSettings>
       <option name="GENERATE_FINAL_LOCALS" value="true" />
       <option name="GENERATE_FINAL_PARAMETERS" value="true" />
-      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="com" withSubpackages="true" static="false" />
@@ -54,9 +53,6 @@
       <option name="TERNARY_OPERATION_WRAP" value="5" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
-      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
     </codeStyleSettings>
     <codeStyleSettings language="XML">

CONTRIBUTING.md

@@ -1,18 +1,12 @@
 # Question
-
 If you have a question you can ask it in the [GitHub discussions page](https://github.com/AsamK/signal-cli/discussions)
 
 # Report a bug
-
 - Search [existing issues](https://github.com/AsamK/signal-cli/issues?q=is%3Aissue) if it has been reported already
-- If you're unable to find an open issue addressing the
-  problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
-    - Be sure to include a **title and clear description**, as much relevant information as possible.
-    - Specify the versions of signal-cli, libsignal-client (if self-compiled), JDK and OS you're using
-    - Specify if it's the normal java or the graalvm native version.
-    - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
+- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
+  - Be sure to include a **title and clear description**, as much relevant information as possible.
+  - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
 
 # Pull request
-
 - Code style should match the existing code, IntelliJ users can use the auto formatter
 - Separate PRs should be opened for each implemented feature or bug fix

Containerfile

@@ -1,11 +0,0 @@
-FROM docker.io/azul/zulu-openjdk:21-jre-headless
-
-LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
-LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
-LABEL org.opencontainers.image.licenses=GPL-3.0-only
-
-RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
-ADD build/install/signal-cli /opt/signal-cli
-
-USER signal-cli
-ENTRYPOINT ["/opt/signal-cli/bin/signal-cli", "--config=/var/lib/signal-cli"]

FUNDING.yml

@@ -1,4 +1,3 @@
-github: AsamK
 liberapay: asamk
 ko_fi: asamk
 #bitcoin: bc1qykae53fry8a8ycgdzgv0rlxfc959hmmllvz698

README.md

@@ -1,33 +1,30 @@
 # signal-cli
 
-signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
-It supports registering, verifying, sending and receiving messages.
-signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
-extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal-service).
-For registering you need a phone number where you can receive SMS or incoming calls.
-
-signal-cli is primarily intended to be used on servers to notify admins of important events.
-For this use-case, it has a daemon mode with JSON-RPC interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-jsonrpc.5.adoc))
-and D-BUS interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) .
-For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
-
-signal-cli needs to be kept up-to-date to keep up with Signal-Server changes.
-The official Signal clients expire after three months and then the Signal-Server can make incompatible changes.
-So signal-cli releases older than three months may not work correctly.
+signal-cli is a commandline interface
+for [libsignal-service-java](https://github.com/WhisperSystems/libsignal-service-java). It supports registering,
+verifying, sending and receiving messages. To be able to link to an existing Signal-Android/signal-cli instance,
+signal-cli uses a [patched libsignal-service-java](https://github.com/AsamK/libsignal-service-java), because
+libsignal-service-java does not yet
+support [provisioning as a linked device](https://github.com/WhisperSystems/libsignal-service-java/pull/21). For
+registering you need a phone number where you can receive SMS or incoming calls. signal-cli is primarily intended to be
+used on servers to notify admins of important events. For this use-case, it has a dbus
+interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)), that can be used to
+send messages from any programming language that has dbus bindings. It also has a JSON-RPC based interface, see
+the [documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service) for more information.
 
 ## Installation
 
-You can [build signal-cli](#building) yourself or use
+You can [build signal-cli](#building) yourself, or use
 the [provided binary files](https://github.com/AsamK/signal-cli/releases/latest), which should work on Linux, macOS and
-Windows. There's also a [docker image and some Linux packages](https://github.com/AsamK/signal-cli/wiki/Binary-distributions) provided by the community.
+Windows. For Arch Linux there is also a [package in AUR](https://aur.archlinux.org/packages/signal-cli/) and there is
+a [FreeBSD port](https://www.freshports.org/net-im/signal-cli) available as well.
 
 System requirements:
 
-- at least Java Runtime Environment (JRE) 21
+- at least Java Runtime Environment (JRE) 17
 - native library: libsignal-client
 
-  The native libs are bundled for x86_64 Linux (with recent enough glibc), Windows and MacOS. For other
-  systems/architectures
+  The native lib is bundled for x86_64 Linux (with recent enough glibc, see #643), for other systems/architectures
   see: [Provide native lib for libsignal](https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal)
 
 ### Install system-wide on Linux
@@ -44,6 +41,7 @@ sudo ln -sf /opt/signal-cli-"${VERSION}"/bin/signal-cli /usr/local/bin/
 You can find further instructions on the Wiki:
 
 - [Quickstart](https://github.com/AsamK/signal-cli/wiki/Quickstart)
+- [DBus Service](https://github.com/AsamK/signal-cli/wiki/DBus-service)
 
 ## Usage
 
@@ -57,17 +55,10 @@ of all country codes.)
 
 * Register a number (with SMS verification)
 
-      signal-cli -a ACCOUNT register
+        signal-cli -a ACCOUNT register
 
-  You can register Signal using a landline number. In this case, you need to follow the procedure below:
-   * Attempt a SMS verification process first (`signal-cli -a ACCOUNT register`)
-     * You will get an error `400 (InvalidTransportModeException)`, this is normal
-   * Wait 60 seconds
-   * Attempt a voice call verification by adding the `--voice` switch and wait for the call:
-
-     ```sh
-     signal-cli -a ACCOUNT register --voice
-     ```
+  You can register Signal using a land line number. In this case you can skip SMS verification process and jump directly
+  to the voice call verification by adding the `--voice` switch at the end of above register command.
 
   Registering may require solving a CAPTCHA
   challenge: [Registration with captcha](https://github.com/AsamK/signal-cli/wiki/Registration-with-captcha)
@@ -75,27 +66,19 @@ of all country codes.)
 * Verify the number using the code received via SMS or voice, optionally add `--pin PIN_CODE` if you've added a pin code
   to your account
 
-      signal-cli -a ACCOUNT verify CODE
+        signal-cli -a ACCOUNT verify CODE
 
 * Send a message
 
-     ```sh
-     signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
-     ```
-
-* Send a message to a username, usernames need to be prefixed with `u:`
-
-     ```sh
-     signal-cli -a ACCOUNT send -m "This is a message" u:USERNAME.000
-     ```
+        signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
 
 * Pipe the message content from another process.
 
-      uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT
+        uname -a | signal-cli -a ACCOUNT send RECIPIENT
 
 * Receive messages
 
-      signal-cli -a ACCOUNT receive
+        signal-cli -a ACCOUNT receive
 
 **Hint**: The Signal protocol expects that incoming messages are regularly received (using `daemon` or `receive`
 command). This is required for the encryption to work efficiently and for getting updates to groups, expiration timer
@@ -105,8 +88,8 @@ and other features.
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 
-    $XDG_DATA_HOME/signal-cli/data/
-    $HOME/.local/share/signal-cli/data/
+        $XDG_DATA_HOME/signal-cli/data/
+        $HOME/.local/share/signal-cli/data/
 
 ## Building
 
@@ -115,45 +98,44 @@ version installed, you can replace `./gradlew` with `gradle` in the following st
 
 1. Checkout the source somewhere on your filesystem with
 
-       git clone https://github.com/AsamK/signal-cli.git
+        git clone https://github.com/AsamK/signal-cli.git
 
 2. Execute Gradle:
 
-       ./gradlew build
+        ./gradlew build
 
    2a. Create shell wrapper in *build/install/signal-cli/bin*:
 
-       ./gradlew installDist
+        ./gradlew installDist
 
    2b. Create tar file in *build/distributions*:
 
-       ./gradlew distTar
+        ./gradlew distTar
 
    2c. Create a fat tar file in *build/libs/signal-cli-fat*:
 
-       ./gradlew fatJar
+        ./gradlew fatJar
 
    2d. Compile and run signal-cli:
 
-      ```sh
-      ./gradlew run --args="--help"
-      ```
+        ./gradlew run --args="--help"
 
 ### Building a native binary with GraalVM (EXPERIMENTAL)
 
 It is possible to build a native binary with [GraalVM](https://www.graalvm.org). This is still experimental and will not
 work in all situations.
 
-1. [Install GraalVM and setup the environment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
-2. Execute Gradle:
+1. [Install GraalVM and setup the enviroment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
+2. [Install prerequisites](https://www.graalvm.org/reference-manual/native-image/#prerequisites)
+3. Execute Gradle:
 
-       ./gradlew nativeCompile
+        ./gradlew nativeCompile
 
    The binary is available at *build/native/nativeCompile/signal-cli*
 
 ## FAQ and Troubleshooting
 
-For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ).
+For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ)
 
 ## License
 

build.gradle.kts

@@ -3,94 +3,46 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.6"
+    id("org.graalvm.buildtools.native") version "0.9.8"
 }
 
-allprojects {
-    group = "org.asamk"
-    version = "0.13.19-SNAPSHOT"
-}
+version = "0.10.0"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-
-    if (!JavaVersion.current().isCompatibleWith(targetCompatibility)) {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(targetCompatibility.majorVersion))
-        }
-    }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 application {
     mainClass.set("org.asamk.signal.Main")
-    applicationDefaultJvmArgs = listOf("--enable-native-access=ALL-UNNAMED")
 }
 
 graalvmNative {
     binaries {
         this["main"].run {
-            buildArgs.add("--install-exit-handlers")
-            buildArgs.add("-Dfile.encoding=UTF-8")
-            buildArgs.add("-J-Dfile.encoding=UTF-8")
-            buildArgs.add("-march=compatibility")
-            resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
-            if (System.getenv("GRAALVM_HOME") == null) {
-                toolchainDetection.set(true)
-                javaLauncher.set(javaToolchains.launcherFor {
-                    languageVersion.set(JavaLanguageVersion.of(21))
-                })
-            } else {
-                toolchainDetection.set(false)
-            }
+            buildArgs.add("--allow-incomplete-classpath")
+            buildArgs.add("--report-unsupported-elements-at-runtime")
         }
     }
 }
 
-val artifactType = Attribute.of("artifactType", String::class.java)
-val minified = Attribute.of("minified", Boolean::class.javaObjectType)
-dependencies {
-    attributesSchema {
-        attribute(minified)
-    }
-    artifactTypes.getByName("jar") {
-        attributes.attribute(minified, false)
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url = uri("https://raw.github.com/AsamK/maven/master/releases/")
     }
 }
 
-configurations.runtimeClasspath.configure {
-    attributes {
-        attribute(minified, true)
-    }
-}
-val excludePatterns = mapOf(
-    "libsignal-client" to setOf(
-        "libsignal_jni_testing_amd64.so",
-        "signal_jni_testing_amd64.dll",
-        "libsignal_jni_testing_amd64.dylib",
-        "libsignal_jni_testing_aarch64.dylib",
-    )
-)
-
 dependencies {
-    registerTransform(JarFileExcluder::class) {
-        from.attribute(minified, false).attribute(artifactType, "jar")
-        to.attribute(minified, true).attribute(artifactType, "jar")
-
-        parameters {
-            excludeFilesByArtifact = excludePatterns
-        }
-    }
-
-    implementation(libs.bouncycastle)
-    implementation(libs.jackson.databind)
-    implementation(libs.argparse4j)
-    implementation(libs.dbusjava)
-    implementation(libs.slf4j.api)
-    implementation(libs.slf4j.jul)
-    implementation(libs.logback)
-    implementation(project(":libsignal-cli"))
+    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.0")
+    implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
+    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0-beta")
+    implementation("org.slf4j", "slf4j-simple", "1.7.32")
+    implementation("org.slf4j", "jul-to-slf4j", "1.7.32")
+    implementation(project(":lib"))
 }
 
 configurations {
@@ -114,26 +66,21 @@ tasks.withType<Jar> {
         attributes(
             "Implementation-Title" to project.name,
             "Implementation-Version" to project.version,
-            "Main-Class" to application.mainClass.get(),
-            "Enable-Native-Access" to "ALL-UNNAMED",
+            "Main-Class" to application.mainClass.get()
         )
     }
 }
 
-tasks.register("fatJar", type = Jar::class) {
+task("fatJar", type = Jar::class) {
     archiveBaseName.set("${project.name}-fat")
     exclude(
         "META-INF/*.SF",
         "META-INF/*.DSA",
         "META-INF/*.RSA",
-        "META-INF/NOTICE*",
-        "META-INF/LICENSE*",
-        "META-INF/INDEX.LIST",
-        "**/module-info.class",
+        "META-INF/NOTICE",
+        "META-INF/LICENSE",
+        "**/module-info.class"
     )
-    duplicatesStrategy = DuplicatesStrategy.WARN
-    doFirst {
-        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    }
-    with(tasks.jar.get())
+    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    with(tasks.jar.get() as CopySpec)
 }

buildSrc/build.gradle.kts

@@ -1,19 +1,7 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 plugins {
     `kotlin-dsl`
 }
 
-tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
-}
-
-java {
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 repositories {
     mavenCentral()
 }

buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt

@@ -1,10 +1,10 @@
-@file:Suppress("DEPRECATION")
-
+import groovy.util.XmlSlurper
+import groovy.util.slurpersupport.GPathResult
+import org.codehaus.groovy.runtime.ResourceGroovyMethods
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Dependency
-import javax.xml.parsers.DocumentBuilderFactory
 
 class CheckLibVersionsPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -26,15 +26,15 @@ class CheckLibVersionsPlugin : Plugin<Project> {
         val name = dependency.name
         val metaDataUrl = "https://repo1.maven.org/maven2/$path/$name/maven-metadata.xml"
         try {
-            val dbf = DocumentBuilderFactory.newInstance()
-            val db = dbf.newDocumentBuilder()
-            val doc = db.parse(metaDataUrl);
-            val newest = doc.getElementsByTagName("latest").item(0).textContent
+            val url = ResourceGroovyMethods.toURL(metaDataUrl)
+            val metaDataText = ResourceGroovyMethods.getText(url)
+            val metadata = XmlSlurper().parseText(metaDataText)
+            val newest = (metadata.getProperty("versioning") as GPathResult).getProperty("latest")
             if (version != newest.toString()) {
                 println("UPGRADE {\"group\": \"$group\", \"name\": \"$name\", \"current\": \"$version\", \"latest\": \"$newest\"}")
             }
         } catch (e: Throwable) {
-            logger.debug("Unable to download or parse {}: {}", metaDataUrl, e.message)
+            logger.debug("Unable to download or parse $metaDataUrl: $e.message")
         }
     }
 }

buildSrc/src/main/kotlin/ExcludeFileFromJar.kt

@@ -1,53 +0,0 @@
-import org.gradle.api.artifacts.transform.*
-import org.gradle.api.file.FileSystemLocation
-import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-@CacheableTransform
-abstract class JarFileExcluder : TransformAction<JarFileExcluder.Parameters> {
-    interface Parameters : TransformParameters {
-        @get:Input
-        var excludeFilesByArtifact: Map<String, Set<String>>
-    }
-
-    @get:PathSensitive(PathSensitivity.NAME_ONLY)
-    @get:InputArtifact
-    abstract val inputArtifact: Provider<FileSystemLocation>
-
-    override
-    fun transform(outputs: TransformOutputs) {
-        val fileName = inputArtifact.get().asFile.name
-        for (entry in parameters.excludeFilesByArtifact) {
-            if (fileName.startsWith(entry.key)) {
-                val nameWithoutExtension = fileName.substring(0, fileName.lastIndexOf("."))
-                excludeFiles(inputArtifact.get().asFile, entry.value, outputs.file("${nameWithoutExtension}.jar"))
-                return
-            }
-        }
-        outputs.file(inputArtifact)
-    }
-
-    private fun excludeFiles(artifact: File, excludeFiles: Set<String>, jarFile: File) {
-        ZipInputStream(FileInputStream(artifact)).use { input ->
-            ZipOutputStream(FileOutputStream(jarFile)).use { output ->
-                var entry = input.nextEntry
-                while (entry != null) {
-                    if (!excludeFiles.contains(entry.name)) {
-                        output.putNextEntry(entry)
-                        input.copyTo(output)
-                        output.closeEntry()
-                    }
-
-                    entry = input.nextEntry
-                }
-            }
-        }
-    }
-}

client/.gitignore

@@ -1 +0,0 @@
-/target/

client/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "signal-cli-client"
-version = "0.0.1"
-edition = "2024"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = "1"
-clap = { version = "4", features = ["cargo", "derive", "wrap_help"] }
-serde = "1"
-serde_json = "1"
-tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
-jsonrpsee = { version = "0.25", features = [
-    "macros",
-    "async-client",
-    "http-client",
-] }
-bytes = "1"
-tokio-util = "0.7"
-futures-util = "0.3"
-thiserror = "2"

client/src/cli.rs

@@ -1,470 +0,0 @@
-use std::{ffi::OsString, net::SocketAddr};
-
-use clap::{crate_version, Parser, Subcommand, ValueEnum};
-
-/// JSON-RPC client for signal-cli
-#[derive(Parser, Debug)]
-#[command(rename_all = "kebab-case", version = crate_version!())]
-pub struct Cli {
-    /// Account to use (for daemon in multi-account mode)
-    #[arg(short = 'a', long)]
-    pub account: Option<String>,
-
-    /// TCP host and port of signal-cli daemon
-    #[arg(long, conflicts_with = "json_rpc_http")]
-    pub json_rpc_tcp: Option<Option<SocketAddr>>,
-
-    /// UNIX socket address and port of signal-cli daemon
-    #[cfg(unix)]
-    #[arg(long, conflicts_with = "json_rpc_tcp")]
-    pub json_rpc_socket: Option<Option<OsString>>,
-
-    /// HTTP URL of signal-cli daemon
-    #[arg(long, conflicts_with = "json_rpc_socket")]
-    pub json_rpc_http: Option<Option<String>>,
-
-    #[arg(long)]
-    pub verbose: bool,
-
-    #[command(subcommand)]
-    pub command: CliCommands,
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Subcommand, Debug)]
-#[command(rename_all = "camelCase", version = crate_version!())]
-pub enum CliCommands {
-    AddDevice {
-        #[arg(long)]
-        uri: String,
-    },
-    AddStickerPack {
-        #[arg(long)]
-        uri: String,
-    },
-    #[command(rename_all = "kebab-case")]
-    Block {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long)]
-        group_id: Vec<String>,
-    },
-    DeleteLocalAccountData {
-        #[arg(long = "ignore-registered")]
-        ignore_registered: Option<bool>,
-    },
-    FinishChangeNumber {
-        number: String,
-        #[arg(short = 'v', long = "verification-code")]
-        verification_code: String,
-
-        #[arg(short = 'p', long)]
-        pin: Option<String>,
-    },
-    GetAttachment {
-        #[arg(long)]
-        id: String,
-        #[arg(long)]
-        recipient: Option<String>,
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Option<String>,
-    },
-    GetAvatar {
-        #[arg(long)]
-        contact: Option<String>,
-        #[arg(long)]
-        profile: Option<String>,
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Option<String>,
-    },
-    GetSticker {
-        #[arg(long = "pack-id")]
-        pack_id: String,
-        #[arg(long = "sticker-id")]
-        sticker_id: u32,
-    },
-    GetUserStatus {
-        recipient: Vec<String>,
-        #[arg(long)]
-        username: Vec<String>,
-    },
-    JoinGroup {
-        #[arg(long)]
-        uri: String,
-    },
-    Link {
-        #[arg(short = 'n', long)]
-        name: String,
-    },
-    ListAccounts,
-    ListContacts {
-        recipient: Vec<String>,
-        #[arg(short = 'a', long = "all-recipients")]
-        all_recipients: bool,
-        #[arg(long)]
-        blocked: Option<bool>,
-        #[arg(long)]
-        name: Option<String>,
-    },
-    ListDevices,
-    ListGroups {
-        #[arg(short = 'd', long)]
-        detailed: bool,
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Vec<String>,
-    },
-    ListIdentities {
-        #[arg(short = 'n', long)]
-        number: Option<String>,
-    },
-    ListStickerPacks,
-    QuitGroup {
-        #[arg(short = 'g', long = "group-id")]
-        group_id: String,
-        #[arg(long)]
-        delete: bool,
-        #[arg(long)]
-        admin: Vec<String>,
-    },
-    Receive {
-        #[arg(short = 't', long, default_value_t = 3.0)]
-        timeout: f64,
-    },
-    Register {
-        #[arg(short = 'v', long)]
-        voice: bool,
-        #[arg(long)]
-        captcha: Option<String>,
-    },
-    RemoveContact {
-        recipient: String,
-        #[arg(long)]
-        forget: bool,
-        #[arg(long)]
-        hide: bool,
-    },
-    RemoveDevice {
-        #[arg(short = 'd', long = "device-id")]
-        device_id: u32,
-    },
-    RemovePin,
-    RemoteDelete {
-        #[arg(short = 't', long = "target-timestamp")]
-        target_timestamp: u64,
-
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Vec<String>,
-
-        #[arg(long = "note-to-self")]
-        note_to_self: bool,
-    },
-    #[command(rename_all = "kebab-case")]
-    Send {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long)]
-        group_id: Vec<String>,
-
-        #[arg(long)]
-        note_to_self: bool,
-
-        #[arg(short = 'e', long)]
-        end_session: bool,
-
-        #[arg(short = 'm', long)]
-        message: Option<String>,
-
-        #[arg(short = 'a', long)]
-        attachment: Vec<String>,
-
-        #[arg(long)]
-        view_once: bool,
-
-        #[arg(long)]
-        mention: Vec<String>,
-
-        #[arg(long)]
-        text_style: Vec<String>,
-
-        #[arg(long)]
-        quote_timestamp: Option<u64>,
-
-        #[arg(long)]
-        quote_author: Option<String>,
-
-        #[arg(long)]
-        quote_message: Option<String>,
-
-        #[arg(long)]
-        quote_mention: Vec<String>,
-
-        #[arg(long)]
-        quote_text_style: Vec<String>,
-
-        #[arg(long)]
-        quote_attachment: Vec<String>,
-
-        #[arg(long)]
-        preview_url: Option<String>,
-
-        #[arg(long)]
-        preview_title: Option<String>,
-
-        #[arg(long)]
-        preview_description: Option<String>,
-
-        #[arg(long)]
-        preview_image: Option<String>,
-
-        #[arg(long)]
-        sticker: Option<String>,
-
-        #[arg(long)]
-        story_timestamp: Option<u64>,
-
-        #[arg(long)]
-        story_author: Option<String>,
-
-        #[arg(long)]
-        edit_timestamp: Option<u64>,
-    },
-    SendContacts,
-    SendPaymentNotification {
-        recipient: String,
-
-        #[arg(long)]
-        receipt: String,
-
-        #[arg(long)]
-        note: String,
-    },
-    SendReaction {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Vec<String>,
-
-        #[arg(long = "note-to-self")]
-        note_to_self: bool,
-
-        #[arg(short = 'e', long)]
-        emoji: String,
-
-        #[arg(short = 'a', long = "target-author")]
-        target_author: String,
-
-        #[arg(short = 't', long = "target-timestamp")]
-        target_timestamp: u64,
-
-        #[arg(short = 'r', long)]
-        remove: bool,
-
-        #[arg(long)]
-        story: bool,
-    },
-    SendReceipt {
-        recipient: String,
-
-        #[arg(short = 't', long = "target-timestamp")]
-        target_timestamp: Vec<u64>,
-
-        #[arg(value_enum, long)]
-        r#type: ReceiptType,
-    },
-    SendSyncRequest,
-    SendTyping {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Vec<String>,
-
-        #[arg(short = 's', long)]
-        stop: bool,
-    },
-    SendMessageRequestResponse {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Vec<String>,
-
-        r#type: MessageRequestResponseType,
-    },
-    SetPin {
-        pin: String,
-    },
-    StartChangeNumber {
-        number: String,
-        #[arg(short = 'v', long)]
-        voice: bool,
-        #[arg(long)]
-        captcha: Option<String>,
-    },
-    SubmitRateLimitChallenge {
-        challenge: String,
-        captcha: String,
-    },
-    Trust {
-        recipient: String,
-
-        #[arg(short = 'a', long = "trust-all-known-keys")]
-        trust_all_known_keys: bool,
-
-        #[arg(short = 'v', long = "verified-safety-number")]
-        verified_safety_number: Option<String>,
-    },
-    #[command(rename_all = "kebab-case")]
-    Unblock {
-        recipient: Vec<String>,
-
-        #[arg(short = 'g', long)]
-        group_id: Vec<String>,
-    },
-    Unregister {
-        #[arg(long = "delete-account")]
-        delete_account: bool,
-    },
-    UpdateAccount {
-        #[arg(short = 'n', long = "device-name")]
-        device_name: Option<String>,
-        #[arg(long = "unrestricted-unidentified-sender")]
-        unrestricted_unidentified_sender: Option<bool>,
-        #[arg(long = "discoverable-by-number")]
-        discoverable_by_number: Option<bool>,
-        #[arg(long = "number-sharing")]
-        number_sharing: Option<bool>,
-    },
-    UpdateConfiguration {
-        #[arg(long = "read-receipts")]
-        read_receipts: Option<bool>,
-
-        #[arg(long = "unidentified-delivery-indicators")]
-        unidentified_delivery_indicators: Option<bool>,
-
-        #[arg(long = "typing-indicators")]
-        typing_indicators: Option<bool>,
-
-        #[arg(long = "link-previews")]
-        link_previews: Option<bool>,
-    },
-    UpdateContact {
-        recipient: String,
-
-        #[arg(short = 'e', long)]
-        expiration: Option<u32>,
-
-        #[arg(short = 'n', long)]
-        name: Option<String>,
-    },
-    UpdateGroup {
-        #[arg(short = 'g', long = "group-id")]
-        group_id: Option<String>,
-
-        #[arg(short = 'n', long)]
-        name: Option<String>,
-
-        #[arg(short = 'd', long)]
-        description: Option<String>,
-
-        #[arg(short = 'a', long)]
-        avatar: Option<String>,
-
-        #[arg(short = 'm', long)]
-        member: Vec<String>,
-
-        #[arg(short = 'r', long = "remove-member")]
-        remove_member: Vec<String>,
-
-        #[arg(long)]
-        admin: Vec<String>,
-
-        #[arg(long = "remove-admin")]
-        remove_admin: Vec<String>,
-
-        #[arg(long)]
-        ban: Vec<String>,
-
-        #[arg(long)]
-        unban: Vec<String>,
-
-        #[arg(long = "reset-link")]
-        reset_link: bool,
-
-        #[arg(value_enum, long)]
-        link: Option<LinkState>,
-
-        #[arg(value_enum, long = "set-permission-add-member")]
-        set_permission_add_member: Option<GroupPermission>,
-
-        #[arg(value_enum, long = "set-permission-edit-details")]
-        set_permission_edit_details: Option<GroupPermission>,
-
-        #[arg(value_enum, long = "set-permission-send-messages")]
-        set_permission_send_messages: Option<GroupPermission>,
-
-        #[arg(short = 'e', long)]
-        expiration: Option<u32>,
-    },
-    UpdateProfile {
-        #[arg(long = "given-name")]
-        given_name: Option<String>,
-
-        #[arg(long = "family-name")]
-        family_name: Option<String>,
-
-        #[arg(long)]
-        about: Option<String>,
-
-        #[arg(long = "about-emoji")]
-        about_emoji: Option<String>,
-
-        #[arg(long = "mobile-coin-address", visible_alias = "mobilecoin-address")]
-        mobile_coin_address: Option<String>,
-
-        #[arg(long)]
-        avatar: Option<String>,
-
-        #[arg(long = "remove-avatar")]
-        remove_avatar: bool,
-    },
-    UploadStickerPack {
-        path: String,
-    },
-    Verify {
-        verification_code: String,
-
-        #[arg(short = 'p', long)]
-        pin: Option<String>,
-    },
-    Version,
-}
-
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum ReceiptType {
-    Read,
-    Viewed,
-}
-
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum LinkState {
-    Enabled,
-    EnabledWithApproval,
-    Disabled,
-}
-
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum GroupPermission {
-    EveryMember,
-    OnlyAdmins,
-}
-
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum MessageRequestResponseType {
-    Accept,
-    Delete,
-}

client/src/jsonrpc.rs

@@ -1,425 +0,0 @@
-use std::path::Path;
-
-use jsonrpsee::async_client::ClientBuilder;
-use jsonrpsee::core::client::{Error, SubscriptionClientT};
-use jsonrpsee::http_client::HttpClientBuilder;
-use jsonrpsee::proc_macros::rpc;
-use serde::Deserialize;
-use serde_json::Value;
-use tokio::net::ToSocketAddrs;
-
-#[rpc(client)]
-pub trait Rpc {
-    #[method(name = "addDevice", param_kind = map)]
-    async fn add_device(
-        &self,
-        account: Option<String>,
-        uri: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "addStickerPack", param_kind = map)]
-    async fn add_sticker_pack(
-        &self,
-        account: Option<String>,
-        uri: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "block", param_kind = map)]
-    fn block(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "deleteLocalAccountData", param_kind = map)]
-    fn delete_local_account_data(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] ignoreRegistered: Option<bool>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "getAttachment", param_kind = map)]
-    fn get_attachment(
-        &self,
-        account: Option<String>,
-        id: String,
-        recipient: Option<String>,
-        #[allow(non_snake_case)] groupId: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "getAvatar", param_kind = map)]
-    fn get_avatar(
-        &self,
-        account: Option<String>,
-        contact: Option<String>,
-        profile: Option<String>,
-        #[allow(non_snake_case)] groupId: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "getSticker", param_kind = map)]
-    fn get_sticker(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] packId: String,
-        #[allow(non_snake_case)] stickerId: u32,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "getUserStatus", param_kind = map)]
-    fn get_user_status(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        usernames: Vec<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "joinGroup", param_kind = map)]
-    fn join_group(&self, account: Option<String>, uri: String) -> Result<Value, ErrorObjectOwned>;
-
-    #[allow(non_snake_case)]
-    #[method(name = "finishChangeNumber", param_kind = map)]
-    fn finish_change_number(
-        &self,
-        account: Option<String>,
-        number: String,
-        verificationCode: String,
-        pin: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "finishLink", param_kind = map)]
-    fn finish_link(
-        &self,
-        #[allow(non_snake_case)] deviceLinkUri: String,
-        #[allow(non_snake_case)] deviceName: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listAccounts", param_kind = map)]
-    fn list_accounts(&self) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listContacts", param_kind = map)]
-    fn list_contacts(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] allRecipients: bool,
-        blocked: Option<bool>,
-        name: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listDevices", param_kind = map)]
-    fn list_devices(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listGroups", param_kind = map)]
-    fn list_groups(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listIdentities", param_kind = map)]
-    fn list_identities(
-        &self,
-        account: Option<String>,
-        number: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "listStickerPacks", param_kind = map)]
-    fn list_sticker_packs(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "quitGroup", param_kind = map)]
-    fn quit_group(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] groupId: String,
-        delete: bool,
-        admins: Vec<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "register", param_kind = map)]
-    fn register(
-        &self,
-        account: Option<String>,
-        voice: bool,
-        captcha: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "removeContact", param_kind = map)]
-    fn remove_contact(
-        &self,
-        account: Option<String>,
-        recipient: String,
-        forget: bool,
-        hide: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "removeDevice", param_kind = map)]
-    fn remove_device(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] deviceId: u32,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "removePin", param_kind = map)]
-    fn remove_pin(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "remoteDelete", param_kind = map)]
-    fn remote_delete(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] targetTimestamp: u64,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        #[allow(non_snake_case)] noteToSelf: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[allow(non_snake_case)]
-    #[method(name = "send", param_kind = map)]
-    fn send(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        groupIds: Vec<String>,
-        noteToSelf: bool,
-        endSession: bool,
-        message: String,
-        attachments: Vec<String>,
-        viewOnce: bool,
-        mentions: Vec<String>,
-        textStyle: Vec<String>,
-        quoteTimestamp: Option<u64>,
-        quoteAuthor: Option<String>,
-        quoteMessage: Option<String>,
-        quoteMention: Vec<String>,
-        quoteTextStyle: Vec<String>,
-        quoteAttachment: Vec<String>,
-        previewUrl: Option<String>,
-        previewTitle: Option<String>,
-        previewDescription: Option<String>,
-        previewImage: Option<String>,
-        sticker: Option<String>,
-        storyTimestamp: Option<u64>,
-        storyAuthor: Option<String>,
-        editTimestamp: Option<u64>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendContacts", param_kind = map)]
-    fn send_contacts(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendPaymentNotification", param_kind = map)]
-    fn send_payment_notification(
-        &self,
-        account: Option<String>,
-        recipient: String,
-        receipt: String,
-        note: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendReaction", param_kind = map)]
-    fn send_reaction(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        #[allow(non_snake_case)] noteToSelf: bool,
-        emoji: String,
-        #[allow(non_snake_case)] targetAuthor: String,
-        #[allow(non_snake_case)] targetTimestamp: u64,
-        remove: bool,
-        story: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendReceipt", param_kind = map)]
-    fn send_receipt(
-        &self,
-        account: Option<String>,
-        recipient: String,
-        #[allow(non_snake_case)] targetTimestamps: Vec<u64>,
-        r#type: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendSyncRequest", param_kind = map)]
-    fn send_sync_request(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendTyping", param_kind = map)]
-    fn send_typing(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        stop: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "sendMessageRequestResponse", param_kind = map)]
-    fn send_message_request_response(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        r#type: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "setPin", param_kind = map)]
-    fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "submitRateLimitChallenge", param_kind = map)]
-    fn submit_rate_limit_challenge(
-        &self,
-        account: Option<String>,
-        challenge: String,
-        captcha: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "startChangeNumber", param_kind = map)]
-    fn start_change_number(
-        &self,
-        account: Option<String>,
-        number: String,
-        voice: bool,
-        captcha: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "startLink", param_kind = map)]
-    fn start_link(&self, account: Option<String>) -> Result<JsonLink, ErrorObjectOwned>;
-
-    #[method(name = "trust", param_kind = map)]
-    fn trust(
-        &self,
-        account: Option<String>,
-        recipient: String,
-        #[allow(non_snake_case)] trustAllKnownKeys: bool,
-        #[allow(non_snake_case)] verifiedSafetyNumber: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "unblock", param_kind = map)]
-    fn unblock(
-        &self,
-        account: Option<String>,
-        recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "unregister", param_kind = map)]
-    fn unregister(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] deleteAccount: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[allow(non_snake_case)]
-    #[method(name = "updateAccount", param_kind = map)]
-    fn update_account(
-        &self,
-        account: Option<String>,
-        deviceName: Option<String>,
-        unrestrictedUnidentifiedSender: Option<bool>,
-        discoverableByNumber: Option<bool>,
-        numberSharing: Option<bool>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "updateConfiguration", param_kind = map)]
-    fn update_configuration(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] readReceipts: Option<bool>,
-        #[allow(non_snake_case)] unidentifiedDeliveryIndicators: Option<bool>,
-        #[allow(non_snake_case)] typingIndicators: Option<bool>,
-        #[allow(non_snake_case)] linkPreviews: Option<bool>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "updateContact", param_kind = map)]
-    fn update_contact(
-        &self,
-        account: Option<String>,
-        recipient: String,
-        name: Option<String>,
-        expiration: Option<u32>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "updateGroup", param_kind = map)]
-    fn update_group(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] groupId: Option<String>,
-        name: Option<String>,
-        description: Option<String>,
-        avatar: Option<String>,
-        member: Vec<String>,
-        #[allow(non_snake_case)] removeMember: Vec<String>,
-        admin: Vec<String>,
-        #[allow(non_snake_case)] removeAdmin: Vec<String>,
-        ban: Vec<String>,
-        unban: Vec<String>,
-        #[allow(non_snake_case)] resetLink: bool,
-        #[allow(non_snake_case)] link: Option<String>,
-        #[allow(non_snake_case)] setPermissionAddMember: Option<String>,
-        #[allow(non_snake_case)] setPermissionEditDetails: Option<String>,
-        #[allow(non_snake_case)] setPermissionSendMessages: Option<String>,
-        expiration: Option<u32>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "updateProfile", param_kind = map)]
-    fn update_profile(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] givenName: Option<String>,
-        #[allow(non_snake_case)] familyName: Option<String>,
-        about: Option<String>,
-        #[allow(non_snake_case)] aboutEmoji: Option<String>,
-        #[allow(non_snake_case)] mobileCoinAddress: Option<String>,
-        avatar: Option<String>,
-        #[allow(non_snake_case)] removeAvatar: bool,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "uploadStickerPack", param_kind = map)]
-    fn upload_sticker_pack(
-        &self,
-        account: Option<String>,
-        path: String,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[method(name = "verify", param_kind = map)]
-    fn verify(
-        &self,
-        account: Option<String>,
-        #[allow(non_snake_case)] verificationCode: String,
-        pin: Option<String>,
-    ) -> Result<Value, ErrorObjectOwned>;
-
-    #[subscription(
-        name = "subscribeReceive" => "receive",
-        unsubscribe = "unsubscribeReceive",
-        item = Value,
-        param_kind = map
-    )]
-    async fn subscribe_receive(&self, account: Option<String>) -> SubscriptionResult;
-
-    #[method(name = "version")]
-    fn version(&self) -> Result<Value, ErrorObjectOwned>;
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct JsonLink {
-    pub device_link_uri: String,
-}
-
-pub async fn connect_tcp(
-    tcp: impl ToSocketAddrs,
-) -> Result<impl SubscriptionClientT, std::io::Error> {
-    let (sender, receiver) = super::transports::tcp::connect(tcp).await?;
-
-    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
-}
-
-#[cfg(unix)]
-pub async fn connect_unix(
-    socket_path: impl AsRef<Path>,
-) -> Result<impl SubscriptionClientT, std::io::Error> {
-    let (sender, receiver) = super::transports::ipc::connect(socket_path).await?;
-
-    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
-}
-
-pub async fn connect_http(uri: &str) -> Result<impl SubscriptionClientT + use<>, Error> {
-    HttpClientBuilder::default().build(uri)
-}

client/src/main.rs

@@ -1,526 +0,0 @@
-use std::{path::PathBuf, time::Duration};
-
-use clap::Parser;
-use jsonrpsee::core::client::{Error as RpcError, Subscription, SubscriptionClientT};
-use serde_json::{Error, Value};
-use tokio::{select, time::sleep};
-
-use cli::Cli;
-
-use crate::cli::{CliCommands, GroupPermission, LinkState};
-use crate::jsonrpc::RpcClient;
-
-mod cli;
-#[allow(non_snake_case, clippy::too_many_arguments)]
-mod jsonrpc;
-mod transports;
-
-const DEFAULT_TCP: &str = "127.0.0.1:7583";
-const DEFAULT_SOCKET_SUFFIX: &str = "signal-cli/socket";
-const DEFAULT_HTTP: &str = "http://localhost:8080/api/v1/rpc";
-
-#[tokio::main]
-async fn main() -> Result<(), anyhow::Error> {
-    let cli = cli::Cli::parse();
-
-    let result = connect(cli).await;
-
-    match result {
-        Ok(Value::Null) => {}
-        Ok(v) => println!("{v}"),
-        Err(e) => return Err(anyhow::anyhow!("JSON-RPC command failed: {e:?}")),
-    }
-    Ok(())
-}
-
-async fn handle_command(
-    cli: Cli,
-    client: impl SubscriptionClientT + Sync,
-) -> Result<Value, RpcError> {
-    match cli.command {
-        CliCommands::Receive { timeout } => {
-            let mut stream = client.subscribe_receive(cli.account).await?;
-
-            {
-                while let Some(v) = stream_next(timeout, &mut stream).await {
-                    let v = v?;
-                    println!("{v}");
-                }
-            }
-            stream.unsubscribe().await?;
-            Ok(Value::Null)
-        }
-        CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
-        CliCommands::Block {
-            recipient,
-            group_id,
-        } => client.block(cli.account, recipient, group_id).await,
-        CliCommands::DeleteLocalAccountData { ignore_registered } => {
-            client
-                .delete_local_account_data(cli.account, ignore_registered)
-                .await
-        }
-        CliCommands::GetUserStatus {
-            recipient,
-            username,
-        } => {
-            client
-                .get_user_status(cli.account, recipient, username)
-                .await
-        }
-        CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
-        CliCommands::Link { name } => {
-            let url = client
-                .start_link(cli.account)
-                .await
-                .map_err(|e| RpcError::Custom(format!("JSON-RPC command startLink failed: {e:?}")))?
-                .device_link_uri;
-            println!("{url}");
-            client.finish_link(url, name).await
-        }
-        CliCommands::ListAccounts => client.list_accounts().await,
-        CliCommands::ListContacts {
-            recipient,
-            all_recipients,
-            blocked,
-            name,
-        } => {
-            client
-                .list_contacts(cli.account, recipient, all_recipients, blocked, name)
-                .await
-        }
-        CliCommands::ListDevices => client.list_devices(cli.account).await,
-        CliCommands::ListGroups {
-            detailed: _,
-            group_id,
-        } => client.list_groups(cli.account, group_id).await,
-        CliCommands::ListIdentities { number } => client.list_identities(cli.account, number).await,
-        CliCommands::ListStickerPacks => client.list_sticker_packs(cli.account).await,
-        CliCommands::QuitGroup {
-            group_id,
-            delete,
-            admin,
-        } => {
-            client
-                .quit_group(cli.account, group_id, delete, admin)
-                .await
-        }
-        CliCommands::Register { voice, captcha } => {
-            client.register(cli.account, voice, captcha).await
-        }
-        CliCommands::RemoveContact {
-            recipient,
-            forget,
-            hide,
-        } => {
-            client
-                .remove_contact(cli.account, recipient, forget, hide)
-                .await
-        }
-        CliCommands::RemoveDevice { device_id } => {
-            client.remove_device(cli.account, device_id).await
-        }
-        CliCommands::RemovePin => client.remove_pin(cli.account).await,
-        CliCommands::RemoteDelete {
-            target_timestamp,
-            recipient,
-            group_id,
-            note_to_self,
-        } => {
-            client
-                .remote_delete(
-                    cli.account,
-                    target_timestamp,
-                    recipient,
-                    group_id,
-                    note_to_self,
-                )
-                .await
-        }
-        CliCommands::Send {
-            recipient,
-            group_id,
-            note_to_self,
-            end_session,
-            message,
-            attachment,
-            view_once,
-            mention,
-            text_style,
-            quote_timestamp,
-            quote_author,
-            quote_message,
-            quote_mention,
-            quote_text_style,
-            quote_attachment,
-            preview_url,
-            preview_title,
-            preview_description,
-            preview_image,
-            sticker,
-            story_timestamp,
-            story_author,
-            edit_timestamp,
-        } => {
-            client
-                .send(
-                    cli.account,
-                    recipient,
-                    group_id,
-                    note_to_self,
-                    end_session,
-                    message.unwrap_or_default(),
-                    attachment,
-                    view_once,
-                    mention,
-                    text_style,
-                    quote_timestamp,
-                    quote_author,
-                    quote_message,
-                    quote_mention,
-                    quote_text_style,
-                    quote_attachment,
-                    preview_url,
-                    preview_title,
-                    preview_description,
-                    preview_image,
-                    sticker,
-                    story_timestamp,
-                    story_author,
-                    edit_timestamp,
-                )
-                .await
-        }
-        CliCommands::SendContacts => client.send_contacts(cli.account).await,
-        CliCommands::SendPaymentNotification {
-            recipient,
-            receipt,
-            note,
-        } => {
-            client
-                .send_payment_notification(cli.account, recipient, receipt, note)
-                .await
-        }
-        CliCommands::SendReaction {
-            recipient,
-            group_id,
-            note_to_self,
-            emoji,
-            target_author,
-            target_timestamp,
-            remove,
-            story,
-        } => {
-            client
-                .send_reaction(
-                    cli.account,
-                    recipient,
-                    group_id,
-                    note_to_self,
-                    emoji,
-                    target_author,
-                    target_timestamp,
-                    remove,
-                    story,
-                )
-                .await
-        }
-        CliCommands::SendReceipt {
-            recipient,
-            target_timestamp,
-            r#type,
-        } => {
-            client
-                .send_receipt(
-                    cli.account,
-                    recipient,
-                    target_timestamp,
-                    match r#type {
-                        cli::ReceiptType::Read => "read".to_owned(),
-                        cli::ReceiptType::Viewed => "viewed".to_owned(),
-                    },
-                )
-                .await
-        }
-        CliCommands::SendSyncRequest => client.send_sync_request(cli.account).await,
-        CliCommands::SendTyping {
-            recipient,
-            group_id,
-            stop,
-        } => {
-            client
-                .send_typing(cli.account, recipient, group_id, stop)
-                .await
-        }
-        CliCommands::SetPin { pin } => client.set_pin(cli.account, pin).await,
-        CliCommands::SubmitRateLimitChallenge { challenge, captcha } => {
-            client
-                .submit_rate_limit_challenge(cli.account, challenge, captcha)
-                .await
-        }
-        CliCommands::Trust {
-            recipient,
-            trust_all_known_keys,
-            verified_safety_number,
-        } => {
-            client
-                .trust(
-                    cli.account,
-                    recipient,
-                    trust_all_known_keys,
-                    verified_safety_number,
-                )
-                .await
-        }
-        CliCommands::Unblock {
-            recipient,
-            group_id,
-        } => client.unblock(cli.account, recipient, group_id).await,
-        CliCommands::Unregister { delete_account } => {
-            client.unregister(cli.account, delete_account).await
-        }
-        CliCommands::UpdateAccount {
-            device_name,
-            unrestricted_unidentified_sender,
-            discoverable_by_number,
-            number_sharing,
-        } => {
-            client
-                .update_account(
-                    cli.account,
-                    device_name,
-                    unrestricted_unidentified_sender,
-                    discoverable_by_number,
-                    number_sharing,
-                )
-                .await
-        }
-        CliCommands::UpdateConfiguration {
-            read_receipts,
-            unidentified_delivery_indicators,
-            typing_indicators,
-            link_previews,
-        } => {
-            client
-                .update_configuration(
-                    cli.account,
-                    read_receipts,
-                    unidentified_delivery_indicators,
-                    typing_indicators,
-                    link_previews,
-                )
-                .await
-        }
-        CliCommands::UpdateContact {
-            recipient,
-            expiration,
-            name,
-        } => {
-            client
-                .update_contact(cli.account, recipient, name, expiration)
-                .await
-        }
-        CliCommands::UpdateGroup {
-            group_id,
-            name,
-            description,
-            avatar,
-            member,
-            remove_member,
-            admin,
-            remove_admin,
-            ban,
-            unban,
-            reset_link,
-            link,
-            set_permission_add_member,
-            set_permission_edit_details,
-            set_permission_send_messages,
-            expiration,
-        } => {
-            client
-                .update_group(
-                    cli.account,
-                    group_id,
-                    name,
-                    description,
-                    avatar,
-                    member,
-                    remove_member,
-                    admin,
-                    remove_admin,
-                    ban,
-                    unban,
-                    reset_link,
-                    link.map(|link| match link {
-                        LinkState::Enabled => "enabled".to_owned(),
-                        LinkState::EnabledWithApproval => "enabledWithApproval".to_owned(),
-                        LinkState::Disabled => "disabled".to_owned(),
-                    }),
-                    set_permission_add_member.map(|p| match p {
-                        GroupPermission::EveryMember => "everyMember".to_owned(),
-                        GroupPermission::OnlyAdmins => "onlyAdmins".to_owned(),
-                    }),
-                    set_permission_edit_details.map(|p| match p {
-                        GroupPermission::EveryMember => "everyMember".to_owned(),
-                        GroupPermission::OnlyAdmins => "onlyAdmins".to_owned(),
-                    }),
-                    set_permission_send_messages.map(|p| match p {
-                        GroupPermission::EveryMember => "everyMember".to_owned(),
-                        GroupPermission::OnlyAdmins => "onlyAdmins".to_owned(),
-                    }),
-                    expiration,
-                )
-                .await
-        }
-        CliCommands::UpdateProfile {
-            given_name,
-            family_name,
-            about,
-            about_emoji,
-            mobile_coin_address,
-            avatar,
-            remove_avatar,
-        } => {
-            client
-                .update_profile(
-                    cli.account,
-                    given_name,
-                    family_name,
-                    about,
-                    about_emoji,
-                    mobile_coin_address,
-                    avatar,
-                    remove_avatar,
-                )
-                .await
-        }
-        CliCommands::UploadStickerPack { path } => {
-            client.upload_sticker_pack(cli.account, path).await
-        }
-        CliCommands::Verify {
-            verification_code,
-            pin,
-        } => client.verify(cli.account, verification_code, pin).await,
-        CliCommands::Version => client.version().await,
-        CliCommands::AddStickerPack { uri } => client.add_sticker_pack(cli.account, uri).await,
-        CliCommands::FinishChangeNumber {
-            number,
-            verification_code,
-            pin,
-        } => {
-            client
-                .finish_change_number(cli.account, number, verification_code, pin)
-                .await
-        }
-        CliCommands::GetAttachment {
-            id,
-            recipient,
-            group_id,
-        } => {
-            client
-                .get_attachment(cli.account, id, recipient, group_id)
-                .await
-        }
-        CliCommands::GetAvatar {
-            contact,
-            profile,
-            group_id,
-        } => {
-            client
-                .get_avatar(cli.account, contact, profile, group_id)
-                .await
-        }
-        CliCommands::GetSticker {
-            pack_id,
-            sticker_id,
-        } => client.get_sticker(cli.account, pack_id, sticker_id).await,
-        CliCommands::StartChangeNumber {
-            number,
-            voice,
-            captcha,
-        } => {
-            client
-                .start_change_number(cli.account, number, voice, captcha)
-                .await
-        }
-        CliCommands::SendMessageRequestResponse {
-            recipient,
-            group_id,
-            r#type,
-        } => {
-            client
-                .send_message_request_response(
-                    cli.account,
-                    recipient,
-                    group_id,
-                    match r#type {
-                        cli::MessageRequestResponseType::Accept => "accept".to_owned(),
-                        cli::MessageRequestResponseType::Delete => "delete".to_owned(),
-                    },
-                )
-                .await
-        }
-    }
-}
-
-async fn connect(cli: Cli) -> Result<Value, RpcError> {
-    if let Some(http) = &cli.json_rpc_http {
-        let uri = if let Some(uri) = http {
-            uri
-        } else {
-            DEFAULT_HTTP
-        };
-        let client = jsonrpc::connect_http(uri)
-            .await
-            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
-
-        handle_command(cli, client).await
-    } else if let Some(tcp) = cli.json_rpc_tcp {
-        let socket_addr = tcp.unwrap_or_else(|| DEFAULT_TCP.parse().unwrap());
-        let client = jsonrpc::connect_tcp(socket_addr)
-            .await
-            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
-
-        handle_command(cli, client).await
-    } else {
-        #[cfg(windows)]
-        {
-            Err(RpcError::Custom("Invalid socket".into()))
-        }
-        #[cfg(unix)]
-        {
-            let socket_path = cli
-                .json_rpc_socket
-                .clone()
-                .unwrap_or(None)
-                .or_else(|| {
-                    std::env::var_os("XDG_RUNTIME_DIR").map(|runtime_dir| {
-                        PathBuf::from(runtime_dir)
-                            .join(DEFAULT_SOCKET_SUFFIX)
-                            .into()
-                    })
-                })
-                .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
-            let client = jsonrpc::connect_unix(socket_path)
-                .await
-                .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
-
-            handle_command(cli, client).await
-        }
-    }
-}
-
-async fn stream_next(
-    timeout: f64,
-    stream: &mut Subscription<Value>,
-) -> Option<Result<Value, Error>> {
-    if timeout < 0.0 {
-        stream.next().await
-    } else {
-        select! {
-            v = stream.next() => v,
-            _= sleep(Duration::from_millis((timeout * 1000.0) as u64)) => None,
-        }
-    }
-}

client/src/transports/ipc.rs

@@ -1,23 +0,0 @@
-use std::io::Error;
-use std::path::Path;
-
-use futures_util::stream::StreamExt;
-use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
-use tokio::net::UnixStream;
-use tokio_util::codec::Decoder;
-
-use super::stream_codec::StreamCodec;
-use super::{Receiver, Sender};
-
-/// Connect to a JSON-RPC Unix Socket server.
-pub async fn connect(
-    socket: impl AsRef<Path>,
-) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
-    let connection = UnixStream::connect(socket).await?;
-    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
-
-    let sender = Sender { inner: sink };
-    let receiver = Receiver { inner: stream };
-
-    Ok((sender, receiver))
-}

client/src/transports/mod.rs

@@ -1,60 +0,0 @@
-use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
-use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
-use thiserror::Error;
-
-#[cfg(unix)]
-pub mod ipc;
-mod stream_codec;
-pub mod tcp;
-
-#[derive(Debug, Error)]
-enum Errors {
-    #[error("Other: {0}")]
-    Other(String),
-    #[error("Closed")]
-    Closed,
-}
-
-struct Sender<T: Send + Sink<String>> {
-    inner: T,
-}
-
-impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> TransportSenderT
-    for Sender<T>
-{
-    type Error = Errors;
-
-    async fn send(&mut self, body: String) -> Result<(), Self::Error> {
-        self.inner
-            .send(body)
-            .await
-            .map_err(|e| Errors::Other(format!("{e:?}")))?;
-        Ok(())
-    }
-
-    async fn close(&mut self) -> Result<(), Self::Error> {
-        self.inner
-            .close()
-            .await
-            .map_err(|e| Errors::Other(format!("{e:?}")))?;
-        Ok(())
-    }
-}
-
-struct Receiver<T: Send + Stream> {
-    inner: T,
-}
-
-impl<T: Send + Stream<Item = Result<String, std::io::Error>> + Unpin + 'static> TransportReceiverT
-    for Receiver<T>
-{
-    type Error = Errors;
-
-    async fn receive(&mut self) -> Result<ReceivedMessage, Self::Error> {
-        match self.inner.next().await {
-            None => Err(Errors::Closed),
-            Some(Ok(msg)) => Ok(ReceivedMessage::Text(msg)),
-            Some(Err(e)) => Err(Errors::Other(format!("{e:?}"))),
-        }
-    }
-}

client/src/transports/stream_codec.rs

@@ -1,61 +0,0 @@
-use bytes::BytesMut;
-use std::{io, str};
-use tokio_util::codec::{Decoder, Encoder};
-
-type Separator = u8;
-
-/// Stream codec for streaming protocols (ipc, tcp)
-#[derive(Debug, Default)]
-pub struct StreamCodec {
-    incoming_separator: Separator,
-    outgoing_separator: Separator,
-}
-
-impl StreamCodec {
-    /// Default codec with streaming input data. Input can be both enveloped and not.
-    pub fn stream_incoming() -> Self {
-        StreamCodec::new(b'\n', b'\n')
-    }
-
-    /// New custom stream codec
-    pub fn new(incoming_separator: Separator, outgoing_separator: Separator) -> Self {
-        StreamCodec {
-            incoming_separator,
-            outgoing_separator,
-        }
-    }
-}
-
-impl Decoder for StreamCodec {
-    type Item = String;
-    type Error = io::Error;
-
-    fn decode(&mut self, buf: &mut BytesMut) -> io::Result<Option<Self::Item>> {
-        if let Some(i) = buf
-            .as_ref()
-            .iter()
-            .position(|&b| b == self.incoming_separator)
-        {
-            let line = buf.split_to(i);
-            let _ = buf.split_to(1);
-
-            match str::from_utf8(line.as_ref()) {
-                Ok(s) => Ok(Some(s.to_string())),
-                Err(_) => Err(io::Error::other("invalid UTF-8")),
-            }
-        } else {
-            Ok(None)
-        }
-    }
-}
-
-impl Encoder<String> for StreamCodec {
-    type Error = io::Error;
-
-    fn encode(&mut self, msg: String, buf: &mut BytesMut) -> io::Result<()> {
-        let mut payload = msg.into_bytes();
-        payload.push(self.outgoing_separator);
-        buf.extend_from_slice(&payload);
-        Ok(())
-    }
-}

client/src/transports/tcp.rs

@@ -1,22 +0,0 @@
-use std::io::Error;
-
-use futures_util::stream::StreamExt;
-use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
-use tokio::net::{TcpStream, ToSocketAddrs};
-use tokio_util::codec::Decoder;
-
-use super::stream_codec::StreamCodec;
-use super::{Receiver, Sender};
-
-/// Connect to a JSON-RPC TCP server.
-pub async fn connect(
-    socket: impl ToSocketAddrs,
-) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
-    let connection = TcpStream::connect(socket).await?;
-    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
-
-    let sender = Sender { inner: sink };
-    let receiver = Receiver { inner: stream };
-
-    Ok((sender, receiver))
-}

data/org.asamk.SignalCli.metainfo.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="console-application">
-    <id>org.asamk.SignalCli</id>
-
-    <name>signal-cli</name>
-    <summary>Use Signal messenger in terminal</summary>
-    <developer id="org.asamk">
-        <name>AsamK</name>
-    </developer>
-    <icon type="stock">org.asamk.SignalCli</icon>
-    <keywords>
-        <keyword>signal</keyword>
-        <keyword>signal-cli</keyword>
-        <keyword>messenger</keyword>
-        <keyword>messaging</keyword>
-    </keywords>
-
-    <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
-    <url type="homepage">https://github.com/AsamK/signal-cli</url>
-    <url type="donation">https://github.com/sponsors/AsamK</url>
-    <url type="faq">https://github.com/AsamK/signal-cli/discussions</url>
-    <url type="vcs-browser">https://github.com/AsamK/signal-cli</url>
-
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>GPL-3.0-only</project_license>
-
-    <description>
-        <p>
-            signal-cli is an unofficial commandline interface for the Signal Messenger.
-            It supports many Signal functions, including registering, verifying, sending and receiving messages.
-            For registering you need a phone number where you can receive SMS or incoming calls.
-            Alternatively signal-cli can be linked to an existing App account.
-        </p>
-    </description>
-
-    <categories>
-        <category>Utility</category>
-        <category>Java</category>
-    </categories>
-
-    <provides>
-        <binary>signal-cli</binary>
-    </provides>
-    <content_rating type="oars-1.1">
-        <content_attribute id="social-chat">intense</content_attribute>
-    </content_rating>
-    <releases>
-        <release version="0.13.18" date="2025-07-16">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.18</url>
-        </release>
-        <release version="0.13.17" date="2025-06-28">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.17</url>
-        </release>
-        <release version="0.13.16" date="2025-06-07">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.16</url>
-        </release>
-        <release version="0.13.15" date="2025-05-08">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.15</url>
-        </release>
-        <release version="0.13.14" date="2025-04-06">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.14</url>
-        </release>
-        <release version="0.13.13" date="2025-02-28">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.13</url>
-        </release>
-        <release version="0.13.12" date="2025-01-18">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.12</url>
-        </release>
-        <release version="0.13.11" date="2024-12-26">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.11</url>
-        </release>
-        <release version="0.13.10" date="2024-11-30">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.10</url>
-        </release>
-        <release version="0.13.9" date="2024-10-28">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.9</url>
-        </release>
-        <release version="0.13.8" date="2024-10-26">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.8</url>
-        </release>
-        <release version="0.13.7" date="2024-09-28">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.7</url>
-        </release>
-        <release version="0.13.6" date="2024-09-08">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
-        </release>
-        <release version="0.13.5" date="2024-07-25">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
-        </release>
-        <release version="0.13.4" date="2024-06-06">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.4</url>
-        </release>
-        <release version="0.13.3" date="2024-04-19">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
-        </release>
-        <release version="0.13.2" date="2024-03-23">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
-        </release>
-        <release version="0.13.1" date="2024-02-27">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
-        </release>
-        <release version="0.13.0" date="2024-02-18">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.0</url>
-        </release>
-        <release version="0.12.8" date="2024-02-08">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.8</url>
-        </release>
-        <release version="0.12.7" date="2023-12-15">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.7</url>
-        </release>
-    </releases>
-</component>

data/org.asamk.SignalCli.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg">
-<g transform="translate(-32.279 -138.64)">
-<g transform="matrix(.45526 0 0 .45526 33.984 140.17)">
-<path d="m33.468 66.938c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709z" fill="#fff"/>
-<path d="m33.468 67.184c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709zm0-62.938c-16.249 0-29.468 13.22-29.468 29.469s13.219 29.469 29.468 29.469c5.582 0 11.021-1.574 15.729-4.554l0.74-0.468 11.835 3.171-3.243-12.1 0.419-0.72c2.609-4.484 3.988-9.602 3.988-14.799 0-16.248-13.219-29.468-29.468-29.468z"/>
-<path d="m25.515 45.296q-2.3937 0-4.2817-0.97772-1.8543-0.97772-2.9332-3.0343-1.0451-2.0566-1.0451-5.2595 0-3.3377 1.1126-5.428 1.1126-2.0903 3.0006-3.068 1.9217-0.97772 4.3492-0.97772 1.3823 0 2.6634 0.30343 1.2812 0.26972 2.0903 0.67429l-0.91029 2.4612q-0.80915-0.30343-1.888-0.57315t-2.0229-0.26972q-5.3269 0-5.3269 6.844 0 3.2703 1.2812 5.0235 1.3149 1.7194 3.8772 1.7194 1.4834 0 2.596-0.30343 1.1463-0.30343 2.0903-0.74172v2.6297q-0.91029 0.472-2.0229 0.708-1.0789 0.26972-2.6297 0.26972zm11.901-0.33714h-2.9669v-25.623h2.9669zm7.2486-24.848q0.67429 0 1.18 0.472 0.53943 0.43829 0.53943 1.416 0 0.94401-0.53943 1.416-0.50572 0.472-1.18 0.472-0.74172 0-1.2474-0.472-0.50572-0.472-0.50572-1.416 0-0.97772 0.50572-1.416 0.50572-0.472 1.2474-0.472zm1.4497 6.7766v18.071h-2.9669v-18.071z" aria-label="cli"/>
-</g>
-</g>
-</svg>

data/signal-cli-socket.service

@@ -5,41 +5,15 @@ After=network-online.target
 Requires=signal-cli-socket.socket
 
 [Service]
-CapabilityBoundingSet=
+Type=simple
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-# Update 'ReadWritePaths' if you change the config path here
 ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon
-LockPersonality=true
-NoNewPrivileges=true
-PrivateDevices=true
-PrivateIPC=true
-PrivateTmp=true
-PrivateUsers=true
-ProcSubset=pid
-ProtectClock=true
-ProtectControlGroups=true
-ProtectHome=true
-ProtectHostname=true
-ProtectKernelLogs=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectProc=invisible
-ProtectSystem=strict
-# Profile pictures and attachments to upload must be located here for the service to access them
-ReadWritePaths=/var/lib/signal-cli
-RemoveIPC=true
-RestrictAddressFamilies=AF_INET AF_INET6
-RestrictNamespaces=true
-RestrictRealtime=true
-RestrictSUIDSGID=true
+User=signal-cli
+# JVM always exits with 143 in reaction to SIGTERM signal
+SuccessExitStatus=143
 StandardInput=socket
 StandardOutput=journal
 StandardError=journal
-SystemCallArchitectures=native
-SystemCallFilter=~@debug @mount @obsolete @privileged @resources
-UMask=0077
-# Create the user and home directory with 'useradd -r -U -s /usr/sbin/nologin -m -b /var/lib signal-cli'
-User=signal-cli
 
 [Install]
 Also=signal-cli-socket.socket

data/signal-cli-socket.socket

@@ -3,11 +3,6 @@ Description=Send secure messages to Signal clients
 
 [Socket]
 ListenStream=%t/signal-cli/socket
-SocketUser=root
-# Add yourself to the signal-cli group to talk with the service
-# Run 'usermod -aG signal-cli yourusername'
-SocketGroup=signal-cli
-SocketMode=0660
 
 [Install]
 WantedBy=sockets.target

data/signal-cli.service

@@ -8,9 +8,11 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --dbus-system
+ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --system
 User=signal-cli
 BusName=org.asamk.Signal
+# JVM always exits with 143 in reaction to SIGTERM signal
+SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service

data/signal-cli.sysusers.conf

@@ -1 +0,0 @@
-u signal-cli - "Signal messaging service" /var/lib/signal-cli

data/signal-cli.tmpfiles.conf

@@ -1,5 +0,0 @@
-d /var/lib/signal-cli             0755 signal-cli signal-cli -
-d /var/lib/signal-cli/data        0700 signal-cli signal-cli -
-d /var/lib/signal-cli/attachments 0750 signal-cli signal-cli -
-d /var/lib/signal-cli/avatars     0750 signal-cli signal-cli -
-d /var/lib/signal-cli/stickers    0750 signal-cli signal-cli -

data/signal-cli@.service

@@ -8,9 +8,11 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --dbus-system
+ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --system
 User=signal-cli
 BusName=org.asamk.Signal
+# JVM always exits with 143 in reaction to SIGTERM signal
+SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service

graalvm-config-dir/jni-config.json

@@ -1,312 +1,168 @@
 [
-{
-  "name":"[B"
-},
-{
-  "name":"[Z"
-},
-{
-  "name":"[[B"
-},
 {
   "name":"com.sun.security.auth.module.UnixSystem",
-  "fields":[{"name":"gid"}, {"name":"groups"}, {"name":"uid"}, {"name":"username"}]
-},
+  "fields":[
+    {"name":"gid"}, 
+    {"name":"groups"}, 
+    {"name":"uid"}, 
+    {"name":"username"}
+  ]}
+,
 {
   "name":"java.lang.Boolean",
-  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.Class",
-  "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }]
-},
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]}
+,
 {
   "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }, {"name":"loadClass","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.ClassNotFoundException"
-},
-{
-  "name":"java.lang.Enum",
-  "methods":[{"name":"ordinal","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.IllegalArgumentException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
+  "methods":[
+    {"name":"getPlatformClassLoader","parameterTypes":[] }, 
+    {"name":"loadClass","parameterTypes":["java.lang.String"] }
+  ]}
+,
 {
   "name":"java.lang.IllegalStateException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
+,
 {
-  "name":"java.lang.Long",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"java.lang.NoClassDefFoundError"
-},
-{
-  "name":"java.lang.NoSuchMethodError"
-},
-{
-  "name":"java.lang.String"
-},
-{
-  "name":"java.lang.Thread",
-  "methods":[{"name":"currentThread","parameterTypes":[] }, {"name":"getStackTrace","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.Throwable",
-  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"setStackTrace","parameterTypes":["java.lang.StackTraceElement[]"] }, {"name":"toString","parameterTypes":[] }]
-},
+  "name":"java.lang.NoSuchMethodError"}
+,
 {
   "name":"java.lang.UnsatisfiedLinkError",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.util.HashMap",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"java.util.Map",
-  "methods":[{"name":"get","parameterTypes":["java.lang.Object"] }, {"name":"put","parameterTypes":["java.lang.Object","java.lang.Object"] }, {"name":"remove","parameterTypes":["java.lang.Object"] }]
-},
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
+,
 {
   "name":"java.util.UUID",
-  "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
-},
+  "methods":[
+    {"name":"<init>","parameterTypes":["long","long"] }, 
+    {"name":"getLeastSignificantBits","parameterTypes":[] }, 
+    {"name":"getMostSignificantBits","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"jdk.internal.loader.ClassLoaders$AppClassLoader"
-},
-{
-  "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
-},
+  "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"}
+,
 {
   "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
-  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadKyberPreKey","parameterTypes":["int"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"markKyberPreKeyUsed","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
-},
+  "methods":[
+    {"name":"getIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress"] }, 
+    {"name":"getIdentityKeyPair","parameterTypes":[] }, 
+    {"name":"getLocalRegistrationId","parameterTypes":[] }, 
+    {"name":"isTrustedIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.IdentityKey","org.whispersystems.libsignal.state.IdentityKeyStore$Direction"] }, 
+    {"name":"loadPreKey","parameterTypes":["int"] }, 
+    {"name":"loadSenderKey","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","java.util.UUID"] }, 
+    {"name":"loadSession","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress"] }, 
+    {"name":"loadSignedPreKey","parameterTypes":["int"] }, 
+    {"name":"removePreKey","parameterTypes":["int"] }, 
+    {"name":"saveIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.IdentityKey"] }, 
+    {"name":"storeSenderKey","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","java.util.UUID","org.whispersystems.libsignal.groups.state.SenderKeyRecord"] }, 
+    {"name":"storeSession","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.state.SessionRecord"] }
+  ]}
+,
 {
-  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
-  "methods":[{"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }]
-},
+  "name":"org.graalvm.nativebridge.jni.JNIExceptionWrapperEntryPoints",
+  "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]}
+,
 {
-  "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
-  "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
-},
+  "name":"org.whispersystems.libsignal.DuplicateMessageException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
+,
 {
-  "name":"org.signal.libsignal.internal.CompletableFuture",
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }, {"name":"setCancellationId","parameterTypes":["long"] }]
-},
+  "name":"org.whispersystems.libsignal.IdentityKey",
+  "methods":[
+    {"name":"<init>","parameterTypes":["byte[]"] }, 
+    {"name":"serialize","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"org.signal.libsignal.internal.NativeHandleGuard$SimpleOwner",
-  "methods":[{"name":"unsafeNativeHandleWithoutGuard","parameterTypes":[] }]
-},
+  "name":"org.whispersystems.libsignal.IdentityKeyPair",
+  "methods":[{"name":"serialize","parameterTypes":[] }]}
+,
 {
-  "name":"org.signal.libsignal.net.CdsiLookupResponse",
-  "methods":[{"name":"<init>","parameterTypes":["java.util.Map","int"] }]
-},
+  "name":"org.whispersystems.libsignal.InvalidMessageException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
+,
 {
-  "name":"org.signal.libsignal.net.CdsiLookupResponse$Entry",
-  "methods":[{"name":"<init>","parameterTypes":["byte[]","byte[]"] }]
-},
+  "name":"org.whispersystems.libsignal.SignalProtocolAddress",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int"] }]}
+,
 {
-  "name":"org.signal.libsignal.net.ChatService"
-},
+  "name":"org.whispersystems.libsignal.UntrustedIdentityException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
+,
 {
-  "name":"org.signal.libsignal.net.ChatService$DebugInfo"
-},
-{
-  "name":"org.signal.libsignal.net.ChatService$Response"
-},
-{
-  "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
-},
-{
-  "name":"org.signal.libsignal.net.NetworkException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.RetryLaterException",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.DuplicateMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.IdentityKey",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }, {"name":"serialize","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.IdentityKeyPair",
-  "methods":[{"name":"serialize","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidKeyException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidKeyIdException"
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.NoSessionException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.SignalProtocolAddress",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["java.lang.String","int"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.fingerprint.FingerprintParsingException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyRecord",
+  "name":"org.whispersystems.libsignal.groups.state.SenderKeyRecord",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
+  "methods":[
+    {"name":"<init>","parameterTypes":["long"] }, 
+    {"name":"nativeHandle","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyStore"
-},
+  "name":"org.whispersystems.libsignal.groups.state.SenderKeyStore"}
+,
 {
-  "name":"org.signal.libsignal.protocol.logging.Log",
-  "methods":[{"name":"log","parameterTypes":["int","java.lang.String","java.lang.String"] }]
-},
+  "name":"org.whispersystems.libsignal.logging.Log",
+  "methods":[{"name":"log","parameterTypes":["int","java.lang.String","java.lang.String"] }]}
+,
 {
-  "name":"org.signal.libsignal.protocol.message.PlaintextContent",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.message.PreKeySignalMessage",
+  "name":"org.whispersystems.libsignal.protocol.PlaintextContent",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
+  "methods":[{"name":"nativeHandle","parameterTypes":[] }]}
+,
 {
-  "name":"org.signal.libsignal.protocol.message.SenderKeyMessage",
+  "name":"org.whispersystems.libsignal.protocol.PreKeySignalMessage",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
+  "methods":[
+    {"name":"<init>","parameterTypes":["long"] }, 
+    {"name":"nativeHandle","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"org.signal.libsignal.protocol.message.SignalMessage",
+  "name":"org.whispersystems.libsignal.protocol.SenderKeyMessage"}
+,
+{
+  "name":"org.whispersystems.libsignal.protocol.SignalMessage",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
+  "methods":[
+    {"name":"<init>","parameterTypes":["long"] }, 
+    {"name":"nativeHandle","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore"
-},
+  "name":"org.whispersystems.libsignal.state.IdentityKeyStore"}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
-  "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
-},
+  "name":"org.whispersystems.libsignal.state.IdentityKeyStore$Direction",
+  "fields":[
+    {"name":"RECEIVING"}, 
+    {"name":"SENDING"}
+  ]}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$IdentityChange"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.KyberPreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.PreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.PreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.SessionRecord",
+  "name":"org.whispersystems.libsignal.state.PreKeyRecord",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }]
-},
+  "methods":[{"name":"nativeHandle","parameterTypes":[] }]}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.SessionStore"
-},
+  "name":"org.whispersystems.libsignal.state.PreKeyStore"}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.SignedPreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
+  "name":"org.whispersystems.libsignal.state.SessionRecord",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[
+    {"name":"<init>","parameterTypes":["byte[]"] }, 
+    {"name":"nativeHandle","parameterTypes":[] }
+  ]}
+,
 {
-  "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
-},
+  "name":"org.whispersystems.libsignal.state.SessionStore"}
+,
 {
-  "name":"org.signal.libsignal.usernames.BadDiscriminatorCharacterException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
+  "name":"org.whispersystems.libsignal.state.SignedPreKeyRecord",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"nativeHandle","parameterTypes":[] }]}
+,
 {
-  "name":"org.signal.libsignal.usernames.BadNicknameCharacterException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.DiscriminatorCannotBeZeroException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.MissingSeparatorException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.NicknameTooLongException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.NicknameTooShortException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.zkgroup.InvalidInputException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.sqlite.BusyHandler",
-  "methods":[{"name":"callback","parameterTypes":["int"] }]
-},
-{
-  "name":"org.sqlite.Collation",
-  "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
-},
-{
-  "name":"org.sqlite.Function",
-  "fields":[{"name":"args"}, {"name":"context"}, {"name":"value"}],
-  "methods":[{"name":"xFunc","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.Function$Aggregate",
-  "methods":[{"name":"clone","parameterTypes":[] }, {"name":"xFinal","parameterTypes":[] }, {"name":"xStep","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.Function$Window",
-  "methods":[{"name":"xInverse","parameterTypes":[] }, {"name":"xValue","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.ProgressHandler",
-  "methods":[{"name":"progress","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.core.DB",
-  "methods":[{"name":"onCommit","parameterTypes":["boolean"] }, {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, {"name":"throwex","parameterTypes":[] }, {"name":"throwex","parameterTypes":["int"] }]
-},
-{
-  "name":"org.sqlite.core.DB$ProgressObserver",
-  "methods":[{"name":"progress","parameterTypes":["int","int"] }]
-},
-{
-  "name":"org.sqlite.core.NativeDB",
-  "fields":[{"name":"busyHandler"}, {"name":"commitListener"}, {"name":"pointer"}, {"name":"progressHandler"}, {"name":"updateListener"}],
-  "methods":[{"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, {"name":"throwex","parameterTypes":["java.lang.String"] }]
-}
+  "name":"org.whispersystems.libsignal.state.SignedPreKeyStore"}
+
 ]

graalvm-config-dir/proxy-config.json

@@ -1,26 +1,17 @@
 [
   {
-    "interfaces":["java.sql.Connection"]
-  },
+    "interfaces":["org.asamk.Signal"]}
+  ,
   {
-    "interfaces":["org.asamk.Signal"]
-  },
+    "interfaces":["org.asamk.Signal$Configuration"]}
+  ,
   {
-    "interfaces":["org.asamk.Signal$Configuration"]
-  },
+    "interfaces":["org.asamk.Signal$Device"]}
+  ,
   {
-    "interfaces":["org.asamk.Signal$Device"]
-  },
+    "interfaces":["org.asamk.Signal$Group"]}
+  ,
   {
-    "interfaces":["org.asamk.Signal$Group"]
-  },
-  {
-    "interfaces":["org.asamk.Signal$Identity"]
-  },
-  {
-    "interfaces":["org.asamk.SignalControl"]
-  },
-  {
-    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]
-  }
+    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
+  
 ]

graalvm-config-dir/resource-config.json

@@ -1,226 +1,164 @@
 {
   "resources":{
-  "includes":[{
-    "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/com.sun.net.httpserver.spi.HttpServerProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.nio.file.spi.FileTypeDetector\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/java.util.spi.ResourceBundleControlProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.util.ModuleVisibilityHelper\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.message.ISocketProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
-  }, {
-    "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE\\E"
-  }, {
-    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
-  }, {
-    "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
-  }, {
-    "pattern":"\\Qkotlin/annotation/annotation.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/collections/collections.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/jvm/jvm.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/ranges/ranges.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qkotlin/reflect/reflect.kotlin_builtins\\E"
-  }, {
-    "pattern":"\\Qlibsignal_jni.so\\E"
-  }, {
-    "pattern":"\\Qlibsignal_jni_aarch64.dylib\\E"
-  }, {
-    "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
-  }, {
-    "pattern":"\\Qlibsignal_jni_amd64.so\\E"
-  }, {
-    "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
-  }, {
-    "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
-  }, {
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
-  }, {
-    "pattern":"\\Qsignal_jni.dll\\E"
-  }, {
-    "pattern":"\\Qsignal_jni_amd64.dll\\E"
-  }, {
-    "pattern":"\\Qsqlite-jdbc.properties\\E"
-  }, {
-    "pattern":"com/google/i18n/phonenumbers/data/.*"
-  }, {
-    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
-  }, {
-    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
-  }, {
-    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfc.nrm\\E"
-  }, {
-    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"
-  }, {
-    "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"
-  }, {
-    "pattern":"java.base:\\Qsun/net/www/content-types.properties\\E"
-  }, {
-    "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
-  }]},
+  "includes":[
+    {
+      "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
+    }, 
+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
+    }, 
+    {
+      "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
+    }, 
+    {
+      "pattern":"\\Qlibsignal_jni.so\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"com/google/i18n/phonenumbers/data/.*"
+    }
+  ]},
   "bundles":[{
-    "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
-    "locales":["", "de", "en", "und"]
-  }]
+      "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl"
+    }]
 }

graalvm-config-dir/serialization-config.json

@@ -1,8 +1,2 @@
-{
-  "types":[
-  ],
-  "lambdaCapturingTypes":[
-  ],
-  "proxies":[
-  ]
-}
+[
+]

gradle/libs.versions.toml

@@ -1,17 +0,0 @@
-[versions]
-slf4j = "2.0.17"
-
-[libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.81"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.1"
-argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
-dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
-slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.18"
-
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_127"
-sqlite = "org.xerial:sqlite-jdbc:3.50.2.0"
-hikari = "com.zaxxer:HikariCP:6.3.0"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -82,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 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
+
+# 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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,29 +133,22 @@ 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.
+    which java >/dev/null 2>&1 || 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
@@ -200,28 +193,18 @@ if "$cygwin" || "$msys" ; then
     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.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# 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.

gradlew.bat

@@ -13,10 +13,8 @@
 @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
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "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
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,34 +56,32 @@ 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
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @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" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="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%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

lib/build.gradle.kts

@@ -4,37 +4,21 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
-val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 dependencies {
-    if (libsignalClientPath == null) {
-        implementation(libs.signalservice)
-    } else {
-        implementation(libs.signalservice) {
-            exclude(group = "org.signal", module = "libsignal-client")
-        }
-        implementation(files(libsignalClientPath))
-    }
-    implementation(libs.jackson.databind)
-    implementation(libs.bouncycastle)
-    implementation(libs.slf4j.api)
-    implementation(libs.sqlite)
-    implementation(libs.hikari)
-
-    testImplementation(libs.junit.jupiter)
-    testRuntimeOnly(libs.junit.launcher)
-}
-
-tasks.named<Test>("test") {
-    useJUnitPlatform()
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_35")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.0")
+    implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
+    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
+    implementation("org.slf4j", "slf4j-api", "1.7.32")
 }
 
 configurations {

lib/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java

@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
 public class AttachmentInvalidException extends Exception {
 

lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java

@@ -0,0 +1,55 @@
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.util.IOUtils;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class AttachmentStore {
+
+    private final File attachmentsPath;
+
+    public AttachmentStore(final File attachmentsPath) {
+        this.attachmentsPath = attachmentsPath;
+    }
+
+    public void storeAttachmentPreview(
+            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
+    ) throws IOException {
+        storeAttachment(getAttachmentPreviewFile(attachmentId), storer);
+    }
+
+    public void storeAttachment(
+            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
+    ) throws IOException {
+        storeAttachment(getAttachmentFile(attachmentId), storer);
+    }
+
+    private void storeAttachment(final File attachmentFile, final AttachmentStorer storer) throws IOException {
+        createAttachmentsDir();
+        try (OutputStream output = new FileOutputStream(attachmentFile)) {
+            storer.store(output);
+        }
+    }
+
+    private File getAttachmentPreviewFile(SignalServiceAttachmentRemoteId attachmentId) {
+        return new File(attachmentsPath, attachmentId.toString() + ".preview");
+    }
+
+    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
+        return new File(attachmentsPath, attachmentId.toString());
+    }
+
+    private void createAttachmentsDir() throws IOException {
+        IOUtils.createPrivateDirectories(attachmentsPath);
+    }
+
+    @FunctionalInterface
+    public interface AttachmentStorer {
+
+        void store(OutputStream outputStream) throws IOException;
+    }
+}

lib/src/main/java/org/asamk/signal/manager/AvatarStore.java

@@ -1,9 +1,9 @@
-package org.asamk.signal.manager.storage;
+package org.asamk.signal.manager;
 
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
 import java.io.File;
@@ -20,11 +20,11 @@ public class AvatarStore {
         this.avatarsPath = avatarsPath;
     }
 
-    public StreamDetails retrieveContactAvatar(RecipientAddress address) throws IOException {
+    public StreamDetails retrieveContactAvatar(SignalServiceAddress address) throws IOException {
         return retrieveAvatar(getContactAvatarFile(address));
     }
 
-    public StreamDetails retrieveProfileAvatar(RecipientAddress address) throws IOException {
+    public StreamDetails retrieveProfileAvatar(SignalServiceAddress address) throws IOException {
         return retrieveAvatar(getProfileAvatarFile(address));
     }
 
@@ -33,11 +33,11 @@ public class AvatarStore {
         return retrieveAvatar(groupAvatarFile);
     }
 
-    public void storeContactAvatar(RecipientAddress address, AvatarStorer storer) throws IOException {
+    public void storeContactAvatar(SignalServiceAddress address, AvatarStorer storer) throws IOException {
         storeAvatar(getContactAvatarFile(address), storer);
     }
 
-    public void storeProfileAvatar(RecipientAddress address, AvatarStorer storer) throws IOException {
+    public void storeProfileAvatar(SignalServiceAddress address, AvatarStorer storer) throws IOException {
         storeAvatar(getProfileAvatarFile(address), storer);
     }
 
@@ -45,7 +45,7 @@ public class AvatarStore {
         storeAvatar(getGroupAvatarFile(groupId), storer);
     }
 
-    public void deleteProfileAvatar(RecipientAddress address) throws IOException {
+    public void deleteProfileAvatar(SignalServiceAddress address) throws IOException {
         deleteAvatar(getProfileAvatarFile(address));
     }
 
@@ -77,12 +77,16 @@ public class AvatarStore {
         return new File(avatarsPath, "group-" + groupId.toBase64().replace("/", "_"));
     }
 
-    private File getContactAvatarFile(RecipientAddress address) {
-        return new File(avatarsPath, "contact-" + address.getLegacyIdentifier());
+    private File getContactAvatarFile(SignalServiceAddress address) {
+        return new File(avatarsPath, "contact-" + getLegacyIdentifier(address));
     }
 
-    private File getProfileAvatarFile(RecipientAddress address) {
-        return new File(avatarsPath, "profile-" + address.getLegacyIdentifier());
+    private String getLegacyIdentifier(final SignalServiceAddress address) {
+        return address.getNumber().or(() -> address.getAci().toString());
+    }
+
+    private File getProfileAvatarFile(SignalServiceAddress address) {
+        return new File(avatarsPath, "profile-" + getLegacyIdentifier(address));
     }
 
     private void createAvatarsDir() throws IOException {

lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java

@@ -1,26 +1,30 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
-import org.asamk.signal.manager.util.Utils;
-import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.ECPublicKey;
+import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.ecc.Curve;
+import org.whispersystems.libsignal.ecc.ECPublicKey;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public record DeviceLinkUrl(String deviceIdentifier, ECPublicKey deviceKey) {
+public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
 
-    public static DeviceLinkUrl parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
+    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
         final var rawQuery = linkUri.getRawQuery();
         if (isEmpty(rawQuery)) {
             throw new RuntimeException("Invalid device link uri");
         }
 
-        var query = Utils.getQueryMap(rawQuery);
+        var query = getQueryMap(rawQuery);
         var deviceIdentifier = query.get("uuid");
         var publicKeyEncoded = query.get("pub_key");
 
@@ -36,12 +40,24 @@ public record DeviceLinkUrl(String deviceIdentifier, ECPublicKey deviceKey) {
         }
         ECPublicKey deviceKey;
         try {
-            deviceKey = new ECPublicKey(publicKeyBytes);
+            deviceKey = Curve.decodePoint(publicKeyBytes, 0);
         } catch (InvalidKeyException e) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
         }
 
-        return new DeviceLinkUrl(deviceIdentifier, deviceKey);
+        return new DeviceLinkInfo(deviceIdentifier, deviceKey);
+    }
+
+    private static Map<String, String> getQueryMap(String query) {
+        var params = query.split("&");
+        var map = new HashMap<String, String>();
+        for (var param : params) {
+            final var paramParts = param.split("=");
+            var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
+            var value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            map.put(name, value);
+        }
+        return map;
     }
 
     public URI createDeviceLinkUri() {

lib/src/main/java/org/asamk/signal/manager/JobExecutor.java

@@ -0,0 +1,17 @@
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.jobs.Context;
+import org.asamk.signal.manager.jobs.Job;
+
+public class JobExecutor {
+
+    private final Context context;
+
+    public JobExecutor(final Context context) {
+        this.context = context;
+    }
+
+    public void enqueueJob(Job job) {
+        job.run(context);
+    }
+}

lib/src/main/java/org/asamk/signal/manager/JsonStickerPack.java

@@ -0,0 +1,8 @@
+package org.asamk.signal.manager;
+
+import java.util.List;
+
+public record JsonStickerPack(String title, String author, JsonSticker cover, List<JsonSticker> stickers) {
+
+    public record JsonSticker(String emoji, String file, String contentType) {}
+}

lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java

@@ -1,13 +1,13 @@
-package org.asamk.signal.manager.internal;
+package org.asamk.signal.manager;
 
-import org.signal.libsignal.protocol.logging.SignalProtocolLogger;
-import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.libsignal.logging.SignalProtocolLogger;
+import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 
 public class LibSignalLogger implements SignalProtocolLogger {
 
-    private static final Logger logger = LoggerFactory.getLogger("LibSignal");
+    private final static Logger logger = LoggerFactory.getLogger("LibSignal");
 
     public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());

lib/src/main/java/org/asamk/signal/manager/Manager.java

@@ -1,213 +1,167 @@
 package org.asamk.signal.manager;
 
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-
-import org.asamk.signal.manager.api.AlreadyReceivingException;
-import org.asamk.signal.manager.api.AttachmentInvalidException;
-import org.asamk.signal.manager.api.CaptchaRejectedException;
-import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
-import org.asamk.signal.manager.api.DeviceLimitExceededException;
-import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.api.GroupInviteLinkUrl;
-import org.asamk.signal.manager.api.GroupNotFoundException;
-import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
-import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
-import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
-import org.asamk.signal.manager.api.InvalidStickerException;
-import org.asamk.signal.manager.api.InvalidUsernameException;
-import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
-import org.asamk.signal.manager.api.NotAGroupMemberException;
-import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.api.PendingAdminApprovalException;
-import org.asamk.signal.manager.api.PinLockMissingException;
-import org.asamk.signal.manager.api.PinLockedException;
-import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.ReceiveConfig;
-import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
-import org.asamk.signal.manager.api.StickerPack;
-import org.asamk.signal.manager.api.StickerPackId;
-import org.asamk.signal.manager.api.StickerPackInvalidException;
-import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
-import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
-import org.asamk.signal.manager.api.UpdateProfile;
-import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.api.UsernameLinkUrl;
-import org.asamk.signal.manager.api.UsernameStatus;
-import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.groups.LastGroupAdminException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.storage.recipients.Contact;
+import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.time.Duration;
-import java.util.Collection;
+import java.net.URI;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 public interface Manager extends Closeable {
 
-    static boolean isValidNumber(final String e164Number, final String countryCode) {
-        return PhoneNumberUtil.getInstance().isPossibleNumber(e164Number, countryCode);
+    static Manager init(
+            String number,
+            File settingsPath,
+            ServiceEnvironment serviceEnvironment,
+            String userAgent,
+            TrustNewIdentity trustNewIdentity
+    ) throws IOException, NotRegisteredException {
+        var pathConfig = PathConfig.createDefault(settingsPath);
+
+        if (!SignalAccount.userExists(pathConfig.dataPath(), number)) {
+            throw new NotRegisteredException();
+        }
+
+        var account = SignalAccount.load(pathConfig.dataPath(), number, true, trustNewIdentity);
+
+        if (!account.isRegistered()) {
+            account.close();
+            throw new NotRegisteredException();
+        }
+
+        final var serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
+
+        return new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
     }
 
-    static boolean isSignalClientAvailable() {
-        final Logger logger = LoggerFactory.getLogger(Manager.class);
-        try {
-            try {
-                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
-            } catch (Exception e) {
-                logger.trace("Expected exception when checking libsignal-client: {}", e.getMessage());
-            }
-            return true;
-        } catch (UnsatisfiedLinkError e) {
-            logger.warn("Failed to call libsignal-client: {}", e.getMessage());
-            return false;
+    static void initLogger() {
+        LibSignalLogger.initLogger();
+    }
+
+    static boolean isValidNumber(final String e164Number, final String countryCode) {
+        return PhoneNumberFormatter.isValidNumber(e164Number, countryCode);
+    }
+
+    static List<String> getAllLocalAccountNumbers(File settingsPath) {
+        var pathConfig = PathConfig.createDefault(settingsPath);
+        final var dataPath = pathConfig.dataPath();
+        final var files = dataPath.listFiles();
+
+        if (files == null) {
+            return List.of();
         }
+
+        return Arrays.stream(files)
+                .filter(File::isFile)
+                .map(File::getName)
+                .filter(file -> PhoneNumberFormatter.isValidNumber(file, null))
+                .toList();
     }
 
     String getSelfNumber();
 
-    /**
-     * This is used for checking a set of phone numbers for registration on Signal
-     *
-     * @param numbers The set of phone number in question
-     * @return A map of numbers to canonicalized number and uuid. If a number is not registered the uuid is null.
-     * @throws IOException if it's unable to get the contacts to check if they're registered
-     */
-    Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
+    void checkAccountState() throws IOException;
 
-    Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) throws IOException;
+    Map<String, Pair<String, UUID>> areUsersRegistered(Set<String> numbers) throws IOException;
 
-    void updateAccountAttributes(
-            String deviceName,
-            Boolean unrestrictedUnidentifiedSender,
-            final Boolean discoverableByNumber,
-            final Boolean numberSharing
-    ) throws IOException;
+    void updateAccountAttributes(String deviceName) throws IOException;
 
     Configuration getConfiguration();
 
-    void updateConfiguration(Configuration configuration) throws NotPrimaryDeviceException;
+    void updateConfiguration(Configuration configuration) throws IOException, NotMasterDeviceException;
 
-    /**
-     * Update the user's profile.
-     * If a field is null, the previous value will be kept.
-     */
-    void updateProfile(UpdateProfile updateProfile) throws IOException;
-
-    String getUsername();
-
-    UsernameLinkUrl getUsernameLink();
-
-    /**
-     * Set a username for the account.
-     * If the username is null, it will be deleted.
-     */
-    void setUsername(String username) throws IOException, InvalidUsernameException;
-
-    /**
-     * Set a username for the account.
-     * If the username is null, it will be deleted.
-     */
-    void deleteUsername() throws IOException;
-
-    void startChangeNumber(
-            String newNumber,
-            boolean voiceVerification,
-            String captcha
-    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException;
-
-    void finishChangeNumber(
-            String newNumber,
-            String verificationCode,
-            String pin
-    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException, PinLockMissingException;
+    void setProfile(
+            String givenName, String familyName, String about, String aboutEmoji, Optional<File> avatar
+    ) throws IOException;
 
     void unregister() throws IOException;
 
     void deleteAccount() throws IOException;
 
-    void submitRateLimitRecaptchaChallenge(
-            String challenge,
-            String captcha
-    ) throws IOException, CaptchaRejectedException;
+    void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException;
 
     List<Device> getLinkedDevices() throws IOException;
 
-    void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException;
+    void removeLinkedDevices(long deviceId) throws IOException;
 
-    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException, DeviceLimitExceededException;
+    void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException;
 
-    void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
+    void setRegistrationLockPin(Optional<String> pin) throws IOException;
+
+    Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws IOException;
 
     List<Group> getGroups();
 
     SendGroupMessageResults quitGroup(
-            GroupId groupId,
-            Set<RecipientIdentifier.Single> groupAdmins
-    ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException;
+            GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+    ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException;
 
     void deleteGroup(GroupId groupId) throws IOException;
 
     Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name,
-            Set<RecipientIdentifier.Single> members,
-            String avatarFile
-    ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException;
+            String name, Set<RecipientIdentifier.Single> members, File avatarFile
+    ) throws IOException, AttachmentInvalidException;
 
     SendGroupMessageResults updateGroup(
-            final GroupId groupId,
-            final UpdateGroup updateGroup
-    ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException;
+            final GroupId groupId, final UpdateGroup updateGroup
+    ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException;
 
     Pair<GroupId, SendGroupMessageResults> joinGroup(
             GroupInviteLinkUrl inviteLinkUrl
-    ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException;
+    ) throws IOException, InactiveGroupLinkException;
 
     SendMessageResults sendTypingMessage(
-            TypingAction action,
-            Set<RecipientIdentifier> recipients
+            TypingAction action, Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
-    SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
+    SendMessageResults sendReadReceipt(
+            RecipientIdentifier.Single sender, List<Long> messageIds
+    ) throws IOException;
 
-    SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
+    SendMessageResults sendViewedReceipt(
+            RecipientIdentifier.Single sender, List<Long> messageIds
+    ) throws IOException;
 
     SendMessageResults sendMessage(
-            Message message,
-            Set<RecipientIdentifier> recipients,
-            boolean notifySelf
-    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
-
-    SendMessageResults sendEditMessage(
-            Message message,
-            Set<RecipientIdentifier> recipients,
-            long editTargetTimestamp
-    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
+            Message message, Set<RecipientIdentifier> recipients
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
     SendMessageResults sendRemoteDeleteMessage(
-            long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients
+            long targetSentTimestamp, Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
     SendMessageResults sendMessageReaction(
@@ -215,67 +169,32 @@ public interface Manager extends Closeable {
             boolean remove,
             RecipientIdentifier.Single targetAuthor,
             long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients,
-            final boolean isStory
-    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException;
-
-    SendMessageResults sendPaymentNotificationMessage(
-            byte[] receipt,
-            String note,
-            RecipientIdentifier.Single recipient
-    ) throws IOException;
+            Set<RecipientIdentifier> recipients
+    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
     SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
 
-    SendMessageResults sendMessageRequestResponse(
-            MessageEnvelope.Sync.MessageRequestResponse.Type type,
-            Set<RecipientIdentifier> recipientIdentifiers
-    );
+    void deleteRecipient(RecipientIdentifier.Single recipient) throws IOException;
 
-    void hideRecipient(RecipientIdentifier.Single recipient);
-
-    void deleteRecipient(RecipientIdentifier.Single recipient);
-
-    void deleteContact(RecipientIdentifier.Single recipient);
+    void deleteContact(RecipientIdentifier.Single recipient) throws IOException;
 
     void setContactName(
-            final RecipientIdentifier.Single recipient,
-            final String givenName,
-            final String familyName,
-            final String nickGivenName,
-            final String nickFamilyName,
-            final String note
-    ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
+            RecipientIdentifier.Single recipient, String name
+    ) throws NotMasterDeviceException, IOException;
 
-    void setContactsBlocked(
-            Collection<RecipientIdentifier.Single> recipient,
-            boolean blocked
-    ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
+    void setContactBlocked(
+            RecipientIdentifier.Single recipient, boolean blocked
+    ) throws NotMasterDeviceException, IOException;
 
-    void setGroupsBlocked(
-            Collection<GroupId> groupId,
-            boolean blocked
-    ) throws GroupNotFoundException, IOException, NotPrimaryDeviceException;
+    void setGroupBlocked(
+            GroupId groupId, boolean blocked
+    ) throws GroupNotFoundException, IOException, NotMasterDeviceException;
 
-    /**
-     * Change the expiration timer for a contact
-     */
     void setExpirationTimer(
-            RecipientIdentifier.Single recipient,
-            int messageExpirationTimer
-    ) throws IOException, UnregisteredRecipientException;
+            RecipientIdentifier.Single recipient, int messageExpirationTimer
+    ) throws IOException;
 
-    /**
-     * Upload the sticker pack from path.
-     *
-     * @param path Path can be a path to a manifest.json file or to a zip file that contains a manifest.json file
-     * @return if successful, returns the URL to install the sticker pack in the signal app
-     */
-    StickerPackUrl uploadStickerPack(File path) throws IOException, StickerPackInvalidException;
-
-    void installStickerPack(StickerPackUrl url) throws IOException;
-
-    List<StickerPack> getStickerPacks();
+    URI uploadStickerPack(File path) throws IOException, StickerPackInvalidException;
 
     void requestAllSyncData() throws IOException;
 
@@ -300,26 +219,22 @@ public interface Manager extends Closeable {
     /**
      * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
      */
-    void receiveMessages(
-            Optional<Duration> timeout,
-            Optional<Integer> maxMessages,
-            ReceiveMessageHandler handler
-    ) throws IOException, AlreadyReceivingException;
+    void receiveMessages(long timeout, TimeUnit unit, ReceiveMessageHandler handler) throws IOException;
 
-    void stopReceiveMessages();
+    /**
+     * Receive new messages from server, returns only if the thread is interrupted.
+     */
+    void receiveMessages(ReceiveMessageHandler handler) throws IOException;
 
-    void setReceiveConfig(ReceiveConfig receiveConfig);
+    void setIgnoreAttachments(boolean ignoreAttachments);
+
+    boolean hasCaughtUpWithOldMessages();
 
     boolean isContactBlocked(RecipientIdentifier.Single recipient);
 
     void sendContacts() throws IOException;
 
-    List<Recipient> getRecipients(
-            boolean onlyContacts,
-            Optional<Boolean> blocked,
-            Collection<RecipientIdentifier.Single> address,
-            Optional<String> name
-    );
+    List<Pair<RecipientAddress, Contact>> getContacts();
 
     String getContactOrProfileName(RecipientIdentifier.Single recipient);
 
@@ -329,39 +244,18 @@ public interface Manager extends Closeable {
 
     List<Identity> getIdentities(RecipientIdentifier.Single recipient);
 
-    /**
-     * Trust this the identity with this fingerprint/safetyNumber
-     *
-     * @param recipient account of the identity
-     */
-    boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient,
-            IdentityVerificationCode verificationCode
-    ) throws UnregisteredRecipientException;
+    boolean trustIdentityVerified(RecipientIdentifier.Single recipient, byte[] fingerprint);
 
-    /**
-     * Trust all keys of this identity without verification
-     *
-     * @param recipient account of the identity
-     */
-    boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient) throws UnregisteredRecipientException;
+    boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, String safetyNumber);
 
-    void addAddressChangedListener(Runnable listener);
+    boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, byte[] safetyNumber);
+
+    boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient);
 
     void addClosedListener(Runnable listener);
 
-    InputStream retrieveAttachment(final String id) throws IOException;
-
-    InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
-
-    InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
-
-    InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException;
-
-    InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException;
-
     @Override
-    void close();
+    void close() throws IOException;
 
     interface ReceiveMessageHandler {
 

lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java

@@ -1,10 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.internal.LibSignalLogger;
-
-public class ManagerLogger {
-
-    public static void initLogger() {
-        LibSignalLogger.initLogger();
-    }
-}

lib/src/main/java/org/asamk/signal/manager/MultiAccountManager.java

@@ -10,8 +10,6 @@ public interface MultiAccountManager extends AutoCloseable {
 
     List<String> getAccountNumbers();
 
-    List<Manager> getManagers();
-
     void addOnManagerAddedHandler(Consumer<Manager> handler);
 
     void addOnManagerRemovedHandler(Consumer<Manager> handler);
@@ -22,6 +20,8 @@ public interface MultiAccountManager extends AutoCloseable {
 
     ProvisioningManager getProvisioningManagerFor(URI deviceLinkUri);
 
+    ProvisioningManager getNewProvisioningManager();
+
     RegistrationManager getNewRegistrationManager(String account) throws IOException;
 
     @Override

lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java

@@ -1,13 +1,10 @@
-package org.asamk.signal.manager.internal;
+package org.asamk.signal.manager;
 
-import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.ProvisioningManager;
-import org.asamk.signal.manager.RegistrationManager;
-import org.asamk.signal.manager.SignalAccountFiles;
+import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -22,18 +19,27 @@ import java.util.function.Consumer;
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 
-    private static final Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
+    private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
 
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
     private final Set<Manager> managers = new HashSet<>();
     private final Map<URI, ProvisioningManager> provisioningManagers = new HashMap<>();
-    private final SignalAccountFiles signalAccountFiles;
+    private final File dataPath;
+    private final ServiceEnvironment serviceEnvironment;
+    private final String userAgent;
 
-    public MultiAccountManagerImpl(final Collection<Manager> managers, final SignalAccountFiles signalAccountFiles) {
-        this.signalAccountFiles = signalAccountFiles;
+    public MultiAccountManagerImpl(
+            final Collection<Manager> managers,
+            final File dataPath,
+            final ServiceEnvironment serviceEnvironment,
+            final String userAgent
+    ) {
         this.managers.addAll(managers);
         managers.forEach(m -> m.addClosedListener(() -> this.removeManager(m)));
+        this.dataPath = dataPath;
+        this.serviceEnvironment = serviceEnvironment;
+        this.userAgent = userAgent;
     }
 
     @Override
@@ -43,13 +49,6 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
         }
     }
 
-    @Override
-    public List<Manager> getManagers() {
-        synchronized (managers) {
-            return new ArrayList<>(managers);
-        }
-    }
-
     void addManager(final Manager m) {
         synchronized (managers) {
             if (managers.contains(m)) {
@@ -93,9 +92,9 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
     }
 
     @Override
-    public Manager getManager(final String number) {
+    public Manager getManager(final String account) {
         synchronized (managers) {
-            return managers.stream().filter(m -> m.getSelfNumber().equals(number)).findFirst().orElse(null);
+            return managers.stream().filter(m -> m.getSelfNumber().equals(account)).findFirst().orElse(null);
         }
     }
 
@@ -112,20 +111,25 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
         return provisioningManagers.remove(deviceLinkUri);
     }
 
-    private ProvisioningManager getNewProvisioningManager() {
-        return signalAccountFiles.initProvisioningManager(this::addManager);
+    @Override
+    public ProvisioningManager getNewProvisioningManager() {
+        return ProvisioningManager.init(dataPath, serviceEnvironment, userAgent, this::addManager);
     }
 
     @Override
-    public RegistrationManager getNewRegistrationManager(String number) throws IOException {
-        return signalAccountFiles.initRegistrationManager(number, this::addManager);
+    public RegistrationManager getNewRegistrationManager(String account) throws IOException {
+        return RegistrationManager.init(account, dataPath, serviceEnvironment, userAgent, this::addManager);
     }
 
     @Override
     public void close() {
         synchronized (managers) {
             for (var m : new ArrayList<>(managers)) {
-                m.close();
+                try {
+                    m.close();
+                } catch (IOException e) {
+                    logger.warn("Cleanup failed", e);
+                }
             }
             managers.clear();
         }

lib/src/main/java/org/asamk/signal/manager/NotMasterDeviceException.java

@@ -0,0 +1,8 @@
+package org.asamk.signal.manager;
+
+public class NotMasterDeviceException extends Exception {
+
+    public NotMasterDeviceException() {
+        super("This function is not supported for linked devices.");
+    }
+}

lib/src/main/java/org/asamk/signal/manager/NotRegisteredException.java

@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
 public class NotRegisteredException extends Exception {
 

lib/src/main/java/org/asamk/signal/manager/PathConfig.java

@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.internal;
+package org.asamk.signal.manager;
 
 import java.io.File;
 

lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java

@@ -1,14 +1,209 @@
+/*
+  Copyright (C) 2015-2021 AsamK and contributors
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.asamk.signal.manager;
 
-import org.asamk.signal.manager.api.UserAlreadyExistsException;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;
+import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.util.KeyHelper;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 
-public interface ProvisioningManager {
+public class ProvisioningManager {
 
-    URI getDeviceLinkUri() throws TimeoutException, IOException;
+    private final static Logger logger = LoggerFactory.getLogger(ProvisioningManager.class);
 
-    String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExistsException;
+    private final PathConfig pathConfig;
+    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
+    private final String userAgent;
+    private final Consumer<Manager> newManagerListener;
+
+    private final SignalServiceAccountManager accountManager;
+    private final IdentityKeyPair tempIdentityKey;
+    private final int registrationId;
+    private final String password;
+
+    ProvisioningManager(
+            PathConfig pathConfig,
+            ServiceEnvironmentConfig serviceEnvironmentConfig,
+            String userAgent,
+            final Consumer<Manager> newManagerListener
+    ) {
+        this.pathConfig = pathConfig;
+        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+        this.userAgent = userAgent;
+        this.newManagerListener = newManagerListener;
+
+        tempIdentityKey = KeyUtils.generateIdentityKeyPair();
+        registrationId = KeyHelper.generateRegistrationId(false);
+        password = KeyUtils.createPassword();
+        GroupsV2Operations groupsV2Operations;
+        try {
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+        } catch (Throwable ignored) {
+            groupsV2Operations = null;
+        }
+        accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                new DynamicCredentialsProvider(null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
+                userAgent,
+                groupsV2Operations,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+    }
+
+    public static ProvisioningManager init(
+            File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
+    ) {
+        return init(settingsPath, serviceEnvironment, userAgent, null);
+    }
+
+    public static ProvisioningManager init(
+            File settingsPath,
+            ServiceEnvironment serviceEnvironment,
+            String userAgent,
+            Consumer<Manager> newManagerListener
+    ) {
+        var pathConfig = PathConfig.createDefault(settingsPath);
+
+        final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
+
+        return new ProvisioningManager(pathConfig, serviceConfiguration, userAgent, newManagerListener);
+    }
+
+    public URI getDeviceLinkUri() throws TimeoutException, IOException {
+        var deviceUuid = accountManager.getNewDeviceUuid();
+
+        return new DeviceLinkInfo(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
+    }
+
+    public String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExists {
+        var ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
+        var number = ret.getNumber();
+
+        logger.info("Received link information from {}, linking in progress ...", number);
+
+        if (SignalAccount.userExists(pathConfig.dataPath(), number) && !canRelinkExistingAccount(number)) {
+            throw new UserAlreadyExists(number, SignalAccount.getFileName(pathConfig.dataPath(), number));
+        }
+
+        var encryptedDeviceName = deviceName == null
+                ? null
+                : DeviceNameUtil.encryptDeviceName(deviceName, ret.getIdentity().getPrivateKey());
+
+        logger.debug("Finishing new device registration");
+        var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
+                false,
+                true,
+                registrationId,
+                encryptedDeviceName);
+
+        // Create new account with the synced identity
+        var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
+
+        SignalAccount account = null;
+        try {
+            account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
+                    number,
+                    ret.getAci(),
+                    password,
+                    encryptedDeviceName,
+                    deviceId,
+                    ret.getIdentity(),
+                    registrationId,
+                    profileKey,
+                    TrustNewIdentity.ON_FIRST_USE);
+
+            ManagerImpl m = null;
+            try {
+                m = new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
+                account = null;
+
+                logger.debug("Refreshing pre keys");
+                try {
+                    m.refreshPreKeys();
+                } catch (Exception e) {
+                    logger.error("Failed to refresh pre keys.");
+                }
+
+                logger.debug("Requesting sync data");
+                try {
+                    m.requestAllSyncData();
+                } catch (Exception e) {
+                    logger.error(
+                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.");
+                }
+
+                if (newManagerListener != null) {
+                    newManagerListener.accept(m);
+                    m = null;
+                }
+                return number;
+            } finally {
+                if (m != null) {
+                    m.close();
+                }
+            }
+        } finally {
+            if (account != null) {
+                account.close();
+            }
+        }
+    }
+
+    private boolean canRelinkExistingAccount(final String number) throws IOException {
+        final SignalAccount signalAccount;
+        try {
+            signalAccount = SignalAccount.load(pathConfig.dataPath(), number, false, TrustNewIdentity.ON_FIRST_USE);
+        } catch (IOException e) {
+            logger.debug("Account in use or failed to load.", e);
+            return false;
+        }
+
+        try (signalAccount) {
+            if (signalAccount.isMasterDevice()) {
+                logger.debug("Account is a master device.");
+                return false;
+            }
+
+            final var m = new ManagerImpl(signalAccount, pathConfig, serviceEnvironmentConfig, userAgent);
+            try (m) {
+                m.checkAccountState();
+            } catch (AuthorizationFailedException ignored) {
+                return true;
+            }
+
+            logger.debug("Account is still successfully linked.");
+            return false;
+        }
+    }
 }

lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java

@@ -1,30 +1,303 @@
+/*
+  Copyright (C) 2015-2021 AsamK and contributors
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
-import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
-import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;
+import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.helper.PinHelper;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.util.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.libsignal.util.KeyHelper;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.KbsPinData;
+import org.whispersystems.signalservice.api.KeyBackupServicePinException;
+import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.internal.ServiceResponse;
+import org.whispersystems.signalservice.internal.push.LockedException;
+import org.whispersystems.signalservice.internal.push.RequestVerificationCodeResponse;
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
+import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
+import java.util.function.Consumer;
 
-public interface RegistrationManager extends Closeable {
+import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
 
-    void register(
-            boolean voiceVerification,
-            String captcha,
-            final boolean forceRegister
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException;
+public class RegistrationManager implements Closeable {
 
-    void verifyAccount(
-            String verificationCode,
-            String pin
-    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException;
+    private final static Logger logger = LoggerFactory.getLogger(RegistrationManager.class);
 
-    void deleteLocalAccountData() throws IOException;
+    private SignalAccount account;
+    private final PathConfig pathConfig;
+    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
+    private final String userAgent;
+    private final Consumer<Manager> newManagerListener;
 
-    boolean isRegistered();
+    private final SignalServiceAccountManager accountManager;
+    private final PinHelper pinHelper;
+
+    private RegistrationManager(
+            SignalAccount account,
+            PathConfig pathConfig,
+            ServiceEnvironmentConfig serviceEnvironmentConfig,
+            String userAgent,
+            Consumer<Manager> newManagerListener
+    ) {
+        this.account = account;
+        this.pathConfig = pathConfig;
+        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+        this.userAgent = userAgent;
+        this.newManagerListener = newManagerListener;
+
+        GroupsV2Operations groupsV2Operations;
+        try {
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+        } catch (Throwable ignored) {
+            groupsV2Operations = null;
+        }
+        this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                new DynamicCredentialsProvider(
+                        // Using empty UUID, because registering doesn't work otherwise
+                        null, account.getAccount(), account.getPassword(), SignalServiceAddress.DEFAULT_DEVICE_ID),
+                userAgent,
+                groupsV2Operations,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
+                serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
+                serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
+                serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
+                10);
+        this.pinHelper = new PinHelper(keyBackupService);
+    }
+
+    public static RegistrationManager init(
+            String number, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
+    ) throws IOException {
+        return init(number, settingsPath, serviceEnvironment, userAgent, null);
+    }
+
+    public static RegistrationManager init(
+            String number,
+            File settingsPath,
+            ServiceEnvironment serviceEnvironment,
+            String userAgent,
+            Consumer<Manager> newManagerListener
+    ) throws IOException {
+        var pathConfig = PathConfig.createDefault(settingsPath);
+
+        final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
+        if (!SignalAccount.userExists(pathConfig.dataPath(), number)) {
+            var identityKey = KeyUtils.generateIdentityKeyPair();
+            var registrationId = KeyHelper.generateRegistrationId(false);
+
+            var profileKey = KeyUtils.createProfileKey();
+            var account = SignalAccount.create(pathConfig.dataPath(),
+                    number,
+                    identityKey,
+                    registrationId,
+                    profileKey,
+                    TrustNewIdentity.ON_FIRST_USE);
+
+            return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent, newManagerListener);
+        }
+
+        var account = SignalAccount.load(pathConfig.dataPath(), number, true, TrustNewIdentity.ON_FIRST_USE);
+
+        return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent, newManagerListener);
+    }
+
+    public void register(boolean voiceVerification, String captcha) throws IOException, CaptchaRequiredException {
+        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+        if (account.getAci() != null) {
+            try {
+                final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                        new DynamicCredentialsProvider(account.getAci(),
+                                account.getAccount(),
+                                account.getPassword(),
+                                account.getDeviceId()),
+                        userAgent,
+                        null,
+                        ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+                accountManager.setAccountAttributes(account.getEncryptedDeviceName(),
+                        null,
+                        account.getLocalRegistrationId(),
+                        true,
+                        null,
+                        account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+                        account.getSelfUnidentifiedAccessKey(),
+                        account.isUnrestrictedUnidentifiedAccess(),
+                        capabilities,
+                        account.isDiscoverableByPhoneNumber());
+                account.setRegistered(true);
+                logger.info("Reactivated existing account, verify is not necessary.");
+                if (newManagerListener != null) {
+                    final var m = new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
+                    account = null;
+                    newManagerListener.accept(m);
+                }
+                return;
+            } catch (IOException e) {
+                logger.debug("Failed to reactivate account");
+            }
+        }
+        final ServiceResponse<RequestVerificationCodeResponse> response;
+        if (voiceVerification) {
+            response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(),
+                    Optional.fromNullable(captcha),
+                    Optional.absent(),
+                    Optional.absent());
+        } else {
+            response = accountManager.requestSmsVerificationCode(false,
+                    Optional.fromNullable(captcha),
+                    Optional.absent(),
+                    Optional.absent());
+        }
+        try {
+            handleResponseException(response);
+        } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
+            throw new CaptchaRequiredException(e.getMessage(), e);
+        }
+    }
+
+    public void verifyAccount(
+            String verificationCode, String pin
+    ) throws IOException, PinLockedException, IncorrectPinException {
+        verificationCode = verificationCode.replace("-", "");
+        VerifyAccountResponse response;
+        MasterKey masterKey;
+        try {
+            response = verifyAccountWithCode(verificationCode, null);
+
+            masterKey = null;
+            pin = null;
+        } catch (LockedException e) {
+            if (pin == null) {
+                throw new PinLockedException(e.getTimeRemaining());
+            }
+
+            KbsPinData registrationLockData;
+            try {
+                registrationLockData = pinHelper.getRegistrationLockData(pin, e);
+            } catch (KeyBackupSystemNoDataException ex) {
+                throw new IOException(e);
+            } catch (KeyBackupServicePinException ex) {
+                throw new IncorrectPinException(ex.getTriesRemaining());
+            }
+            if (registrationLockData == null) {
+                throw e;
+            }
+
+            var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
+            try {
+                response = verifyAccountWithCode(verificationCode, registrationLock);
+            } catch (LockedException _e) {
+                throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
+            }
+            masterKey = registrationLockData.getMasterKey();
+        }
+
+        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
+        account.finishRegistration(ACI.parseOrNull(response.getUuid()), masterKey, pin);
+
+        ManagerImpl m = null;
+        try {
+            m = new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
+            account = null;
+
+            m.refreshPreKeys();
+            if (response.isStorageCapable()) {
+                m.retrieveRemoteStorage();
+            }
+            // Set an initial empty profile so user can be added to groups
+            try {
+                m.setProfile(null, null, null, null, null);
+            } catch (NoClassDefFoundError e) {
+                logger.warn("Failed to set default profile: {}", e.getMessage());
+            }
+
+            if (newManagerListener != null) {
+                newManagerListener.accept(m);
+                m = null;
+            }
+        } finally {
+            if (m != null) {
+                m.close();
+            }
+        }
+    }
+
+    private VerifyAccountResponse verifyAccountWithCode(
+            final String verificationCode, final String registrationLock
+    ) throws IOException {
+        final ServiceResponse<VerifyAccountResponse> response;
+        if (registrationLock == null) {
+            response = accountManager.verifyAccount(verificationCode,
+                    account.getLocalRegistrationId(),
+                    true,
+                    account.getSelfUnidentifiedAccessKey(),
+                    account.isUnrestrictedUnidentifiedAccess(),
+                    ServiceConfig.capabilities,
+                    account.isDiscoverableByPhoneNumber());
+        } else {
+            response = accountManager.verifyAccountWithRegistrationLockPin(verificationCode,
+                    account.getLocalRegistrationId(),
+                    true,
+                    registrationLock,
+                    account.getSelfUnidentifiedAccessKey(),
+                    account.isUnrestrictedUnidentifiedAccess(),
+                    ServiceConfig.capabilities,
+                    account.isDiscoverableByPhoneNumber());
+        }
+        handleResponseException(response);
+        return response.getResult().get();
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (account != null) {
+            account.close();
+            account = null;
+        }
+    }
+
+    private void handleResponseException(final ServiceResponse<?> response) throws IOException {
+        final var throwableOptional = response.getExecutionError().or(response.getApplicationError());
+        if (throwableOptional.isPresent()) {
+            if (throwableOptional.get() instanceof IOException) {
+                throw (IOException) throwableOptional.get();
+            } else {
+                throw new IOException(throwableOptional.get());
+            }
+        }
+    }
 }

lib/src/main/java/org/asamk/signal/manager/Settings.java

@@ -1,8 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.api.TrustNewIdentity;
-
-public record Settings(TrustNewIdentity trustNewIdentity, boolean disableMessageSendLog) {
-
-    public static final Settings DEFAULT = new Settings(TrustNewIdentity.ON_FIRST_USE, false);
-}

lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java

@@ -1,208 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.api.AccountCheckException;
-import org.asamk.signal.manager.api.NotRegisteredException;
-import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.api.ServiceEnvironment;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.asamk.signal.manager.internal.AccountFileUpdaterImpl;
-import org.asamk.signal.manager.internal.ManagerImpl;
-import org.asamk.signal.manager.internal.MultiAccountManagerImpl;
-import org.asamk.signal.manager.internal.PathConfig;
-import org.asamk.signal.manager.internal.ProvisioningManagerImpl;
-import org.asamk.signal.manager.internal.RegistrationManagerImpl;
-import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.asamk.signal.manager.util.KeyUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Consumer;
-
-public class SignalAccountFiles {
-
-    private static final Logger logger = LoggerFactory.getLogger(MultiAccountManager.class);
-
-    private final PathConfig pathConfig;
-    private final ServiceEnvironment serviceEnvironment;
-    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
-    private final String userAgent;
-    private final Settings settings;
-    private final AccountsStore accountsStore;
-
-    public SignalAccountFiles(
-            final File settingsPath,
-            final ServiceEnvironment serviceEnvironment,
-            final String userAgent,
-            final Settings settings
-    ) throws IOException {
-        this.pathConfig = PathConfig.createDefault(settingsPath);
-        this.serviceEnvironment = serviceEnvironment;
-        this.serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(this.serviceEnvironment, userAgent);
-        this.userAgent = userAgent;
-        this.settings = settings;
-        this.accountsStore = new AccountsStore(pathConfig.dataPath(), serviceEnvironment, accountPath -> {
-            if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
-                return null;
-            }
-
-            try {
-                return SignalAccount.load(pathConfig.dataPath(), accountPath, false, settings);
-            } catch (Exception e) {
-                return null;
-            }
-        });
-    }
-
-    public Set<String> getAllLocalAccountNumbers() throws IOException {
-        return accountsStore.getAllNumbers();
-    }
-
-    public MultiAccountManager initMultiAccountManager() throws IOException, AccountCheckException {
-        final var managerPairs = accountsStore.getAllAccounts().parallelStream().map(a -> {
-            try {
-                return new Pair<Manager, Throwable>(initManager(a.number(), a.path()), null);
-            } catch (NotRegisteredException e) {
-                logger.warn("Ignoring {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
-                return null;
-            } catch (AccountCheckException | IOException e) {
-                logger.error("Failed to load {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
-                return new Pair<Manager, Throwable>(null, e);
-            }
-        }).filter(Objects::nonNull).toList();
-
-        for (final var pair : managerPairs) {
-            if (pair.second() instanceof IOException e) {
-                throw e;
-            } else if (pair.second() instanceof AccountCheckException e) {
-                throw e;
-            }
-        }
-
-        final var managers = managerPairs.stream().map(Pair::first).toList();
-        return new MultiAccountManagerImpl(managers, this);
-    }
-
-    public Manager initManager(String number) throws IOException, NotRegisteredException, AccountCheckException {
-        final var accountPath = accountsStore.getPathByNumber(number);
-        return this.initManager(number, accountPath);
-    }
-
-    private Manager initManager(
-            String number,
-            String accountPath
-    ) throws IOException, NotRegisteredException, AccountCheckException {
-        if (accountPath == null) {
-            throw new NotRegisteredException();
-        }
-        if (!SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
-            throw new NotRegisteredException();
-        }
-
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
-        if (!number.equals(account.getNumber())) {
-            account.close();
-            throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
-        }
-
-        if (!account.isRegistered()) {
-            account.close();
-            throw new NotRegisteredException();
-        }
-
-        if (account.getServiceEnvironment() != null && account.getServiceEnvironment() != serviceEnvironment) {
-            throw new IOException("Account is registered in another environment: " + account.getServiceEnvironment());
-        }
-
-        account.initDatabase();
-
-        final var manager = new ManagerImpl(account,
-                pathConfig,
-                new AccountFileUpdaterImpl(accountsStore, accountPath),
-                serviceEnvironmentConfig,
-                userAgent);
-
-        try {
-            manager.checkAccountState();
-        } catch (DeprecatedVersionException e) {
-            manager.close();
-            throw new AccountCheckException("signal-cli version is too old for the Signal-Server, please update.");
-        } catch (IOException e) {
-            manager.close();
-            throw new AccountCheckException("Error while checking account " + number + ": " + e.getMessage(), e);
-        }
-
-        if (account.getServiceEnvironment() == null) {
-            account.setServiceEnvironment(serviceEnvironment);
-            accountsStore.updateAccount(accountPath, account.getNumber(), account.getAci());
-        }
-
-        return manager;
-    }
-
-    public ProvisioningManager initProvisioningManager() {
-        return initProvisioningManager(null);
-    }
-
-    public ProvisioningManager initProvisioningManager(Consumer<Manager> newManagerListener) {
-        return new ProvisioningManagerImpl(pathConfig,
-                serviceEnvironmentConfig,
-                userAgent,
-                newManagerListener,
-                accountsStore);
-    }
-
-    public RegistrationManager initRegistrationManager(String number) throws IOException {
-        return initRegistrationManager(number, null);
-    }
-
-    public RegistrationManager initRegistrationManager(
-            String number,
-            Consumer<Manager> newManagerListener
-    ) throws IOException {
-        final var accountPath = accountsStore.getPathByNumber(number);
-        if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
-            final var newAccountPath = accountPath == null ? accountsStore.addAccount(number, null) : accountPath;
-            var aciIdentityKey = KeyUtils.generateIdentityKeyPair();
-            var pniIdentityKey = KeyUtils.generateIdentityKeyPair();
-
-            var profileKey = KeyUtils.createProfileKey();
-            var account = SignalAccount.create(pathConfig.dataPath(),
-                    newAccountPath,
-                    number,
-                    serviceEnvironment,
-                    aciIdentityKey,
-                    pniIdentityKey,
-                    profileKey,
-                    settings);
-            account.initDatabase();
-
-            return new RegistrationManagerImpl(account,
-                    pathConfig,
-                    serviceEnvironmentConfig,
-                    userAgent,
-                    newManagerListener,
-                    new AccountFileUpdaterImpl(accountsStore, newAccountPath));
-        }
-
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
-        if (!number.equals(account.getNumber())) {
-            account.close();
-            throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
-        }
-        account.initDatabase();
-
-        return new RegistrationManagerImpl(account,
-                pathConfig,
-                serviceEnvironmentConfig,
-                userAgent,
-                newManagerListener,
-                new AccountFileUpdaterImpl(accountsStore, accountPath));
-    }
-}

lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java

@@ -0,0 +1,198 @@
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.signal.libsignal.metadata.certificate.CertificateValidator;
+import org.signal.zkgroup.profiles.ClientZkProfileOperations;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.KeyBackupService;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.SignalServiceDataStore;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.SignalSessionLock;
+import org.whispersystems.signalservice.api.SignalWebSocket;
+import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
+import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
+import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
+import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
+import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
+
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+
+public class SignalDependencies {
+
+    private final Object LOCK = new Object();
+
+    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
+    private final String userAgent;
+    private final DynamicCredentialsProvider credentialsProvider;
+    private final SignalServiceDataStore dataStore;
+    private final ExecutorService executor;
+    private final SignalSessionLock sessionLock;
+
+    private SignalServiceAccountManager accountManager;
+    private GroupsV2Api groupsV2Api;
+    private GroupsV2Operations groupsV2Operations;
+    private ClientZkOperations clientZkOperations;
+
+    private SignalWebSocket signalWebSocket;
+    private SignalServiceMessageReceiver messageReceiver;
+    private SignalServiceMessageSender messageSender;
+
+    private KeyBackupService keyBackupService;
+    private ProfileService profileService;
+    private SignalServiceCipher cipher;
+
+    public SignalDependencies(
+            final ServiceEnvironmentConfig serviceEnvironmentConfig,
+            final String userAgent,
+            final DynamicCredentialsProvider credentialsProvider,
+            final SignalServiceDataStore dataStore,
+            final ExecutorService executor,
+            final SignalSessionLock sessionLock
+    ) {
+        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+        this.userAgent = userAgent;
+        this.credentialsProvider = credentialsProvider;
+        this.dataStore = dataStore;
+        this.executor = executor;
+        this.sessionLock = sessionLock;
+    }
+
+    public SignalServiceAccountManager getAccountManager() {
+        return getOrCreate(() -> accountManager,
+                () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                        credentialsProvider,
+                        userAgent,
+                        getGroupsV2Operations(),
+                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+    }
+
+    public GroupsV2Api getGroupsV2Api() {
+        return getOrCreate(() -> groupsV2Api, () -> groupsV2Api = getAccountManager().getGroupsV2Api());
+    }
+
+    public GroupsV2Operations getGroupsV2Operations() {
+        return getOrCreate(() -> groupsV2Operations,
+                () -> groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
+                        serviceEnvironmentConfig.getSignalServiceConfiguration())) : null);
+    }
+
+    private ClientZkOperations getClientZkOperations() {
+        return getOrCreate(() -> clientZkOperations,
+                () -> clientZkOperations = capabilities.isGv2()
+                        ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
+                        : null);
+    }
+
+    private ClientZkProfileOperations getClientZkProfileOperations() {
+        final var clientZkOperations = getClientZkOperations();
+        return clientZkOperations == null ? null : clientZkOperations.getProfileOperations();
+    }
+
+    public SignalWebSocket getSignalWebSocket() {
+        return getOrCreate(() -> signalWebSocket, () -> {
+            final var timer = new UptimeSleepTimer();
+            final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
+            final var webSocketFactory = new WebSocketFactory() {
+                @Override
+                public WebSocketConnection createWebSocket() {
+                    return new WebSocketConnection("normal",
+                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                            Optional.of(credentialsProvider),
+                            userAgent,
+                            healthMonitor);
+                }
+
+                @Override
+                public WebSocketConnection createUnidentifiedWebSocket() {
+                    return new WebSocketConnection("unidentified",
+                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                            Optional.absent(),
+                            userAgent,
+                            healthMonitor);
+                }
+            };
+            signalWebSocket = new SignalWebSocket(webSocketFactory);
+            healthMonitor.monitor(signalWebSocket);
+        });
+    }
+
+    public SignalServiceMessageReceiver getMessageReceiver() {
+        return getOrCreate(() -> messageReceiver,
+                () -> messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                        credentialsProvider,
+                        userAgent,
+                        getClientZkProfileOperations(),
+                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+    }
+
+    public SignalServiceMessageSender getMessageSender() {
+        return getOrCreate(() -> messageSender,
+                () -> messageSender = new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                        credentialsProvider,
+                        dataStore,
+                        sessionLock,
+                        userAgent,
+                        getSignalWebSocket(),
+                        Optional.absent(),
+                        getClientZkProfileOperations(),
+                        executor,
+                        ServiceConfig.MAX_ENVELOPE_SIZE,
+                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+    }
+
+    public KeyBackupService getKeyBackupService() {
+        return getOrCreate(() -> keyBackupService,
+                () -> keyBackupService = getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
+                        serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
+                        serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
+                        serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
+                        10));
+    }
+
+    public ProfileService getProfileService() {
+        return getOrCreate(() -> profileService,
+                () -> profileService = new ProfileService(getClientZkProfileOperations(),
+                        getMessageReceiver(),
+                        getSignalWebSocket()));
+    }
+
+    public SignalServiceCipher getCipher() {
+        return getOrCreate(() -> cipher, () -> {
+            final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
+            final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
+            cipher = new SignalServiceCipher(address, dataStore, sessionLock, certificateValidator);
+        });
+    }
+
+    private <T> T getOrCreate(Supplier<T> supplier, Callable creator) {
+        var value = supplier.get();
+        if (value != null) {
+            return value;
+        }
+
+        synchronized (LOCK) {
+            value = supplier.get();
+            if (value != null) {
+                return value;
+            }
+            creator.call();
+            return supplier.get();
+        }
+    }
+
+    private interface Callable {
+
+        void call();
+    }
+}

lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java

@@ -0,0 +1,196 @@
+package org.asamk.signal.manager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.libsignal.util.guava.Preconditions;
+import org.whispersystems.signalservice.api.SignalWebSocket;
+import org.whispersystems.signalservice.api.util.SleepTimer;
+import org.whispersystems.signalservice.api.websocket.HealthMonitor;
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
+import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+/**
+ * Monitors the health of the identified and unidentified WebSockets. If either one appears to be
+ * unhealthy, will trigger restarting both.
+ * <p>
+ * The monitor is also responsible for sending heartbeats/keep-alive messages to prevent
+ * timeouts.
+ */
+public final class SignalWebSocketHealthMonitor implements HealthMonitor {
+
+    private final static Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
+
+    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_TIMEOUT_SECONDS);
+    private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
+
+    private SignalWebSocket signalWebSocket;
+    private final SleepTimer sleepTimer;
+
+    private volatile KeepAliveSender keepAliveSender;
+
+    private final HealthState identified = new HealthState();
+    private final HealthState unidentified = new HealthState();
+
+    public SignalWebSocketHealthMonitor(SleepTimer sleepTimer) {
+        this.sleepTimer = sleepTimer;
+    }
+
+    public void monitor(SignalWebSocket signalWebSocket) {
+        Preconditions.checkNotNull(signalWebSocket);
+        Preconditions.checkArgument(this.signalWebSocket == null, "monitor can only be called once");
+
+        this.signalWebSocket = signalWebSocket;
+
+        //noinspection ResultOfMethodCallIgnored
+        signalWebSocket.getWebSocketState()
+                .subscribeOn(Schedulers.computation())
+                .observeOn(Schedulers.computation())
+                .distinctUntilChanged()
+                .subscribe(s -> onStateChange(s, identified));
+
+        //noinspection ResultOfMethodCallIgnored
+        signalWebSocket.getUnidentifiedWebSocketState()
+                .subscribeOn(Schedulers.computation())
+                .observeOn(Schedulers.computation())
+                .distinctUntilChanged()
+                .subscribe(s -> onStateChange(s, unidentified));
+    }
+
+    private synchronized void onStateChange(WebSocketConnectionState connectionState, HealthState healthState) {
+        switch (connectionState) {
+            case CONNECTED -> logger.debug("WebSocket is now connected");
+            case AUTHENTICATION_FAILED -> logger.debug("WebSocket authentication failed");
+            case FAILED -> logger.debug("WebSocket connection failed");
+        }
+
+        healthState.needsKeepAlive = connectionState == WebSocketConnectionState.CONNECTED;
+
+        if (keepAliveSender == null && isKeepAliveNecessary()) {
+            keepAliveSender = new KeepAliveSender();
+            keepAliveSender.start();
+        } else if (keepAliveSender != null && !isKeepAliveNecessary()) {
+            keepAliveSender.shutdown();
+            keepAliveSender = null;
+        }
+    }
+
+    @Override
+    public void onKeepAliveResponse(long sentTimestamp, boolean isIdentifiedWebSocket) {
+        if (isIdentifiedWebSocket) {
+            identified.lastKeepAliveReceived = System.currentTimeMillis();
+        } else {
+            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
+        }
+    }
+
+    @Override
+    public void onMessageError(int status, boolean isIdentifiedWebSocket) {
+        if (status == 409) {
+            HealthState healthState = (isIdentifiedWebSocket ? identified : unidentified);
+            if (healthState.mismatchErrorTracker.addSample(System.currentTimeMillis())) {
+                logger.warn("Received too many mismatch device errors, forcing new websockets.");
+                signalWebSocket.forceNewWebSockets();
+                signalWebSocket.connect();
+            }
+        }
+    }
+
+    private boolean isKeepAliveNecessary() {
+        return identified.needsKeepAlive || unidentified.needsKeepAlive;
+    }
+
+    private static class HealthState {
+
+        private final HttpErrorTracker mismatchErrorTracker = new HttpErrorTracker(5, TimeUnit.MINUTES.toMillis(1));
+
+        private volatile boolean needsKeepAlive;
+        private volatile long lastKeepAliveReceived;
+    }
+
+    /**
+     * Sends periodic heartbeats/keep-alives over both WebSockets to prevent connection timeouts. If
+     * either WebSocket fails 3 times to get a return heartbeat both are forced to be recreated.
+     */
+    private class KeepAliveSender extends Thread {
+
+        private volatile boolean shouldKeepRunning = true;
+
+        public void run() {
+            identified.lastKeepAliveReceived = System.currentTimeMillis();
+            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
+
+            while (shouldKeepRunning && isKeepAliveNecessary()) {
+                try {
+                    sleepTimer.sleep(KEEP_ALIVE_SEND_CADENCE);
+
+                    if (shouldKeepRunning && isKeepAliveNecessary()) {
+                        long keepAliveRequiredSinceTime = System.currentTimeMillis()
+                                - MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE;
+
+                        if (identified.lastKeepAliveReceived < keepAliveRequiredSinceTime
+                                || unidentified.lastKeepAliveReceived < keepAliveRequiredSinceTime) {
+                            logger.warn("Missed keep alives, identified last: "
+                                    + identified.lastKeepAliveReceived
+                                    + " unidentified last: "
+                                    + unidentified.lastKeepAliveReceived
+                                    + " needed by: "
+                                    + keepAliveRequiredSinceTime);
+                            signalWebSocket.forceNewWebSockets();
+                            signalWebSocket.connect();
+                        } else {
+                            signalWebSocket.sendKeepAlive();
+                        }
+                    }
+                } catch (Throwable e) {
+                    logger.warn("Error occured in KeepAliveSender, ignoring ...", e);
+                }
+            }
+        }
+
+        public void shutdown() {
+            shouldKeepRunning = false;
+        }
+    }
+
+    private final static class HttpErrorTracker {
+
+        private final long[] timestamps;
+        private final long errorTimeRange;
+
+        public HttpErrorTracker(int samples, long errorTimeRange) {
+            this.timestamps = new long[samples];
+            this.errorTimeRange = errorTimeRange;
+        }
+
+        public synchronized boolean addSample(long now) {
+            long errorsMustBeAfter = now - errorTimeRange;
+            int count = 1;
+            int minIndex = 0;
+
+            for (int i = 0; i < timestamps.length; i++) {
+                if (timestamps[i] < errorsMustBeAfter) {
+                    timestamps[i] = 0;
+                } else if (timestamps[i] != 0) {
+                    count++;
+                }
+
+                if (timestamps[i] < timestamps[minIndex]) {
+                    minIndex = i;
+                }
+            }
+
+            timestamps[minIndex] = now;
+
+            if (count >= timestamps.length) {
+                Arrays.fill(timestamps, 0);
+                return true;
+            }
+            return false;
+        }
+    }
+}

lib/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java

@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
 public class StickerPackInvalidException extends Exception {
 

lib/src/main/java/org/asamk/signal/manager/StickerPackStore.java

@@ -1,16 +1,13 @@
-package org.asamk.signal.manager.storage.stickerPacks;
+package org.asamk.signal.manager;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.storage.stickers.StickerPackId;
 import org.asamk.signal.manager.util.IOUtils;
-import org.asamk.signal.manager.util.Utils;
-import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -29,22 +26,8 @@ public class StickerPackStore {
         return getStickerPackManifestFile(stickerPackId).exists();
     }
 
-    public JsonStickerPack retrieveManifest(StickerPackId stickerPackId) throws IOException {
-        try (final var inputStream = new FileInputStream(getStickerPackManifestFile(stickerPackId))) {
-            return new ObjectMapper().readValue(inputStream, JsonStickerPack.class);
-        }
-    }
-
-    public StreamDetails retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
-        final var stickerFile = getStickerPackStickerFile(stickerPackId, stickerId);
-        if (!stickerFile.exists()) {
-            return null;
-        }
-        return Utils.createStreamDetailsFromFile(stickerFile);
-    }
-
     public void storeManifest(StickerPackId stickerPackId, JsonStickerPack manifest) throws IOException {
-        try (final var output = new FileOutputStream(getStickerPackManifestFile(stickerPackId))) {
+        try (OutputStream output = new FileOutputStream(getStickerPackManifestFile(stickerPackId))) {
             try (var writer = new BufferedWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8))) {
                 new ObjectMapper().writeValue(writer, manifest);
             }
@@ -53,7 +36,7 @@ public class StickerPackStore {
 
     public void storeSticker(StickerPackId stickerPackId, int stickerId, StickerStorer storer) throws IOException {
         createStickerPackDir(stickerPackId);
-        try (final var output = new FileOutputStream(getStickerPackStickerFile(stickerPackId, stickerId))) {
+        try (OutputStream output = new FileOutputStream(getStickerPackStickerFile(stickerPackId, stickerId))) {
             storer.store(output);
         }
     }

lib/src/main/java/org/asamk/signal/manager/TrustLevel.java

@@ -1,6 +1,7 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 
 public enum TrustLevel {
     UNTRUSTED,
@@ -16,6 +17,15 @@ public enum TrustLevel {
         return TrustLevel.cachedValues[i];
     }
 
+    public static TrustLevel fromIdentityState(ContactRecord.IdentityState identityState) {
+        return switch (identityState) {
+            case DEFAULT -> TRUSTED_UNVERIFIED;
+            case UNVERIFIED -> UNTRUSTED;
+            case VERIFIED -> TRUSTED_VERIFIED;
+            case UNRECOGNIZED -> null;
+        };
+    }
+
     public static TrustLevel fromVerifiedState(VerifiedMessage.VerifiedState verifiedState) {
         return switch (verifiedState) {
             case DEFAULT -> TRUSTED_UNVERIFIED;
@@ -31,11 +41,4 @@ public enum TrustLevel {
             case TRUSTED_VERIFIED -> VerifiedMessage.VerifiedState.VERIFIED;
         };
     }
-
-    public boolean isTrusted() {
-        return switch (this) {
-            case TRUSTED_UNVERIFIED, TRUSTED_VERIFIED -> true;
-            case UNTRUSTED -> false;
-        };
-    }
 }

lib/src/main/java/org/asamk/signal/manager/UntrustedIdentityException.java

@@ -1,4 +1,6 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 public class UntrustedIdentityException extends Exception {
 

lib/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java

@@ -1,13 +1,13 @@
-package org.asamk.signal.manager.api;
+package org.asamk.signal.manager;
 
 import java.io.File;
 
-public class UserAlreadyExistsException extends Exception {
+public class UserAlreadyExists extends Exception {
 
     private final String number;
     private final File fileName;
 
-    public UserAlreadyExistsException(String number, File fileName) {
+    public UserAlreadyExists(String number, File fileName) {
         this.number = number;
         this.fileName = fileName;
     }

lib/src/main/java/org/asamk/signal/manager/actions/HandleAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public interface HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/RefreshPreKeysAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class RefreshPreKeysAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java

@@ -1,25 +1,22 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.whispersystems.signalservice.api.push.ServiceId;
 
 public class RenewSessionAction implements HandleAction {
 
     private final RecipientId recipientId;
-    private final ServiceId serviceId;
-    private final ServiceId accountId;
 
-    public RenewSessionAction(final RecipientId recipientId, final ServiceId serviceId, final ServiceId accountId) {
+    public RenewSessionAction(final RecipientId recipientId) {
         this.recipientId = recipientId;
-        this.serviceId = serviceId;
-        this.accountId = accountId;
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
-        context.getSendHelper().sendNullMessage(recipientId);
+        context.getAccount().getSessionStore().archiveSessions(recipientId);
+        if (!recipientId.equals(context.getAccount().getSelfRecipientId())) {
+            context.getSendHelper().sendNullMessage(recipientId);
+        }
     }
 
     @Override

lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java

@@ -1,44 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
-
-import java.util.Objects;
-
-public class ResendMessageAction implements HandleAction {
-
-    private final RecipientId recipientId;
-    private final long timestamp;
-    private final MessageSendLogEntry messageSendLogEntry;
-
-    public ResendMessageAction(
-            final RecipientId recipientId,
-            final long timestamp,
-            final MessageSendLogEntry messageSendLogEntry
-    ) {
-        this.recipientId = recipientId;
-        this.timestamp = timestamp;
-        this.messageSendLogEntry = messageSendLogEntry;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getSendHelper().resendMessage(recipientId, timestamp, messageSendLogEntry);
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final ResendMessageAction that = (ResendMessageAction) o;
-        return timestamp == that.timestamp
-                && recipientId.equals(that.recipientId)
-                && messageSendLogEntry.equals(that.messageSendLogEntry);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(recipientId, timestamp, messageSendLogEntry);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/actions/RetrieveProfileAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 public class RetrieveProfileAction implements HandleAction {

lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java

@@ -0,0 +1,26 @@
+package org.asamk.signal.manager.actions;
+
+import org.asamk.signal.manager.jobs.Context;
+
+public class RetrieveStorageDataAction implements HandleAction {
+
+    private static final RetrieveStorageDataAction INSTANCE = new RetrieveStorageDataAction();
+
+    private RetrieveStorageDataAction() {
+    }
+
+    public static RetrieveStorageDataAction create() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void execute(Context context) throws Throwable {
+        if (context.getAccount().getStorageKey() != null) {
+            context.getStorageHelper().readDataFromStorage();
+        } else {
+            if (!context.getAccount().isMasterDevice()) {
+                context.getSyncHelper().requestAllSyncData();
+            }
+        }
+    }
+}

lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java

@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.api.GroupIdV1;
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 public class SendGroupInfoAction implements HandleAction {

lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java

@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.api.GroupIdV1;
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 public class SendGroupInfoRequestAction implements HandleAction {

lib/src/main/java/org/asamk/signal/manager/actions/SendProfileKeyAction.java

@@ -1,33 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-
-import java.util.Objects;
-
-public class SendProfileKeyAction implements HandleAction {
-
-    private final RecipientId recipientId;
-
-    public SendProfileKeyAction(final RecipientId recipientId) {
-        this.recipientId = recipientId;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getSendHelper().sendProfileKey(recipientId);
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final SendProfileKeyAction that = (SendProfileKeyAction) o;
-        return recipientId.equals(that.recipientId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(recipientId);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java

@@ -1,8 +1,7 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,24 +10,16 @@ import java.util.Objects;
 public class SendReceiptAction implements HandleAction {
 
     private final RecipientId recipientId;
-    private final SignalServiceReceiptMessage.Type type;
     private final List<Long> timestamps = new ArrayList<>();
 
-    public SendReceiptAction(
-            final RecipientId recipientId,
-            final SignalServiceReceiptMessage.Type type,
-            final long timestamp
-    ) {
+    public SendReceiptAction(final RecipientId recipientId, final long timestamp) {
         this.recipientId = recipientId;
-        this.type = type;
         this.timestamps.add(timestamp);
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        final var receiptMessage = new SignalServiceReceiptMessage(type, timestamps, System.currentTimeMillis());
-
-        context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
+        context.getSendHelper().sendDeliveryReceipt(recipientId, timestamps);
     }
 
     @Override
@@ -43,13 +34,13 @@ public class SendReceiptAction implements HandleAction {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         final SendReceiptAction that = (SendReceiptAction) o;
-        // Using only recipientId and type here on purpose
-        return recipientId.equals(that.recipientId) && type == that.type;
+        // Using only recipientId here on purpose
+        return recipientId.equals(that.recipientId);
     }
 
     @Override
     public int hashCode() {
-        // Using only recipientId and type here on purpose
-        return Objects.hash(recipientId, type);
+        // Using only recipientId here on purpose
+        return Objects.hash(recipientId);
     }
 }

lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java

@@ -1,15 +1,14 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.jobs.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.ProtocolException;
-import org.signal.libsignal.protocol.message.CiphertextMessage;
-import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
+import org.whispersystems.libsignal.protocol.CiphertextMessage;
+import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
+import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.internal.push.Envelope;
-
-import java.util.Optional;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 public class SendRetryMessageRequestAction implements HandleAction {
 
@@ -29,9 +28,11 @@ public class SendRetryMessageRequestAction implements HandleAction {
 
     @Override
     public void execute(Context context) throws Throwable {
+        context.getAccount().getSessionStore().archiveSessions(recipientId);
+
         int senderDevice = protocolException.getSenderDevice();
         Optional<GroupId> groupId = protocolException.getGroupId().isPresent() ? Optional.of(GroupId.unknownVersion(
-                protocolException.getGroupId().get())) : Optional.empty();
+                protocolException.getGroupId().get())) : Optional.absent();
 
         byte[] originalContent;
         int envelopeType;
@@ -41,9 +42,7 @@ public class SendRetryMessageRequestAction implements HandleAction {
             envelopeType = messageContent.getType();
         } else {
             originalContent = envelope.getContent();
-            envelopeType = envelope.getType() == null
-                    ? CiphertextMessage.WHISPER_TYPE
-                    : envelopeTypeToCiphertextMessageType(envelope.getType());
+            envelopeType = envelopeTypeToCiphertextMessageType(envelope.getType());
         }
 
         DecryptionErrorMessage decryptionErrorMessage = DecryptionErrorMessage.forOriginalMessage(originalContent,
@@ -55,14 +54,10 @@ public class SendRetryMessageRequestAction implements HandleAction {
     }
 
     private static int envelopeTypeToCiphertextMessageType(int envelopeType) {
-        final var type = Envelope.Type.fromValue(envelopeType);
-        if (type == null) {
-            return CiphertextMessage.WHISPER_TYPE;
-        }
-        return switch (type) {
-            case PREKEY_BUNDLE -> CiphertextMessage.PREKEY_TYPE;
-            case UNIDENTIFIED_SENDER -> CiphertextMessage.SENDERKEY_TYPE;
-            case PLAINTEXT_CONTENT -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
+        return switch (envelopeType) {
+            case SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE -> CiphertextMessage.PREKEY_TYPE;
+            case SignalServiceProtos.Envelope.Type.UNIDENTIFIED_SENDER_VALUE -> CiphertextMessage.SENDERKEY_TYPE;
+            case SignalServiceProtos.Envelope.Type.PLAINTEXT_CONTENT_VALUE -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
             default -> CiphertextMessage.WHISPER_TYPE;
         };
     }

lib/src/main/java/org/asamk/signal/manager/actions/SendSyncBlockedListAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class SendSyncBlockedListAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/SendSyncConfigurationAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class SendSyncConfigurationAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/SendSyncContactsAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class SendSyncContactsAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/SendSyncGroupsAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class SendSyncGroupsAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/SendSyncKeysAction.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Context;
 
 public class SendSyncKeysAction implements HandleAction {
 

lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java

@@ -1,21 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-import org.asamk.signal.manager.jobs.SyncStorageJob;
-
-public class SyncStorageDataAction implements HandleAction {
-
-    private static final SyncStorageDataAction INSTANCE = new SyncStorageDataAction();
-
-    private SyncStorageDataAction() {
-    }
-
-    public static SyncStorageDataAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getJobExecutor().enqueueJob(new SyncStorageJob());
-    }
-}

lib/src/main/java/org/asamk/signal/manager/actions/UpdateAccountAttributesAction.java

@@ -1,20 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-
-public class UpdateAccountAttributesAction implements HandleAction {
-
-    private static final UpdateAccountAttributesAction INSTANCE = new UpdateAccountAttributesAction();
-
-    private UpdateAccountAttributesAction() {
-    }
-
-    public static UpdateAccountAttributesAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getAccountHelper().updateAccountAttributes();
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/AccountCheckException.java

@@ -1,12 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public class AccountCheckException extends Exception {
-
-    public AccountCheckException(String message) {
-        super(message);
-    }
-
-    public AccountCheckException(String message, Exception e) {
-        super(message, e);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java

@@ -1,12 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public class AlreadyReceivingException extends Exception {
-
-    public AlreadyReceivingException(String message) {
-        super(message);
-    }
-
-    public AlreadyReceivingException(String message, Exception e) {
-        super(message, e);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java

@@ -1,16 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public class CaptchaRejectedException extends Exception {
-
-    public CaptchaRejectedException() {
-        super("Captcha rejected");
-    }
-
-    public CaptchaRejectedException(final String message) {
-        super(message);
-    }
-
-    public CaptchaRejectedException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java

@@ -2,13 +2,6 @@ package org.asamk.signal.manager.api;
 
 public class CaptchaRequiredException extends Exception {
 
-    private long nextAttemptTimestamp;
-
-    public CaptchaRequiredException(final long nextAttemptTimestamp) {
-        super("Captcha required");
-        this.nextAttemptTimestamp = nextAttemptTimestamp;
-    }
-
     public CaptchaRequiredException(final String message) {
         super(message);
     }
@@ -16,8 +9,4 @@ public class CaptchaRequiredException extends Exception {
     public CaptchaRequiredException(final String message, final Throwable cause) {
         super(message, cause);
     }
-
-    public long getNextAttemptTimestamp() {
-        return nextAttemptTimestamp;
-    }
 }

lib/src/main/java/org/asamk/signal/manager/api/Color.java

@@ -1,24 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public record Color(int color) {
-
-    public int alpha() {
-        return color >>> 24;
-    }
-
-    public int red() {
-        return (color >> 16) & 0xFF;
-    }
-
-    public int green() {
-        return (color >> 8) & 0xFF;
-    }
-
-    public int blue() {
-        return color & 0xFF;
-    }
-
-    public String toHexColor() {
-        return String.format("#%08x", color);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/Configuration.java

@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
-
 import java.util.Optional;
 
 public record Configuration(
@@ -9,12 +7,4 @@ public record Configuration(
         Optional<Boolean> unidentifiedDeliveryIndicators,
         Optional<Boolean> typingIndicators,
         Optional<Boolean> linkPreviews
-) {
-
-    public static Configuration from(final ConfigurationStore configurationStore) {
-        return new Configuration(Optional.ofNullable(configurationStore.getReadReceipts()),
-                Optional.ofNullable(configurationStore.getUnidentifiedDeliveryIndicators()),
-                Optional.ofNullable(configurationStore.getTypingIndicators()),
-                Optional.ofNullable(configurationStore.getLinkPreviews()));
-    }
-}
+) {}

lib/src/main/java/org/asamk/signal/manager/api/Contact.java

@@ -1,193 +0,0 @@
-package org.asamk.signal.manager.api;
-
-import org.whispersystems.signalservice.internal.util.Util;
-
-public record Contact(
-        String givenName,
-        String familyName,
-        String nickName,
-        String nickNameGivenName,
-        String nickNameFamilyName,
-        String note,
-        String color,
-        int messageExpirationTime,
-        int messageExpirationTimeVersion,
-        long muteUntil,
-        boolean hideStory,
-        boolean isBlocked,
-        boolean isArchived,
-        boolean isProfileSharingEnabled,
-        boolean isHidden,
-        Long unregisteredTimestamp
-) {
-
-    private Contact(final Builder builder) {
-        this(builder.givenName,
-                builder.familyName,
-                builder.nickName,
-                builder.nickNameGivenName,
-                builder.nickNameFamilyName,
-                builder.note,
-                builder.color,
-                builder.messageExpirationTime,
-                builder.messageExpirationTimeVersion,
-                builder.muteUntil,
-                builder.hideStory,
-                builder.isBlocked,
-                builder.isArchived,
-                builder.isProfileSharingEnabled,
-                builder.isHidden,
-                builder.unregisteredTimestamp);
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    public static Builder newBuilder(final Contact copy) {
-        Builder builder = new Builder();
-        builder.givenName = copy.givenName();
-        builder.familyName = copy.familyName();
-        builder.nickName = copy.nickName();
-        builder.nickNameGivenName = copy.nickNameGivenName();
-        builder.nickNameFamilyName = copy.nickNameFamilyName();
-        builder.note = copy.note();
-        builder.color = copy.color();
-        builder.messageExpirationTime = copy.messageExpirationTime();
-        builder.messageExpirationTimeVersion = copy.messageExpirationTimeVersion();
-        builder.muteUntil = copy.muteUntil();
-        builder.hideStory = copy.hideStory();
-        builder.isBlocked = copy.isBlocked();
-        builder.isArchived = copy.isArchived();
-        builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
-        builder.isHidden = copy.isHidden();
-        builder.unregisteredTimestamp = copy.unregisteredTimestamp();
-        return builder;
-    }
-
-    public String getName() {
-        final var noGivenName = Util.isEmpty(givenName);
-        final var noFamilyName = Util.isEmpty(familyName);
-
-        if (noGivenName && noFamilyName) {
-            return "";
-        } else if (noGivenName) {
-            return familyName;
-        } else if (noFamilyName) {
-            return givenName;
-        }
-
-        return givenName + " " + familyName;
-    }
-
-    public static final class Builder {
-
-        private String givenName;
-        private String familyName;
-        private String nickName;
-        private String nickNameGivenName;
-        private String nickNameFamilyName;
-        private String note;
-        private String color;
-        private int messageExpirationTime;
-        private int messageExpirationTimeVersion = 1;
-        private long muteUntil;
-        private boolean hideStory;
-        private boolean isBlocked;
-        private boolean isArchived;
-        private boolean isProfileSharingEnabled;
-        private boolean isHidden;
-        private Long unregisteredTimestamp;
-
-        private Builder() {
-        }
-
-        public static Builder newBuilder() {
-            return new Builder();
-        }
-
-        public Builder withGivenName(final String val) {
-            givenName = val;
-            return this;
-        }
-
-        public Builder withFamilyName(final String val) {
-            familyName = val;
-            return this;
-        }
-
-        public Builder withNickName(final String val) {
-            nickName = val;
-            return this;
-        }
-
-        public Builder withNickNameGivenName(final String val) {
-            nickNameGivenName = val;
-            return this;
-        }
-
-        public Builder withNickNameFamilyName(final String val) {
-            nickNameFamilyName = val;
-            return this;
-        }
-
-        public Builder withNote(final String val) {
-            note = val;
-            return this;
-        }
-
-        public Builder withColor(final String val) {
-            color = val;
-            return this;
-        }
-
-        public Builder withMessageExpirationTime(final int val) {
-            messageExpirationTime = val;
-            return this;
-        }
-
-        public Builder withMessageExpirationTimeVersion(final int val) {
-            messageExpirationTimeVersion = val;
-            return this;
-        }
-
-        public Builder withMuteUntil(final long val) {
-            muteUntil = val;
-            return this;
-        }
-
-        public Builder withHideStory(final boolean val) {
-            hideStory = val;
-            return this;
-        }
-
-        public Builder withIsBlocked(final boolean val) {
-            isBlocked = val;
-            return this;
-        }
-
-        public Builder withIsArchived(final boolean val) {
-            isArchived = val;
-            return this;
-        }
-
-        public Builder withIsProfileSharingEnabled(final boolean val) {
-            isProfileSharingEnabled = val;
-            return this;
-        }
-
-        public Builder withIsHidden(final boolean val) {
-            isHidden = val;
-            return this;
-        }
-
-        public Builder withUnregisteredTimestamp(final Long val) {
-            unregisteredTimestamp = val;
-            return this;
-        }
-
-        public Contact build() {
-            return new Contact(this);
-        }
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/Device.java

@@ -1,3 +1,3 @@
 package org.asamk.signal.manager.api;
 
-public record Device(int id, String name, long created, long lastSeen, boolean isThisDevice) {}
+public record Device(long id, String name, long created, long lastSeen, boolean isThisDevice) {}

lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java

@@ -1,12 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public class DeviceLimitExceededException extends Exception {
-
-    public DeviceLimitExceededException(final String message) {
-        super(message);
-    }
-
-    public DeviceLimitExceededException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/Group.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.helper.RecipientAddressResolver;
-import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public record Group(
         GroupId groupId,
@@ -16,7 +16,6 @@ public record Group(
         Set<RecipientAddress> pendingMembers,
         Set<RecipientAddress> requestingMembers,
         Set<RecipientAddress> adminMembers,
-        Set<RecipientAddress> bannedMembers,
         boolean isBlocked,
         int messageExpirationTimer,
         GroupPermission permissionAddMember,
@@ -24,48 +23,4 @@ public record Group(
         GroupPermission permissionSendMessage,
         boolean isMember,
         boolean isAdmin
-) {
-
-    public static Group from(
-            final GroupInfo groupInfo,
-            final RecipientAddressResolver recipientStore,
-            final RecipientId selfRecipientId
-    ) {
-        return new Group(groupInfo.getGroupId(),
-                groupInfo.getTitle(),
-                groupInfo.getDescription(),
-                groupInfo.getGroupInviteLink(),
-                groupInfo.getMembers()
-                        .stream()
-                        .map(recipientStore::resolveRecipientAddress)
-                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
-                        .collect(Collectors.toSet()),
-                groupInfo.getPendingMembers()
-                        .stream()
-                        .map(recipientStore::resolveRecipientAddress)
-                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
-                        .collect(Collectors.toSet()),
-                groupInfo.getRequestingMembers()
-                        .stream()
-                        .map(recipientStore::resolveRecipientAddress)
-                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
-                        .collect(Collectors.toSet()),
-                groupInfo.getAdminMembers()
-                        .stream()
-                        .map(recipientStore::resolveRecipientAddress)
-                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
-                        .collect(Collectors.toSet()),
-                groupInfo.getBannedMembers()
-                        .stream()
-                        .map(recipientStore::resolveRecipientAddress)
-                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
-                        .collect(Collectors.toSet()),
-                groupInfo.isBlocked(),
-                groupInfo.getMessageExpirationTimer(),
-                groupInfo.getPermissionAddMember(),
-                groupInfo.getPermissionEditDetails(),
-                groupInfo.getPermissionSendMessage(),
-                groupInfo.isMember(selfRecipientId),
-                groupInfo.isAdmin(selfRecipientId));
-    }
-}
+) {}

lib/src/main/java/org/asamk/signal/manager/api/Identity.java

@@ -1,10 +1,21 @@
 package org.asamk.signal.manager.api;
 
+import org.asamk.signal.manager.TrustLevel;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.whispersystems.libsignal.IdentityKey;
+
+import java.util.Date;
+
 public record Identity(
         RecipientAddress recipient,
-        byte[] fingerprint,
+        IdentityKey identityKey,
         String safetyNumber,
         byte[] scannableSafetyNumber,
         TrustLevel trustLevel,
-        long dateAddedTimestamp
-) {}
+        Date dateAdded
+) {
+
+    public byte[] getFingerprint() {
+        return identityKey.getPublicKey().serialize();
+    }
+}

lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java

@@ -1,28 +0,0 @@
-package org.asamk.signal.manager.api;
-
-import org.signal.libsignal.protocol.util.Hex;
-
-import java.util.Base64;
-import java.util.Locale;
-
-public sealed interface IdentityVerificationCode {
-
-    record Fingerprint(byte[] fingerprint) implements IdentityVerificationCode {}
-
-    record SafetyNumber(String safetyNumber) implements IdentityVerificationCode {}
-
-    record ScannableSafetyNumber(byte[] safetyNumber) implements IdentityVerificationCode {}
-
-    static IdentityVerificationCode parse(String code) throws Exception {
-        code = code.replaceAll(" ", "");
-        if (code.length() == 66) {
-            final var fingerprintBytes = Hex.fromStringCondensed(code.toLowerCase(Locale.ROOT));
-            return new Fingerprint(fingerprintBytes);
-        } else if (code.length() == 60) {
-            return new SafetyNumber(code);
-        } else {
-            final var scannableSafetyNumber = Base64.getDecoder().decode(code);
-            return new ScannableSafetyNumber(scannableSafetyNumber);
-        }
-    }
-}

lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java

@@ -2,10 +2,6 @@ package org.asamk.signal.manager.api;
 
 public class InvalidNumberException extends Exception {
 
-    public InvalidNumberException(String message) {
-        super(message);
-    }
-
     InvalidNumberException(String message, Throwable e) {
         super(message, e);
     }