diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 772ab452..eea562ed 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -24,7 +24,7 @@ concurrency: cancel-in-progress: false jobs: - release: + build: runs-on: ubuntu-latest permissions: contents: write @@ -32,6 +32,14 @@ jobs: env: RELEASE_REF: ${{ inputs.release_ref || 'master' }} + outputs: + version_name: ${{ steps.version.outputs.version_name }} + version_code: ${{ steps.version.outputs.version_code }} + tag_name: ${{ steps.version.outputs.tag_name }} + apk_release_path: ${{ steps.release_artifact.outputs.apk_release_path }} + apk_fdroid_path: ${{ steps.fdroid_artifact.outputs.apk_fdroid_path }} + checksums_path: ${{ steps.checksums.outputs.checksums_path }} + steps: - name: Checkout source uses: actions/checkout@v4 @@ -113,17 +121,18 @@ jobs: run: | set -euo pipefail python3 <<'PY' - import os - import pathlib - import re - + import os, pathlib, re gradle = pathlib.Path("presentation/build.gradle").read_text() code_match = re.search(r"^\s*versionCode\s+(\d+)", gradle, re.MULTILINE) name_match = re.search(r"^\s*versionName\s+['\"]([\d\.]+)['\"]", gradle, re.MULTILINE) if not code_match or not name_match: raise SystemExit("Unable to read versionCode/versionName from presentation/build.gradle") out = pathlib.Path(os.environ["GITHUB_OUTPUT"]) - out.write_text(f"version_code={code_match.group(1)}\nversion_name={name_match.group(1)}\ntag_name=v{name_match.group(1)}\n") + out.write_text( + f"version_code={code_match.group(1)}\n" + f"version_name={name_match.group(1)}\n" + f"tag_name=v{name_match.group(1)}\n" + ) PY - name: Validate Gradle Wrapper @@ -165,58 +174,35 @@ jobs: find . -name '*.apk' -type f -exec sha256sum {} \; > checksums.txt echo "checksums_path=checksums.txt" >> "$GITHUB_OUTPUT" - - name: Generate release notes - id: notes - uses: actions/github-script@v7 + - name: Upload all build outputs + uses: actions/upload-artifact@v4 with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - npm install semver - - const semver = require('semver'); - const tagName = 'v${{ steps.version.outputs.version_name }}'; - const {owner, repo} = context.repo; + name: build-artifacts + path: | + ${{ steps.release_artifact.outputs.apk_release_path }} + ${{ steps.fdroid_artifact.outputs.apk_fdroid_path }} + ${{ steps.checksums.outputs.checksums_path }} - const {data: tags} = await github.rest.repos.listTags({ - owner, - repo, - per_page: 100, - }); + generate_release_notes: + needs: build + uses: ./.github/workflows/generate-release-notes.yml + with: + release_ref: ${{ inputs.release_ref || 'master' }} + version_name: ${{ needs.build.outputs.version_name }} - const currentVersion = semver.parse(tagName); - - const previousTag = tags - .map(t => t.name) - .filter(name => semver.valid(name) && semver.lt(name, currentVersion)) - .sort(semver.rcompare)[0]; - - const payload = { - owner, - repo, - tag_name: tagName, - target_commitish: '${{ env.RELEASE_REF }}', - }; - - if (previousTag) { - payload.previous_tag_name = previousTag; - } - - const response = await github.request('POST /repos/{owner}/{repo}/releases/generate-notes', payload); - const notes = response.data.body || ''; - core.setOutput('release_notes', notes); + publish: + needs: [build, generate_release_notes] + runs-on: ubuntu-latest + steps: - name: Sanitize release notes id: clean_notes - shell: bash env: - NOTES: ${{ steps.notes.outputs.release_notes }} + NOTES: ${{ needs.generate_release_notes.outputs.release_notes }} run: | set -euo pipefail python3 <<'PY' - import os - import pathlib - import re - + import os, re, pathlib notes = os.environ.get("NOTES", "") clean = re.sub(r'(?> "$GITHUB_OUTPUT" + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: build-artifacts + path: downloaded/ + - name: Publish GitHub release uses: softprops/action-gh-release@v2 with: - tag_name: ${{ steps.version.outputs.tag_name }} - name: QUIK v${{ steps.version.outputs.version_name }} + tag_name: ${{ needs.build.outputs.tag_name }} + name: QUIK v${{ needs.build.outputs.version_name }} draft: ${{ inputs.publish_release != true }} prerelease: ${{ inputs.prerelease }} body: ${{ steps.clean_notes.outputs.clean_notes }} files: | - ${{ steps.release_artifact.outputs.apk_release_path }} - ${{ steps.fdroid_artifact.outputs.apk_fdroid_path }} - ${{ steps.checksums.outputs.checksums_path }} + downloaded/**/*.apk + downloaded/*.txt fail_on_unmatched_files: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -251,16 +242,14 @@ jobs: - name: Update F-Droid repo contents env: - APK_PATH: ${{ steps.artifact.outputs.apk_path }} - VERSION_NAME: ${{ steps.version.outputs.version_name }} - VERSION_CODE: ${{ steps.version.outputs.version_code }} + APK_PATH: ${{ needs.build.outputs.apk_release_path }} + VERSION_NAME: ${{ needs.build.outputs.version_name }} + VERSION_CODE: ${{ needs.build.outputs.version_code }} run: | set -euo pipefail - mkdir -p repo target_apk="repo/dev.octoshrimpy.quik_${VERSION_CODE}.apk" cp "$APK_PATH" "$target_apk" - fdroid update --config config.yml --pretty - name: Publish F-Droid repo to GitHub Pages diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml new file mode 100644 index 00000000..36ba3218 --- /dev/null +++ b/.github/workflows/generate-release-notes.yml @@ -0,0 +1,80 @@ +name: Generate Release Notes + +on: + workflow_dispatch: + inputs: ¬e_inputs + release_ref: + description: Branch or tag to build from + required: false + default: master + type: string + version_name: + required: true + type: string + workflow_call: + inputs: *note_inputs + outputs: + release_notes: + description: Generated release notes + value: ${{ jobs.Generate.outputs.release_notes }} + +jobs: + Generate: + outputs: + release_notes: ${{ steps.notes.outputs.release_notes }} + runs-on: ubuntu-latest + env: + RELEASE_REF: ${{ inputs.release_ref || 'master' }} + steps: + - name: Checkout source + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ env.RELEASE_REF }} + + - name: Install Dependencies + run: npm install semver@7 + + - name: Generate Release Notes + id: notes + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const semver = require('semver'); + const releaseName = 'v${{ inputs.version_name }}'; + const { owner, repo } = context.repo; + + const { data: releases } = await github.rest.repos.listReleases({ + owner, + repo, + per_page: 100, + }); + + const currentVersion = semver.parse('${{ inputs.version_name }}'); + + const previousReleaseTag = releases + .filter(r => !r.draft && !r.prerelease) + .map(r => r.tag_name) + .filter(tag => semver.valid(tag) && semver.lt(tag, currentVersion)) + .sort(semver.rcompare)[0]; + + const payload = { + owner, + repo, + tag_name: releaseName, + target_commitish: '${{ env.RELEASE_REF }}', + }; + + if (previousReleaseTag) { + payload.previous_tag_name = previousReleaseTag; + } + + const response = await github.request( + 'POST /repos/{owner}/{repo}/releases/generate-notes', + payload + ); + + const notes = response.data.body || ''; + core.exportVariable('RELEASE_NOTES', notes); + core.setOutput('release_notes', notes); diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 85b1cb8e..7501badd 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -18,6 +18,10 @@ jobs: env: GRADLE_FILE: presentation/build.gradle + outputs: + new_version_name: ${{ steps.bump.outputs.new_version_name }} + new_version_code: ${{ steps.bump.outputs.new_version_code }} + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -84,61 +88,145 @@ jobs: gradle_file.write_text(content) - github_env = pathlib.Path(os.environ["GITHUB_ENV"]) - with github_env.open("a") as env_file: - env_file.write(f"NEW_VERSION_NAME={new_name}\n") - env_file.write(f"NEW_VERSION_CODE={new_code}\n") + github_output = pathlib.Path(os.environ["GITHUB_OUTPUT"]) + with github_output.open("a") as output_file: + output_file.write(f"new_version_name={new_name}\n") + output_file.write(f"new_version_code={new_code}\n") PY - - name: Generate release notes - id: notes - uses: actions/github-script@v7 + - name: Upload modified build.gradle + uses: actions/upload-artifact@v4 with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const newTag = `v${process.env.NEW_VERSION_NAME}`; - const {owner, repo} = context.repo; + name: version-bump-artifact + path: presentation/build.gradle - const {data: tags} = await github.rest.repos.listTags({ - owner, - repo, - per_page: 100, - }); + generate_release_notes: + needs: bump-version + uses: ./.github/workflows/generate-release-notes.yml + with: + version_name: ${{ needs.bump-version.outputs.new_version_name }} - const previousTagEntry = tags.find(tag => /^v\d/.test(tag.name)); - const previousTag = previousTagEntry ? previousTagEntry.name : undefined; + generate_app_changelog: + needs: [bump-version, generate_release_notes] + runs-on: ubuntu-latest - const requestPayload = { - owner, - repo, - tag_name: newTag, - target_commitish: 'master', - }; + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + persist-credentials: true - if (previousTag) { - requestPayload.previous_tag_name = previousTag; - } + - name: Prepare release notes + id: prepare_notes + env: + NOTES: ${{ needs.generate_release_notes.outputs.release_notes }} + run: | + set -euo pipefail + python3 <<'PY' + import os, re, pathlib + notes = os.environ.get("NOTES", "") + clean = re.sub( + r'(?im)^\s*by\s+\S+\s+in\s+.*$', + '', + re.sub(r'(?im)^\s*["\']?\*\*Full\s+Changelog\*\*\s*:\s*.*$', '', notes) + ).rstrip() - const response = await github.request('POST /repos/{owner}/{repo}/releases/generate-notes', requestPayload); + pathlib.Path("sanitized_notes.txt").write_text(clean) + PY + { + echo "clean_notes<> "$GITHUB_OUTPUT" - const notes = response.data.body || ''; - core.exportVariable('RELEASE_NOTES', notes); - core.setOutput('release_notes', notes); + - name: Add to changelog.json + env: + VERSION_NAME: ${{ needs.bump-version.outputs.new_version_name }} + VERSION_CODE: ${{ needs.bump-version.outputs.new_version_code }} + CLEAN_NOTES: ${{ steps.prepare_notes.outputs.clean_notes }} + run: | + set -euo pipefail + + python3 <<'PY' + import json + import os + from pathlib import Path + + changelog_path = Path("data/src/main/assets/changelog.json") + + version_name = os.environ["VERSION_NAME"] + version_code = int(os.environ["VERSION_CODE"]) + notes_raw = os.environ.get("CLEAN_NOTES", "") + + notes = [ + line.strip() + for line in notes_raw.splitlines() + if line.strip() + ] + + if changelog_path.exists(): + changelog = json.loads(changelog_path.read_text()) + else: + changelog = [] + + new_entry = { + "versionCode": version_code, + "versionName": version_name, + "fixed": notes + } + + changelog.insert(0, new_entry) + + changelog_path.write_text( + json.dumps(changelog, indent=2, ensure_ascii=False) + "\n" + ) + PY + + - name: Upload changelog.json + uses: actions/upload-artifact@v4 + with: + name: changelog-json-artifact + path: data/src/main/assets/changelog.json + + open_release_pr: + needs: [bump-version, generate_release_notes, generate_app_changelog] + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + persist-credentials: true + + - name: Download modified build.gradle + uses: actions/download-artifact@v4 + with: + name: version-bump-artifact + path: presentation/ + + - name: Download modified changelog + uses: actions/download-artifact@v4 + with: + name: changelog-json-artifact + path: data/src/main/assets/ - name: Open release PR uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} - branch: release/v${{ env.NEW_VERSION_NAME }} + branch: release/v${{ needs.bump-version.outputs.new_version_name }} delete-branch: false - commit-message: "chore: release v${{ env.NEW_VERSION_NAME }} (${{ env.NEW_VERSION_CODE }})" - title: Release v${{ env.NEW_VERSION_NAME }} (${{ env.NEW_VERSION_CODE }}) + commit-message: "chore: release v${{ needs.bump-version.outputs.new_version_name }} (${{ needs.bump-version.outputs.new_version_code }})" + title: Release v${{ needs.bump-version.outputs.new_version_name }} (${{ needs.bump-version.outputs.new_version_code }}) body: | ## Summary - - bump `versionName` to `${{ env.NEW_VERSION_NAME }}` - - bump `versionCode` to `${{ env.NEW_VERSION_CODE }}` + - bump `versionName` to `${{ needs.bump-version.outputs.new_version_name }}` + - bump `versionCode` to `${{ needs.bump-version.outputs.new_version_code }}` Triggered manually via the Manual Release Prep workflow with **${{ inputs.bump_component }}** bump. ## Auto-generated release notes - ${{ env.RELEASE_NOTES }} + ${{ needs.generate_release_notes.outputs.release_notes }} diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json index a9b1f133..9105f5cb 100644 --- a/data/src/main/assets/changelog.json +++ b/data/src/main/assets/changelog.json @@ -1,20 +1,62 @@ -[{ - "versionCode": 2229, - "versionName": "4.1.1", - "fixed": [ - "Dead Link", - "Handling sms:1234566?body=xyz style uris starting compose activity", - "Blockthreadreceiver db interaction on io thread", - "Circular update of message text and db conversation in qkreply", - "Bug causing compose activity to finish() when it wasn't supposed to", - "Remove `DependencyInfoBlock` in APK", - "Dial last non-me party in a group convo", - "New conversation not created for non-send-as-group multi-recipient message", - "UI changes to make attach menu properly visible in dark (and light) theme", - "Do not save draft text when adding new recipients to group convo", - "UI - change compose activity bubble text selection colors" - ] -}, +[ + { + "versionCode": 2236, + "versionName": "4.3.4", + "fixed": [ + "## What's Changed", + "* Fix database migration from 4.3.1 by @Inhishonor in https://github.com/octoshrimpy/quik/pull/622", + "* Fix the delayed sending icons not disappearing after hitting send by @Inhishonor in https://github.com/octoshrimpy/quik/pull/624", + "* Add a description to the worker notification by @Inhishonor in https://github.com/octoshrimpy/quik/pull/625", + "* Translations update from Hosted Weblate by @weblate in https://github.com/octoshrimpy/quik/pull/618", + "* [DOCS] Update F-Droid link by @Cj-Malone in https://github.com/octoshrimpy/quik/pull/626", + "* Fix search not recognizing special characters by @Inhishonor in https://github.com/octoshrimpy/quik/pull/635", + "* Fix message content filters not being called by @Truffle2143 in https://github.com/octoshrimpy/quik/pull/636", + "* Add a dedicated emoji reaction sync progress bar by @Inhishonor in https://github.com/octoshrimpy/quik/pull/640", + "* Support matching message reactions that are truncated by @Inhishonor in https://github.com/octoshrimpy/quik/pull/642", + "* Improvements to the worker and message notifications by @Inhishonor in https://github.com/octoshrimpy/quik/pull/647", + "* Clean up logging by @Inhishonor in https://github.com/octoshrimpy/quik/pull/648", + "* Add a GH action to validate fastlane metadata by @Inhishonor in https://github.com/octoshrimpy/quik/pull/656", + "* Set QUIK as a potential default messaging app. by @Inhishonor in https://github.com/octoshrimpy/quik/pull/660", + "* Fix duplicated messages by @Inhishonor in https://github.com/octoshrimpy/quik/pull/634", + "* Fix compose activity infinitely loading by @Inhishonor in https://github.com/octoshrimpy/quik/pull/662", + "* Fix realm migration again by @Inhishonor in https://github.com/octoshrimpy/quik/pull/664", + "* Update MMS configs by @github-actions[bot] in https://github.com/octoshrimpy/quik/pull/665", + "* Update release workflow by @Inhishonor in https://github.com/octoshrimpy/quik/pull/666", + "* Contributing guidelines updates by @Inhishonor in https://github.com/octoshrimpy/quik/pull/667", + "* Translations update from Hosted Weblate by @weblate in https://github.com/octoshrimpy/quik/pull/619", + "* update readme and contributing by @octoshrimpy in https://github.com/octoshrimpy/quik/pull/671", + "* Add a deduplicate message feature by @Inhishonor in https://github.com/octoshrimpy/quik/pull/672", + "* Release v4.3.3 (2235) by @github-actions[bot] in https://github.com/octoshrimpy/quik/pull/673", + "* Display all reacted emojis by @benwaffle in https://github.com/octoshrimpy/quik/pull/676", + "* Implement tapping emoji to see who reacted by @benwaffle in https://github.com/octoshrimpy/quik/pull/677", + "* Improve the release notes generation workflow by @Inhishonor in https://github.com/octoshrimpy/quik/pull/679", + "* Translations update from Hosted Weblate by @weblate in https://github.com/octoshrimpy/quik/pull/680", + "* Translations update from Hosted Weblate by @weblate in https://github.com/octoshrimpy/quik/pull/681", + "* Move the auto delete old message setting to message management by @Inhishonor in https://github.com/octoshrimpy/quik/pull/685", + "* Update the release workflow to use github output, and proper versioning by @Inhishonor in https://github.com/octoshrimpy/quik/pull/693", + "* Rework the release workflow to be more reliable and to provide an in app changelog by @Inhishonor in https://github.com/octoshrimpy/quik/pull/694", + "## New Contributors", + "* @Cj-Malone made their first contribution in https://github.com/octoshrimpy/quik/pull/626", + "* @Truffle2143 made their first contribution in https://github.com/octoshrimpy/quik/pull/636" + ] + }, + { + "versionCode": 2229, + "versionName": "4.1.1", + "fixed": [ + "Dead Link", + "Handling sms:1234566?body=xyz style uris starting compose activity", + "Blockthreadreceiver db interaction on io thread", + "Circular update of message text and db conversation in qkreply", + "Bug causing compose activity to finish() when it wasn't supposed to", + "Remove `DependencyInfoBlock` in APK", + "Dial last non-me party in a group convo", + "New conversation not created for non-send-as-group multi-recipient message", + "UI changes to make attach menu properly visible in dark (and light) theme", + "Do not save draft text when adding new recipients to group convo", + "UI - change compose activity bubble text selection colors" + ] + }, { "versionCode": 2228, "versionName": "4.1.0", @@ -434,4 +476,4 @@ "Search hint gets cut off after rotating screen" ] } -] \ No newline at end of file +] diff --git a/data/src/main/assets/emojis/ckb.json b/data/src/main/assets/emojis/ckb.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/data/src/main/assets/emojis/ckb.json @@ -0,0 +1 @@ +{} diff --git a/data/src/main/assets/emojis/cs.json b/data/src/main/assets/emojis/cs.json index 8a38ebf6..af02615e 100644 --- a/data/src/main/assets/emojis/cs.json +++ b/data/src/main/assets/emojis/cs.json @@ -1,4 +1,16 @@ { "emoji_reaction_ios_generic_added": "^(?s)Reagoval (.+?) na „(.+?)”$", - "emoji_reaction_ios_generic_removed": "^(?s)Odstraněno (.+?) z „(.+?)”$" + "emoji_reaction_ios_generic_removed": "^(?s)Odstraněno (.+?) z „(.+?)”$", + "emoji_reaction_ios_heart_added": "^(?s)Milovaný „(.+?)“$", + "emoji_reaction_ios_heart_removed": "^(?s)Odstraněno srdce z „(.+?)”$", + "emoji_reaction_ios_like_added": "^(?s)Líbilo se „(.+?)“$", + "emoji_reaction_ios_like_removed": "^(?s)Odebrán lajk z „(.+?)“$", + "emoji_reaction_ios_dislike_added": "^(?s)Nelíbí se „(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^(?s)Odstraněno nelíbí se z „(.+?)”$", + "emoji_reaction_ios_laugh_added": "^(?s)Smál se „(.+?)“$", + "emoji_reaction_ios_laugh_removed": "^(?s)Odstranil jsem smích z „(.+?)”$", + "emoji_reaction_ios_exclamation_added": "^(?s)Zdůrazněno „(.+?)“$", + "emoji_reaction_ios_exclamation_removed": "^(?s)Odstranil jsem vykřičník z „(.+?)“$", + "emoji_reaction_ios_question_mark_added": "^(?s)Otázka „(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^(?s)Odstraněn otazník z „(.+?)”$" } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt index 4b2a47cd..1edb301b 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt @@ -26,8 +26,6 @@ import javax.inject.Inject class DeduplicateMessages @Inject constructor( private val messageRepo: MessageRepository ) : Interactor() { - override fun buildObservable(params: Unit): Flowable = - messageRepo.deduplicateMessages() - .subscribeOn(Schedulers.io()) + messageRepo.deduplicateMessages().subscribeOn(Schedulers.io()) } diff --git a/metadata/bg/full_description.txt b/metadata/bg/full_description.txt index 73e9b577..9677d388 100644 --- a/metadata/bg/full_description.txt +++ b/metadata/bg/full_description.txt @@ -9,4 +9,4 @@ - Сортиране на съобщения - Отложено изпращане -Можете да общувате с общността на адрес #quik-sms:matrix.org +Можете да общувате с общността на адрес #quik-sms:matrix.org \ No newline at end of file diff --git a/metadata/bg/short_description.txt b/metadata/bg/short_description.txt index 183c5413..f51b9932 100644 --- a/metadata/bg/short_description.txt +++ b/metadata/bg/short_description.txt @@ -1 +1 @@ -Заместител на стандартното приложение за SMS на Андроид с отворен код. Съживяване на QKSMS. +Заместител на стандартното приложение за SMS на Андроид с отворен код. Съживяване на QKSMS. \ No newline at end of file diff --git a/metadata/ckb/full_description.txt b/metadata/ckb/full_description.txt new file mode 100644 index 00000000..83c860da --- /dev/null +++ b/metadata/ckb/full_description.txt @@ -0,0 +1,12 @@ +Open source replacement to the stock SMS app on Android. A revival of QKSMS. +## Features +- Scheduled Messages +- Message Backup +- Speech to Text and Text to Speech integrated within the app +- Message Blocking and Archiving +- Voice Messages +- Attachments of any type of file +- Message Sorting +- Delayed Sending + +You can chat with the community over at #quik-sms:matrix.org \ No newline at end of file diff --git a/metadata/ckb/short_description.txt b/metadata/ckb/short_description.txt new file mode 100644 index 00000000..1b243ae7 --- /dev/null +++ b/metadata/ckb/short_description.txt @@ -0,0 +1 @@ +Open source replacement to the stock SMS app on Android. A revival of QKSMS. \ No newline at end of file diff --git a/metadata/cs/full_description.txt b/metadata/cs/full_description.txt index 1a547cc0..f703244d 100644 --- a/metadata/cs/full_description.txt +++ b/metadata/cs/full_description.txt @@ -9,4 +9,4 @@ Open source náhrada za standardní aplikaci SMS v systému Android. Oživení p - Třídění zpráv - Odložené odesílání -Můžete chatovat s komunitou na #quik-sms:matrix.org +Můžete chatovat s komunitou na #quik-sms:matrix.org \ No newline at end of file diff --git a/metadata/cs/short_description.txt b/metadata/cs/short_description.txt index bc5f4f3b..e95c0a40 100644 --- a/metadata/cs/short_description.txt +++ b/metadata/cs/short_description.txt @@ -1 +1 @@ -Open source náhrada za standardní aplikaci SMS v systému Android. Oživení aplikací QKSMS. +Open source náhrada za standardní aplikaci SMS v systému Android. Oživení aplikací QKSMS. \ No newline at end of file diff --git a/metadata/de/full_description.txt b/metadata/de/full_description.txt index ead11e42..3f8d83a9 100644 --- a/metadata/de/full_description.txt +++ b/metadata/de/full_description.txt @@ -9,4 +9,4 @@ Open-Source-Ersatz für die Standard-SMS-App auf Android. Eine Neuauflage von QK - Nachrichten sortieren - Verzögertes Senden -Du kannst mit der Community unter #quik-sms:matrix.org chatten. +Du kannst mit der Community unter #quik-sms:matrix.org chatten. \ No newline at end of file diff --git a/metadata/de/short_description.txt b/metadata/de/short_description.txt index 91518369..1694bca4 100644 --- a/metadata/de/short_description.txt +++ b/metadata/de/short_description.txt @@ -1 +1 @@ -Open-Source-Ersatz für die Standard-SMS-App auf Android. Eine Neuauflage von QKSMS. +Open-Source-Ersatz für die Standard-SMS-App auf Android. Eine Neuauflage von QKSMS. \ No newline at end of file diff --git a/metadata/et/full_description.txt b/metadata/et/full_description.txt index a54a0f44..23af8cb3 100644 --- a/metadata/et/full_description.txt +++ b/metadata/et/full_description.txt @@ -9,4 +9,4 @@ Avatud lähtekoodil põhinev asendus Androidi standardsele lühisõnumirakenduse - Sõnumite järjestamine - Viivitusega saatmine -Osale kogukonna suhtluses #quik-sms:matrix.org jututoas +Osale kogukonna suhtluses #quik-sms:matrix.org jututoas \ No newline at end of file diff --git a/metadata/et/short_description.txt b/metadata/et/short_description.txt index ef32fc08..66a9fd40 100644 --- a/metadata/et/short_description.txt +++ b/metadata/et/short_description.txt @@ -1 +1 @@ -Avatud lähtekoodiga asendus standardsele Androidi tekstisõnumirakendusele. Varasema QKSMS-rakenduse edasiarendus. +Avatud lähtekoodiga asendus standardsele Androidi tekstisõnumirakendusele. Varasema QKSMS-rakenduse edasiarendus. \ No newline at end of file diff --git a/metadata/fr-FR/full_description.txt b/metadata/fr-FR/full_description.txt index d1a8c0d8..c8340178 100644 --- a/metadata/fr-FR/full_description.txt +++ b/metadata/fr-FR/full_description.txt @@ -9,4 +9,4 @@ Remplacement open-source de l'application SMS de base sur Android. Une résurrec - Triez vos messages - Envoi retardé de messages -Vous pouvez clavarder avec la communauté en suivant ce lien : #quik-sms:matrix.org +Vous pouvez clavarder avec la communauté en suivant ce lien : #quik-sms:matrix.org \ No newline at end of file diff --git a/metadata/fr-FR/short_description.txt b/metadata/fr-FR/short_description.txt index c0d7a188..1cd5786f 100644 --- a/metadata/fr-FR/short_description.txt +++ b/metadata/fr-FR/short_description.txt @@ -1 +1 @@ -Remplacement open source de l'appli SMS Android. Renaissance de QKSMS. +Remplacement open source de l'appli SMS Android. Renaissance de QKSMS. \ No newline at end of file diff --git a/metadata/hu/full_description.txt b/metadata/hu/full_description.txt index 9fc210c0..6fb1d27b 100644 --- a/metadata/hu/full_description.txt +++ b/metadata/hu/full_description.txt @@ -9,4 +9,4 @@ Nyílt forráskódú alternatíva az Android alapértelmezett SMS-alkalmazása h - Üzenetek rendezése - Késleltetett küldés -A közösséggel a következő helyen tud beszélgetni: #quik-sms:matrix.org +A közösséggel a következő helyen tud beszélgetni: #quik-sms:matrix.org \ No newline at end of file diff --git a/metadata/hu/short_description.txt b/metadata/hu/short_description.txt index 25bc1fe5..77f34b16 100644 --- a/metadata/hu/short_description.txt +++ b/metadata/hu/short_description.txt @@ -1 +1 @@ -Nyílt forráskódú alternatíva az Android alapértelmezett SMS-alkalmazása helyett. A QKSMS újjáéledése. +Nyílt forráskódú alternatíva az Android alapértelmezett SMS-alkalmazása helyett. A QKSMS újjáéledése. \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 6cb8b000..0e86f339 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -28,8 +28,8 @@ android { applicationId 'dev.octoshrimpy.quik' minSdkVersion 23 targetSdkVersion 33 - versionCode 2235 - versionName '4.3.3' + versionCode 2236 + versionName '4.3.4' setProperty("archivesBaseName", "QUIK-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 05ce0621..388ec224 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -140,6 +140,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val confirmDeleteIntent: Subject> = PublishSubject.create() override val clearCurrentMessageIntent: Subject = PublishSubject.create() override val messageLinkAskIntent: Subject by lazy { messageAdapter.messageLinkClicks } + override val reactionClickIntent: Subject by lazy { messageAdapter.reactionClicks } override val speechRecogniserIntent by lazy { binding.speechToTextIcon.clicks() } override val shadeIntent by lazy { binding.shadeBackground.clicks() } override val recordAudioStartStopRecording: Subject = PublishSubject.create() @@ -708,6 +709,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } + override fun showReactionsDialog(reactions: List) { + AlertDialog.Builder(this) + .setTitle(R.string.compose_reactions_title) + .setMessage(reactions.joinToString("\n")) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.compose, menu) return super.onCreateOptionsMenu(menu) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 16477093..3f661878 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -77,6 +77,7 @@ interface ComposeView : QkView { val confirmDeleteIntent: Observable> val clearCurrentMessageIntent: Subject val messageLinkAskIntent: Observable + val reactionClickIntent: Subject val speechRecogniserIntent: Observable<*> val shadeIntent: Observable val recordAudioStartStopRecording: Subject @@ -111,6 +112,7 @@ interface ComposeView : QkView { fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) fun showClearCurrentMessageDialog() + fun showReactionsDialog(reactions: List) fun startSpeechRecognition() fun focusMessage() } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index d0f2349e..440a975e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -759,6 +759,23 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.showMessageLinkAskDialog(it) } + // Show reaction details popup + view.reactionClickIntent + .mapNotNull { messageId -> messageRepo.getMessage(messageId) } + .withLatestFrom(conversation) { message, conv -> + message.emojiReactions.map { reaction -> + val contactName = conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) + } + ?.getDisplayName() + ?: reaction.senderAddress + "${reaction.emoji} $contactName" + } + } + .autoDisposable(view.scope()) + .subscribe { reactions -> view.showReactionsDialog(reactions) } + // Set the current conversation Observables .combineLatest( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 09bf6cab..63b8ba98 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -110,6 +110,7 @@ class MessagesAdapter @Inject constructor( val sendNowClicks: Subject = PublishSubject.create() val resendClicks: Subject = PublishSubject.create() val partContextMenuRegistrar: Subject = PublishSubject.create() + val reactionClicks: Subject = PublishSubject.create() var data: Pair>? = null set(value) { @@ -431,40 +432,25 @@ class MessagesAdapter @Inject constructor( val hasReactions = reactions.isNotEmpty() if (hasReactions) { - val reactionCounts = reactions.groupBy { it.emoji } - .mapValues { it.value.size } - .toList() - .sortedByDescending { it.second } // Sort by count, most reactions first + val uniqueEmojis = reactions.map { it.emoji }.distinct() + val totalCount = reactions.size - // For now, show just the first (most popular) reaction - val topReaction = reactionCounts.first() - val reactionText = if (topReaction.second == 1) { - topReaction.first + // Show unique emojis followed by total count + val reactionText = if (totalCount == 1) { + uniqueEmojis.first() } else { - // Use a non-breaking space to keep the emoji and count together - "${topReaction.first}\u00A0${topReaction.second}" + "${uniqueEmojis.joinToString("")}\u00A0$totalCount" } reactionTextView.text = reactionText + reactionTextView.setOnClickListener { reactionClicks.onNext(message.id) } reactionsContainer.setVisible(true) - makeRoomForEmojis(reactionsContainer) } else { reactionsContainer.setVisible(false) + reactionTextView.setOnClickListener(null) } } - private fun makeRoomForEmojis(reactionsContainer: View) { - val paddingBottom = 25.dpToPx(context) - - (reactionsContainer.parent?.parent as? ViewGroup)?.let { parent -> - parent.setPadding( - parent.paddingLeft, - parent.paddingTop, - parent.paddingRight, - paddingBottom - ) - } - } private fun bindStatus( statusView: TextView, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt index 674cd5d4..b7304e83 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt @@ -47,4 +47,4 @@ class MessageUtilsActivity : QkThemedActivity() { super.onBackPressed() } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt index a665bafb..b210f320 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt @@ -2,6 +2,7 @@ package dev.octoshrimpy.quik.feature.messageutils import android.animation.ObjectAnimator import android.app.AlertDialog +import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -11,19 +12,33 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkController import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.databinding.MessageUtilsControllerBinding +import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.MessageRepository +import io.reactivex.Observable import io.reactivex.Single +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext import javax.inject.Inject +import kotlin.coroutines.resume class MessageUtilsController : QkController(), MessageUtilsView { override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup): MessageUtilsControllerBinding = MessageUtilsControllerBinding.inflate(inflater, container, false) + @Inject lateinit var context: Context @Inject override lateinit var presenter: MessageUtilsPresenter + private val autoDeleteDialog: AutoDeleteDialog by lazy { + AutoDeleteDialog(activity!!, autoDeleteSubject::onNext) + } + private val autoDeleteSubject: Subject = PublishSubject.create() override val autoDeduplicateClickIntent by lazy { binding.autoDeduplicate.clicks() } override val deduplicateClickIntent by lazy { binding.deduplicateMessages.clicks() } + override val autoDeleteClickIntent by lazy { binding.autoDelete.clicks() } init { appComponent.inject(this) @@ -70,6 +85,12 @@ class MessageUtilsController : QkController context.getString(R.string.settings_auto_delete_never) + else -> context.resources.getQuantityString( + R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete) + } } override fun showDeduplicationConfirmationDialog(): Single = Single.create { emitter -> @@ -82,8 +103,24 @@ class MessageUtilsController : QkController = autoDeleteSubject + + override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show() + + override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) { + suspendCancellableCoroutine { cont -> + androidx.appcompat.app.AlertDialog.Builder(activity!!) + .setTitle(R.string.settings_auto_delete_warning) + .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages)) + .setOnCancelListener { cont.resume(false) } + .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) } + .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) } + .show() + } + } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt index 97662b63..a5f0932e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt @@ -1,23 +1,29 @@ package dev.octoshrimpy.quik.feature.messageutils +import android.content.Context import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.DeduplicateMessages +import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.repository.MessageRepository +import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.Preferences import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers +import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject class MessageUtilsPresenter @Inject constructor( + private val context: Context, private val deduplicateMessages: DeduplicateMessages, private val prefs: Preferences, - messageRepo: MessageRepository + private val deleteOldMessages: DeleteOldMessages, + private val messageRepo: MessageRepository ) : QkPresenter(MessageUtilsState()) { init { disposables += messageRepo.deduplicationProgress @@ -27,6 +33,9 @@ class MessageUtilsPresenter @Inject constructor( disposables += prefs.autoDeduplicate.asObservable() .subscribe { enabled -> newState { copy(autoDeduplicateMessages = enabled) } } + + disposables += prefs.autoDelete.asObservable() + .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } } } override fun bindIntents(view: MessageUtilsView) { @@ -43,16 +52,16 @@ class MessageUtilsPresenter @Inject constructor( .subscribe { result -> when (result) { is MessageRepository.DeduplicationResult.Success -> { - view.handleResult(R.string.deduplicating_messages_finished) + view.handleDeduplicationResult(R.string.deduplicating_messages_finished) } is MessageRepository.DeduplicationResult.NoDuplicates -> { - view.handleResult(R.string.deduplicating_messages_no_messages) + view.handleDeduplicationResult(R.string.deduplicating_messages_no_messages) } is MessageRepository.DeduplicationResult.Failure -> { - view.handleResult(R.string.deduplicating_messages_failed) - Timber.e("Error: ${result.error.localizedMessage}") + view.handleDeduplicationResult(R.string.deduplicating_messages_failed) + Timber.e("Error while deduplicating messages: ${result.error}") } } } @@ -61,5 +70,36 @@ class MessageUtilsPresenter @Inject constructor( view.autoDeduplicateClickIntent .autoDisposable(view.scope()) .subscribe { prefs.autoDeduplicate.set(!prefs.autoDeduplicate.get()) } + + view.autoDeleteClickIntent + .autoDisposable(view.scope()) + .subscribe { view.showAutoDeleteDialog(prefs.autoDelete.get()) } + + view.autoDeleteChanged() + .observeOn(Schedulers.io()) + .filter { maxAge -> + if (maxAge == 0) { + return@filter true + } + + val counts = messageRepo.getOldMessageCounts(maxAge) + if (counts.values.sum() == 0) { + return@filter true + } + + runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } + } + .doOnNext { maxAge -> + when (maxAge == 0) { + true -> AutoDeleteService.cancelJob(context) + false -> { + AutoDeleteService.scheduleJob(context) + deleteOldMessages.execute(Unit) + } + } + } + .doOnNext(prefs.autoDelete::set) + .autoDisposable(view.scope()) + .subscribe() } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt index e09528cb..cadd9d23 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt @@ -4,5 +4,7 @@ import dev.octoshrimpy.quik.repository.MessageRepository data class MessageUtilsState( val autoDeduplicateMessages: Boolean = false, - val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle + val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle, + + val autoDelete: Int = 0, ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt index b7919308..a2801e70 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt @@ -7,7 +7,12 @@ import io.reactivex.Single interface MessageUtilsView: QkViewContract { val autoDeduplicateClickIntent: Observable<*> val deduplicateClickIntent: Observable + val autoDeleteClickIntent: Observable fun showDeduplicationConfirmationDialog(): Single - fun handleResult(resIdString: Int) -} \ No newline at end of file + fun handleDeduplicationResult(resIdString: Int) + + fun autoDeleteChanged(): Observable + fun showAutoDeleteDialog(days: Int) + suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 2b494212..07e55208 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -26,7 +26,6 @@ import android.text.format.DateFormat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import com.bluelinelabs.conductor.RouterTransaction import com.google.android.material.snackbar.Snackbar @@ -48,7 +47,6 @@ import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.common.widget.TextInputDialog import dev.octoshrimpy.quik.databinding.SettingsControllerBinding import dev.octoshrimpy.quik.feature.settings.about.AboutController -import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog import dev.octoshrimpy.quik.feature.settings.swipe.SwipeActionsController import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent @@ -57,11 +55,7 @@ import dev.octoshrimpy.quik.util.Preferences import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withContext import javax.inject.Inject -import kotlin.coroutines.resume class SettingsController : QkController(), SettingsView { @@ -81,15 +75,11 @@ class SettingsController : QkController = PublishSubject.create() private val startTimeSelectedSubject: Subject> = PublishSubject.create() private val endTimeSelectedSubject: Subject> = PublishSubject.create() private val signatureSubject: Subject = PublishSubject.create() - private val autoDeleteSubject: Subject = PublishSubject.create() private val progressAnimator by lazy { ObjectAnimator.ofInt(binding.syncingProgress, "progress", 0, 0) } @@ -148,8 +138,6 @@ class SettingsController : QkController = signatureSubject - override fun autoDeleteChanged(): Observable = autoDeleteSubject - override fun mmsSizeSelected(): Observable = mmsSizeDialog.adapter.menuItemClicks override fun messageLinkHandlingSelected(): Observable = messageLinkHandlingDialog.adapter.menuItemClicks @@ -190,12 +178,6 @@ class SettingsController : QkController context.getString(R.string.settings_auto_delete_never) - else -> context.resources.getQuantityString( - R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete) - } - binding.longAsMms.checkbox?.isChecked = state.longAsMms binding.mmsSize.summary = state.maxMmsSizeSummary @@ -256,20 +238,6 @@ class SettingsController : QkController - AlertDialog.Builder(activity!!) - .setTitle(R.string.settings_auto_delete_warning) - .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages)) - .setOnCancelListener { cont.resume(false) } - .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) } - .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) } - .show() - } - } - override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!) override fun showMessageLinkHandlingDialogPicker() = messageLinkHandlingDialog.show(activity!!) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 0ce4ae60..a7de6f35 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -27,17 +27,12 @@ import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.makeToast -import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.manager.BillingManager -import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository -import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.util.Preferences import io.reactivex.rxkotlin.plusAssign -import io.reactivex.schedulers.Schedulers -import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.Calendar import java.util.concurrent.TimeUnit @@ -49,8 +44,6 @@ class SettingsPresenter @Inject constructor( private val context: Context, private val billingManager: BillingManager, private val dateFormatter: DateFormatter, - private val deleteOldMessages: DeleteOldMessages, - private val messageRepo: MessageRepository, private val navigator: Navigator, private val nightModeManager: NightModeManager, private val prefs: Preferences, @@ -124,9 +117,6 @@ class SettingsPresenter @Inject constructor( disposables += prefs.mobileOnly.asObservable() .subscribe { enabled -> newState { copy(mobileOnly = enabled) } } - disposables += prefs.autoDelete.asObservable() - .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } } - disposables += prefs.longAsMms.asObservable() .subscribe { enabled -> newState { copy(longAsMms = enabled) } } @@ -218,8 +208,6 @@ class SettingsPresenter @Inject constructor( R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get()) - R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get()) - R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get()) R.id.mmsSize -> view.showMmsSizePicker() @@ -288,33 +276,6 @@ class SettingsPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe() - view.autoDeleteChanged() - .observeOn(Schedulers.io()) - .filter { maxAge -> - if (maxAge == 0) { - return@filter true - } - - val counts = messageRepo.getOldMessageCounts(maxAge) - if (counts.values.sum() == 0) { - return@filter true - } - - runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } - } - .doOnNext { maxAge -> - when (maxAge == 0) { - true -> AutoDeleteService.cancelJob(context) - false -> { - AutoDeleteService.scheduleJob(context) - deleteOldMessages.execute(Unit) - } - } - } - .doOnNext(prefs.autoDelete::set) - .autoDisposable(view.scope()) - .subscribe() - view.mmsSizeSelected() .autoDisposable(view.scope()) .subscribe(prefs.mmsSize::set) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt index cdb304b5..ed9dfc80 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt @@ -45,7 +45,6 @@ data class SettingsState( val splitSmsEnabled: Boolean = false, val stripUnicodeEnabled: Boolean = false, val mobileOnly: Boolean = false, - val autoDelete: Int = 0, val longAsMms: Boolean = false, val maxMmsSizeSummary: String = "100KB", val maxMmsSizeId: Int = 100, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt index b3396b49..b0670047 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt @@ -32,7 +32,6 @@ interface SettingsView : QkViewContract { fun textSizeSelected(): Observable fun sendDelaySelected(): Observable fun signatureChanged(): Observable - fun autoDeleteChanged(): Observable fun mmsSizeSelected(): Observable fun messageLinkHandlingSelected(): Observable @@ -43,8 +42,6 @@ interface SettingsView : QkViewContract { fun showTextSizePicker() fun showDelayDurationDialog() fun showSignatureDialog(signature: String) - fun showAutoDeleteDialog(days: Int) - suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean fun showMmsSizePicker() fun showMessageLinkHandlingDialogPicker() fun showSwipeActions() diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 792727ef..48488ae5 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -23,13 +23,17 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground"> + android:background="?attr/selectableItemBackground" + android:clipChildren="false" + android:clipToPadding="false"> + android:orientation="vertical" + android:clipChildren="false" + android:clipToPadding="false"> diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 16cc8886..a2561f6f 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -148,12 +148,13 @@ android:layout_height="match_parent" android:layout_weight="1" /> - + android:orientation="vertical"> @@ -196,7 +196,7 @@ - + + + + + - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml index 338142d3..30938a50 100644 --- a/presentation/src/main/res/layout/settings_controller.xml +++ b/presentation/src/main/res/layout/settings_controller.xml @@ -194,14 +194,6 @@ app:title="@string/settings_mobile_title" app:widget="@layout/settings_switch_widget" /> - - + + \ No newline at end of file diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 7eec9794..1d7fdff3 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -513,4 +513,15 @@ Zprávy budou odeslány samostatně všem příjemcům Příjem zprávy V systému Android 12 a starších verzích je pro práci na pozadí, která umožňuje příjem zpráv, vyžadováno oznámení. + Analýza reakcí pomocí emodži… + Správa zpráv + Odstranění duplicitních zpráv + Odebrat duplicitní zprávy + Prohledá databázi zpráv a odstraní všechny zprávy, které přesně odpovídají původním zprávám + Vaše databáze zpráv bude prohledána na duplicity a tyto duplicity budou odstraněny.\nTím dojde k automatickému smazání zpráv. Pokračujte pouze v případě, že rozumíte důsledkům. + Automatické odstraňování duplicitních zpráv + Během synchronizace bude provedena deduplikace. Upozorňujeme, že tím dojde k automatickému smazání zpráv a i když je pravděpodobnost výskytu falešných duplikátů velmi nízká, stále je to možné.\nBuďte prosím opatrní. + Dokončeno deduplikování zpráv! + Nebyly nalezeny žádné duplicitní zprávy. + Deduplikace zpráv se nezdařila, zkuste to znovu diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index fa4eeb2a..555f5468 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -24,14 +24,14 @@ Einstellungen Benachrichtigungen Erscheinungsbild - In Posteingang suchen… + Im Posteingang suchen… Verfassen Überspringen Weiter Person hinzufügen Anrufen Details - In Galerie speichern + In der Galerie speichern Text teilen Navigationsmenü öffnen %d ausgewählt @@ -39,7 +39,7 @@ Archivieren Wiederherstellen Löschen - Zu Kontakten hinzufügen + Zu den Kontakten hinzufügen Oben anheften Loslösen Als gelesen markieren @@ -67,9 +67,9 @@ Blockiert Mehr Einstellungen - Hilfe & Feedback + Hilfe & Rückmeldung Freunde einladen - Schalte erstaunliche neue Funktionen frei und unterstütze die Entwicklung + Schalte tolle neue Funktionen frei und unterstütze die Entwicklung Gefällt dir QUIK? Teile etwas von deiner Liebe und gib uns einen Stern auf GitHub! OKAY! @@ -97,7 +97,7 @@ Geplante Zeit: Gewählte Zeit muss in der Zukunft liegen! Du musst QUIK+ freischalten, um geplante Nachrichten nutzen zu können - Zu geplanten Nachrichten hinzugefügt + Zu den geplanten Nachrichten hinzugefügt Schreibe eine Nachricht… Text kopieren Weiterleiten @@ -140,7 +140,7 @@ Entsperren Unterhaltung löschen Mediendatei konnte nicht geladen werden - In Galerie gespeichert + In der Galerie gespeichert Sichern und Wiederherstellen Sichere Nachrichten Aus Sicherung wiederherstellen @@ -176,7 +176,7 @@ Nachricht genau dann senden, wenn du magst Hey! Wann war dein Geburtstag nochmal? Er ist am 23. Dezember - Alles Gute zum Geburtstag! Schau was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke + Alles Gute zum Geburtstag! Schau, was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke Am 23. Dezember senden  Eine Nachricht planen @@ -250,7 +250,7 @@ Wenn deine längeren Textnachrichten nicht gesendet oder in der falsche Reihenfolge gesendet werden, kannst du sie stattdessen als MMS-Nachrichten senden. Dafür können zusätzliche Gebühren anfallen MMS-Anhänge automatisch komprimieren Nachrichten synchronisieren - Nachrichten mit der Android SMS-Datenbank abgleichen + Nachrichten mit der Android-SMS-Datenbank abgleichen Über QUIK Version %s Protokollierung zur Fehlerbehebung aktiviert @@ -258,9 +258,9 @@ Dauer eingeben (in Sekunden) Blockieren Nachrichten verwerfen - Eingehende Nachrichten von blockierten Absendern verwefen, anstatt sie auszublenden + Eingehende Nachrichten von blockierten Absendern verwerfen, anstatt sie auszublenden Blockierte Unterhaltungen - Blockiermanager + Blockierverwaltung In QUIK integrierte Blockierfunktion Spam-Nachrichten und Nummern & unbekannte Anrufe mit Sperrliste & Zeitplan blockieren Filtere deine Anrufe und Nachrichten automatisch an einem praktischen Ort! Mit Community IQ™ kannst du unerwünschte Nachrichten von bekannten Community-Spammern verhindern @@ -302,11 +302,11 @@ Vielen Dank für die Unterstützung von QUIK! Du kannst jetzt alle QUIK+ Funktionen verwenden Ein Fehler ist aufgetreten, bitte versuche es erneut - QUIK+ ist für Nutzer von F-Droid kostenfrei! Spende gerne um die Entwicklung zu Unterstützen. + QUIK+ ist für Nutzer von F-Droid kostenfrei! Spende gerne, um die Entwicklung zu unterstützen. Spenden per PayPal Demnächst verfügbar Premium-Erscheinungsbilder - Wundervolle Farben, die kein Teil der Material Design-Farbpalette sind, für das Erscheinungsbild freischalten + Wundervolle Farben, die kein Teil der \"Material Design\"-Farbpalette sind, für das Erscheinungsbild freischalten Benutzerdefinierte Auto-Emoji Benutzerdefinierte Auto-Emoji-Verknüpfungen erstellen Nachrichtensicherung @@ -314,7 +314,7 @@ Geplante Nachrichten Den automatischen Versand von Nachrichten zu einem bestimmen Zeitpunkt planen Verzögertes Senden - Wartet einige Sekunden, bevor deine Nachricht gesendet wird + Einige Sekunden warten, bevor deine Nachricht gesendet wird Automatischer Nachtmodus Nachtmodus basierend auf der Uhrzeit aktivieren Erweitertes Blockieren @@ -447,21 +447,21 @@ SIM-Nummer Nachrichtenelement Anhang - Verschiebe den Sprache-zu-Text-Knopf an eine beliebige Stelle - ⚠ Die Nachricht ist lang. Kopieren oder speichern für den vollständigen Text + Verschiebe den \"Sprache zu Text\"-Knopf an eine beliebige Stelle + ⚠ Die Nachricht ist lang. Kopieren oder Speichern für den vollständigen Text Datengröße überschreitet Zwischenablagegrenze - In Zwischenablage kopieren nicht möglich + In die Zwischenablage kopieren nicht möglich Diese Nachricht planen Fehlt - „Sprache-zu-Text“-Knopf anzeigen + „Sprache zu Text“-Knopf anzeigen Name und Nachricht anzeigen Stumm, wenn kein Kontakt Stummschalten von Benachrichtigungen für Nachrichten ohne Empfänger in deinen Kontakten Ungelesene oben Ungelesene Unterhaltungen oben anzeigen Linkverarbeitung in Nachrichten - Screenshots deaktivieren - Verhindert, dass dein Betriebssystem und andere Apps Screenshots der App machen. + Bildschirmfotos deaktivieren + Verhindert, dass dein Betriebssystem und andere Apps Bildschirmfotos der App machen. Nachrichteninhaltsfilter Hier werden deine Nachrichteninhaltsfilter angezeigt Neuen Filter erstellen @@ -484,11 +484,11 @@ Erneut senden Keine Nachrichten Ungesehene Nachrichten vorlesen - Warnung vor externem Link + Warnung vor externen Links Einige Links können unsicher sein oder dich unerwartet weiterleiten. Überprüfe den untenstehenden Link, bevor du fortfährst:\n\n%1$s\n\nWillst du weitermachen? Ja, Link öffnen Nein - Leider ist beim Laden des Sprache-zu-Text-Anbieters ein Fehler aufgetreten. + Leider ist beim Laden des \"Sprache zu Text\"-Anbieters ein Fehler aufgetreten. Sprich deine Nachricht Ups! Beim Teilen ist etwas schief gelaufen Empfänger und Antworten sind für alle sichtbar diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index 03d47cf3..eb2dd53e 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -37,7 +37,7 @@ Partager Transférer Ouvrir en dehors de l\'appli - Ouvrir le tiroir de navigation + Ouvrir le panneau de navigation %d sélectionnée Effacer Sélectionner tout @@ -129,7 +129,7 @@ Écrire un message… Impossible d’envoyer aux autres participants Copier le texte - Partager + Partager le texte Transférer Afficher l’état Supprimer @@ -299,7 +299,7 @@ Après %d jours Envoyer les messages longs en MMS - Si vos messages texte plus longs ne parviennent pas à être envoyés, ou s’ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s’appliquer. + Si vos messages texte plus longs ne parviennent pas à être envoyés ou s’ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s’appliquer. Compresser automatiquement les pièces jointes des MMS Gestion des liens dans les messages Désactiver les captures d’écran @@ -443,6 +443,7 @@ Vous devez déverrouiller QUIK+ pour utiliser cela Nouveau message + %s nouveaux messages %s nouveaux messages Message non envoyé @@ -543,7 +544,8 @@ %d conversations désarchivées Réenvoyer - Les destinataires et les réponses seront visibles par tous + Les destinataires et les réponses seront visibles de tous Les messages seront envoyés séparément à tous les destinataires Sous Android 12 et les versions antérieures, une notification est requise pour le fonctionnement en arrière-plan qui permet de recevoir des messages. + Réception du message diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 79e5b81b..209c85f1 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -495,4 +495,15 @@ Az üzenetek külön-külön lesznek elküldve minden címzettnek Android 12 és régebbi verziók esetén értesítés szükséges a háttérmunkához, amely lehetővé teszi az üzenetek fogadását. Üzenet fogadása + Emodzsi reakciók elemzése… + Üzenetkezelés + Ismétlődő üzenetek kiszűrése + Ismétlődő üzenetek eltávolítása + Átvizsgálja az üzenetadatbázist, és törli az összes olyan üzenetet, amely pontosan megegyezik az eredeti üzenetekkel + Az üzenetadatbázis át lesz vizsgálva az ismétlődő üzenetek felkutatása érdekében, majd ezek el lesznek távolítva.\nEz a művelet automatikusan töröl üzeneteket, ezért csak akkor folytassa, ha tisztában van a következményekkel. + Ismétlődő üzenetek automatikus kiszűrése + Az ismétlődések kiszűrése a szinkronizálás során történik. Fontos tudni, hogy a művelet automatikusan töröl üzeneteket, és bár a téves ismétlődés felismerésének esélye nagyon alacsony, nem zárható ki teljesen.\nKellő körültekintéssel járjon el. + Az ismétlődő üzenetek eltávolítása befejeződött! + Nem találhatók ismétlődő üzenetek. + Az ismétlődések kiszűrése sikertelen, próbálja meg újra diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index dc6ea32e..390ece64 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -500,4 +500,5 @@ Messaggio in arrivo Pulisci messaggio Pulisci + Ricezione messaggio diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index 6a574584..05ce5534 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -59,7 +59,7 @@ Yêu cầu quyền truy cập QUIK cần cấp quyền để gửi và xem tin nhắn SMS QUIK cần cấp quyền để xem danh bạ - QUIK needs permission to display notifications + QUIK cần cấp quyền để hiển thị thông báo Cho phép Trò chuyện Lưu trữ @@ -93,7 +93,7 @@ Người nhận và các câu trả lời sẽ được hiển thị với mọi người Đây là sự khởi đầu của một cuộc trò chuyện. Hãy nói điều gì đó tốt đẹp nhé! Thẻ danh thiếp - Hẹn giờ cho + Thời gian dự kiến: Thời gian chọn phải trong tương lai! Bạn phải mở khoá QUIK+ để dùng tính năng hẹn giờ Đã hẹn giờ cho tin nhắn @@ -145,8 +145,8 @@ Đang khôi phục từ bản sao lưu Đang tải… Chưa bao giờ - Backup location - Set folder + Vị trí sao lưu + Chọn thư mục Khôi phục Chọn một bản sao lưu Vui lòng mở khoá QUIK+ để dùng tính năng sao lưu và khôi phục @@ -155,12 +155,12 @@ Khôi phục từ bản sao lưu này Dừng khôi phục Tin nhắn đã được khôi phục sẽ vẫn còn trên thiết bị của bạn - Select backup location - Please select a folder to save your backups to + Chọn vị trí sao lưu + Vui lòng chọn thư mục để lưu bản sao lưu %1$s\n%2$d messages - Error - Couldn\'t read backup file - Backup details + Lỗi + Không thể đọc tệp sao lưu + Thông tin bản sao lưu Các bản sao lưu Không tìm thấy bản sao lưu nào Hiện tại, tính năng sao lưu và khôi phục chỉ hỗ trợ SMS. Việc hỗ trợ MMS và tính năng sao lưu định kì sẽ có sớm! @@ -349,7 +349,7 @@ Dừng Xem thêm Chọn - Undo + Hoàn tác Đã sao chép Bạn phải mở khóa QUIK+ để sử dụng chức năng này @@ -404,4 +404,24 @@ LOL Không sao đâu + Chia sẻ + Chuyển tiếp + Chọn tất cả + Chỉnh sửa tin nhắn + Đổi tên cuộc trò chuyện + Chỉnh sửa tin nhắn + Xóa nội dung + Hẹn giờ tin nhắn này + Hiển thị nút chuyển đổi văn bản thành giọng nói + Hiện tên và tin nhắn + Mở bằng ứng dụng khác + Gửi ngay + Bản nháp: %s + Gửi ngay + Chỉnh sửa tin nhắn + Chỉnh sửa sẽ xóa tin nhắn khỏi lịch hẹn.\n\nHãy gửi lại ở màn hình tiếp theo, nếu không tin nhắn sẽ mất.\n\nBạn có muốn tiếp tục không? + Tiếp tục chỉnh sửa + Xóa nội dung? Thao tác này không thể phục hồi. + Hẹn giờ tin nhắn cho cuộc trò chuyện này + Không thể gửi đến người nhận diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml index 1c336a4b..42b28b67 100644 --- a/presentation/src/main/res/values-zh-rTW/strings.xml +++ b/presentation/src/main/res/values-zh-rTW/strings.xml @@ -489,4 +489,15 @@ 訊息將分別傳送給所有收件者 正在接收訊息 在 Android 12 及以下版本中,啟用接收訊息的背景作業需要顯示通知。 + 解析表情符號反應… + 訊息管理 + 訊息去重 + 移除重複訊息 + 掃描訊息資料庫並刪除所有完全符合原始訊息的訊息 + 你的訊息資料庫會被掃描是否有重複的,然後這些重複的就會被移除。\n這會自動刪除訊息,只有在你了解後果後才繼續進行。 + 自動去重訊息 + 同步時會進行重複刪除。請注意,這會自動刪除訊息,雖然出現虛假重複的機率很低,但仍有可能。\n請多加小心。 + 訊息去重已完成! + 未發現重複訊息。 + 訊息去重失敗,請再試一次 diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 19c28c7c..396f5bf9 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -154,6 +154,7 @@ Next Clear Message details + Reactions Type: %s From: %s To: %s