diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0b737c568..e25e1be7a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -19,7 +19,7 @@ jobs: java-version: '11' distribution: 'adopt' - name: Download WebRTC - run: mkdir libs && wget -O libs/libwebrtc-m99.aar https://gultsch.de/files/libwebrtc-m99.aar + run: mkdir libs && wget -O libs/libwebrtc-m92.aar https://gultsch.de/files/libwebrtc-m92.aar - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build Quicksy diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..16a45f234 --- /dev/null +++ b/.tx/config @@ -0,0 +1,21 @@ +[main] +host = https://www.transifex.com +lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw + +[conversations.main-strings] +file_filter = src/main/res/values-/strings.xml +source_file = src/main/res/values/strings.xml +source_lang = en + +[conversations.quicksy-strings] +file_filter = src/quicksy/res/values-/strings.xml +source_file = src/quicksy/res/values/strings.xml +source_lang = en +type = ANDROID + +[conversations.conversations-strings] +file_filter = src/conversations/res/values-/strings.xml +source_file = src/conversations/res/values/strings.xml +source_lang = en +type = ANDROID + diff --git a/Gemfile b/Gemfile deleted file mode 100644 index bc1d46abc..000000000 --- a/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem "fastlane" -gem "screengrab" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 22cbee257..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,221 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.5) - rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) - atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.566.0) - aws-sdk-core (3.130.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - claide (1.1.0) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - declarative (0.0.20) - digest-crc (0.6.4) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.3) - excon (0.91.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.204.3) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) - naturally (~> 2.2) - optparse (~> 0.1.1) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.16.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.2) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.10.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.11.0) - google-apis-core (>= 0.4, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.36.1) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.1.2) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - highline (2.0.3) - http-cookie (1.0.4) - domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.6.1) - json (2.6.1) - jwt (2.3.0) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.1.2) - multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) - naturally (2.2.1) - optparse (0.1.1) - os (1.1.4) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.6) - representable (3.1.1) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.5) - rouge (2.0.7) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - screengrab (1.0.0) - fastlane (>= 2.0.0, < 3.0.0) - security (0.1.3) - signet (0.16.1) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.8) - CFPropertyList - naturally - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.1) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) - unicode-display_width (1.8.0) - webrick (1.7.0) - word_wrap (1.0.0) - xcodeproj (1.21.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - fastlane - screengrab - -BUNDLED WITH - 2.2.5 diff --git a/README.md b/README.md index 5a0d661aa..4ea67449e 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,3 @@ # Cheogram Android This is a fork of [Conversations](https://conversations.im) to implement features of use to the [Sopranica](https://soprani.ca) project. - -The Cheogram Android app allows you to join a worldwide communication network. It especially focuses on features useful to users who want to contact those on other networks as well, such as SMS-enabled phone numbers. - -Based on the app Conversations, but with unique features: - -* Messages with both media and text, including animated media -* Unobtrusive display of subject lines, where present -* Links to known contacts are shown with their name -* Integrates with gateways' add contact flows -* When using a gateway to the phone network, integrate with the native Android Phone app -* Address book integration - -Where to get service: - -Cheogram Android requires you have an account with a Jabber service. You can run your own service, or use one provided by someone else, for example: https://snikket.org/hosting/ - -Art in screenshots is from https://www.peppercarrot.com by David Revoy, CC-BY. Artwork has been modified to crop out sections for avatars and photos, and in some cases add transparency. Use of this artwork does not imply endorsement of this project by the artist. - -## Getting Help - -If you have any questions about this app, or wish to report a bug, please come by the chatroom at xmpp:discuss@conference.soprani.ca?join or [on the web](https://anonymous.cheogram.com/discuss@conference.soprani.ca). - -## Contributing - -If you have code or patches you wish to contribute, the maintainer's preferred mechanism is a git pull request. Push your changes to a git repository somewhere, for example: - - git remote rename origin upstream - git remote add origin git@git.sr.ht:~yourname/cheogram-android - git push -u origin master - -Then generate the pull request: - - git fetch upstream master - git request-pull -p upstream/master origin - -And copy-paste the result into a plain-text email to: dev@singpolyma.net - -You may alternately use a patch-based approach as described on https://git-send-email.io - -Contributions follow an inbound=outbound model -- you (or your employer) keep all copyright on your patches, but agree to license them according to this project's COPYING file. diff --git a/art/ic_launcher.svg b/art/ic_launcher.svg index 68c403ecb..96b17d2b4 100644 --- a/art/ic_launcher.svg +++ b/art/ic_launcher.svg @@ -1,25 +1,427 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index c33b5646a..caf02dcda 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ configurations { playstoreImplementation freeImplementation conversationsFreeImplementation - cheogramPlaystoreImplementation + conversationsPlaystorImplementation conversationsPlaystoreImplementation quicksyPlaystoreImplementation quicksyPlaystoreImplementation @@ -49,13 +49,6 @@ configurations { } dependencies { - androidTestImplementation 'tools.fastlane:screengrab:2.1.1' - androidTestImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test:rules:1.3.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'androidx.viewpager:viewpager:1.0.0' playstoreImplementation('com.google.firebase:firebase-messaging:23.0.0') { @@ -63,7 +56,6 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' } - cheogramPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2") conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2") quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1' implementation 'org.sufficientlysecure:openpgp-api:10.0' @@ -74,8 +66,8 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation "androidx.emoji2:emoji2:1.1.0" - freeImplementation "androidx.emoji2:emoji2-bundled:1.1.0" + implementation "androidx.emoji2:emoji2:1.1.0-rc01" + freeImplementation "androidx.emoji2:emoji2-bundled:1.1.0-rc01" implementation 'org.bouncycastle:bcmail-jdk15on:1.64' //zxing stopped supporting Java 7 so we have to stick with 3.3.3 @@ -88,8 +80,8 @@ dependencies { implementation "com.wefika:flowlayout:0.4.1" implementation 'com.otaliastudios:transcoder:0.10.4' - implementation 'org.jxmpp:jxmpp-jid:1.0.3' - implementation 'org.osmdroid:osmdroid-android:6.1.11' + implementation 'org.jxmpp:jxmpp-jid:1.0.2' + implementation 'org.osmdroid:osmdroid-android:6.1.10' implementation 'org.hsluv:hsluv:0.2' implementation 'org.conscrypt:conscrypt-android:2.5.2' implementation 'me.drakeet.support:toastcompat:1.1.0' @@ -117,16 +109,16 @@ android { compileSdkVersion 31 defaultConfig { - minSdkVersion 21 - targetSdkVersion 30 - versionCode 42024 + grgit.tag.list().findAll { it.dateTime != null }.size() - versionName grgit.describe(always: true) + minSdkVersion 24 + targetSdkVersion 29 + versionCode 42024 + grgit.tag.list().size() + versionName grgit.describe(tags: true, always: true) + archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" resValue "string", "applicationId", applicationId def appName = "Conversations" resValue "string", "app_name", appName buildConfigField "String", "APP_NAME", "\"$appName\""; - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/cheogram.doap b/cheogram.doap deleted file mode 100644 index 3db88c914..000000000 --- a/cheogram.doap +++ /dev/null @@ -1,459 +0,0 @@ - - - - - Cheogram Android - - 2021-06-12 - - Android Jabber Client - - Cheogram is a freedomware client for the Jabber network (using the XMPP protocol) with a focus on features for gateway users. - - - - - - - - - - - en - - - - - - - - Java - - Android - - - - - - - - - Soprani.ca - - - - - - - - - - - - - - - - - - - - complete - 1.4 - - - - - - complete - 2.5rc3 - - - - - - complete - 1.32.0 - - - - - - complete - 1.1 - - - - - - complete - 1.1 - - - - - - complete - 1.2 - - - - - - partial - 1.2 - Avatars only - - - - - - complete - 1.1.3 - - - - - - complete - 2.1 - - - - - - complete - 1.1 - - - - - - complete - 1.5.1 - - - - - - partial - 1.1 - Read only. Publication via XEP-0398 - - - - - - complete - 1.2.1 - Avatar, Nick, OMEMO - - - - - - complete - 1.1.2 - File transfer + A/V calls - - - - - - complete - 1.2.1 - - - - - - complete - 1.1 - read only - - - - - - complete - 1.1 - - - - - - complete - 1.4.0 - - - - - - complete - 1.3 - - - - - - complete - 1.6 - - - - - - complete - 2.0.1 - - - - - - complete - 2.0.1 - - - - - - complete - 0.7 - - - - - - complete - 1.1 - - - - - - complete - 0.19.1 - - - - - - complete - 1.3 - - - - - - complete - 1.0 - - - - - - complete - 1.2 - - - - - - complete - 1.0.3 - - - - - - complete - 1.0 - - - - - - complete - 0.13.1 - - - - - - complete - 1.0.1 - - - - - - complete - 1.0 - - - - - - complete - 1.2.0 - - - - - - complete - 0.6.3 - - - - - - complete - 1.0.2 - opt-in - - - - - - complete - 1.0.0 - - - - - - complete - 0.3 - - - - - - complete - 1.0.0 - - - - - - complete - 1.0.0 - - - - - - complete - 0.3.0 - - - - - - complete - 0.3.0 - - - - - - complete - 0.4.0 - Only available in the version distributed over Google Play - - - - - - complete - 1.0.0 - - - - - - complete - 1.1.0 - - - - - - complete - 0.2 - - - - - - complete - 0.3.0 - - - - - - complete - 0.1.2 - 2.5.8 - - - - - - complete - 0.6.0 - 2.3.1 - - - - - - complete - 0.1.4 - 1.22.0 - - - - - - complete - 0.1 - 2.5.8 - - - - - - complete - 0.2.1 - - - - - - complete - 1.0.1 - 2.5.4 - - - - - - complete - 0.2.0 - - - - - - complete - 0.1.0 - - - - diff --git a/conversations.doap b/conversations.doap new file mode 100644 index 000000000..93a7df126 --- /dev/null +++ b/conversations.doap @@ -0,0 +1,472 @@ + + + + + Conversations + + 2014-01-14 + + Android XMPP Client + + Conversations is an open source XMPP/Jabber client for the Android platform + + + + + + + + + + + + en + + + + + + + + + + + + + Java + + Android + + + + + + + + Daniel Gultsch + + + + + + + + + + + + + + + + + + + + complete + 1.4 + + + + + + complete + 2.5rc3 + + + + + + complete + 1.32.0 + + + + + + complete + 1.1 + + + + + + complete + 1.1 + + + + + + complete + 1.2 + + + + + + partial + 1.2 + Avatars only + + + + + + complete + 1.1.3 + + + + + + complete + 2.1 + + + + + + complete + 1.1 + + + + + + complete + 1.5.1 + + + + + + partial + 1.1 + Read only. Publication via XEP-0398 + + + + + + complete + 1.2.1 + Avatar, Nick, OMEMO + + + + + + complete + 1.1.2 + File transfer + A/V calls + + + + + + complete + 1.2.1 + + + + + + complete + 1.1 + read only + + + + + + complete + 1.1 + + + + + + complete + 1.4.0 + + + + + + complete + 1.3 + + + + + + complete + 1.6 + + + + + + complete + 2.0.1 + + + + + + complete + 2.0.1 + + + + + + complete + 0.7 + + + + + + complete + 1.1 + + + + + + complete + 0.19.1 + + + + + + complete + 1.3 + + + + + + complete + 1.0 + + + + + + complete + 1.2 + + + + + + complete + 1.0.3 + + + + + + complete + 1.0 + + + + + + complete + 0.13.1 + + + + + + complete + 1.0.1 + + + + + + complete + 1.0 + + + + + + complete + 1.2.0 + + + + + + complete + 0.6.3 + + + + + + complete + 1.0.2 + opt-in + + + + + + complete + 1.0.0 + + + + + + complete + 0.3 + + + + + + complete + 1.0.0 + + + + + + complete + 1.0.0 + + + + + + complete + 0.3.0 + + + + + + complete + 0.3.0 + + + + + + complete + 0.4.0 + Only available in the version distributed over Google Play + + + + + + complete + 1.0.0 + + + + + + complete + 1.1.0 + + + + + + complete + 0.2 + + + + + + complete + 0.3.0 + + + + + + complete + 0.1.2 + 2.5.8 + + + + + + complete + 0.6.0 + 2.3.1 + + + + + + complete + 0.1.4 + 1.22.0 + + + + + + complete + 0.1 + 2.5.8 + + + + + + complete + 0.2.1 + + + + + + complete + 1.0.1 + 2.5.4 + + + + + + complete + 0.2.0 + + + + + + complete + 0.1.0 + + + + + + 2.9.13 + 2021-05-03 + + + + + diff --git a/fastlane/Appfile b/fastlane/Appfile deleted file mode 100644 index 03f2a0370..000000000 --- a/fastlane/Appfile +++ /dev/null @@ -1,2 +0,0 @@ -json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.cheogram.android") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile deleted file mode 100644 index ec1fe5a71..000000000 --- a/fastlane/Fastfile +++ /dev/null @@ -1,38 +0,0 @@ -# This file contains the fastlane.tools configuration -# You can find the documentation at https://docs.fastlane.tools -# -# For a list of all available actions, check out -# -# https://docs.fastlane.tools/actions -# -# For a list of all available plugins, check out -# -# https://docs.fastlane.tools/plugins/available-plugins -# - -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - -default_platform(:android) - -platform :android do - desc "Build debug and test APK for screenshots" - lane :build_for_screengrab do - build_android_app( - task: 'assemble', - flavor: 'CheogramFree', - build_type: 'Debug' - ) - build_android_app( - task: 'assemble', - flavor: 'CheogramFree', - build_type: 'DebugAndroidTest' - ) - end - - desc "Build and take screenshots" - lane :build_and_screengrab do - build_for_screengrab - capture_android_screenshots - end -end diff --git a/fastlane/Screengrabfile b/fastlane/Screengrabfile deleted file mode 100644 index 1459e884a..000000000 --- a/fastlane/Screengrabfile +++ /dev/null @@ -1,5 +0,0 @@ -locales ['en-US'] -clear_previous_screenshots true -tests_apk_path 'build/outputs/apk/androidTest/cheogramFree/debug/Conversations-cheogram-free-debug-androidTest.apk' -app_apk_path 'build/outputs/apk/cheogramFree/debug/Conversations-cheogram-free-debug.apk' -test_instrumentation_runner 'androidx.test.runner.AndroidJUnitRunner' \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/349.txt b/fastlane/metadata/android/en-US/changelogs/349.txt new file mode 100644 index 000000000..b8f22adef --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/349.txt @@ -0,0 +1,4 @@ +* Introduce expert setting to perform channel discovery on local server instead of search.jabber.network +* Enable delivery check marks by default and remove setting +* Enable ‘Send button indicates status’ by default and remove setting +* Move Backup and Foreground Service settings to main screen diff --git a/fastlane/metadata/android/en-US/changelogs/351.txt b/fastlane/metadata/android/en-US/changelogs/351.txt new file mode 100644 index 000000000..8fabff2f1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/351.txt @@ -0,0 +1,3 @@ +* fixes for Jingle IBB file transfer +* fixes for repeated corrections filling up the database +* switched to Last Message Correction v1.1 diff --git a/fastlane/metadata/android/en-US/changelogs/353.txt b/fastlane/metadata/android/en-US/changelogs/353.txt new file mode 100644 index 000000000..63b829a80 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/353.txt @@ -0,0 +1,4 @@ +* let users set their own nick name +* resume download of OMEMO encrypted files +* Channels now use '#' as symbol in avatar +* Quicksy uses 'always' as OMEMO encryption default (hides lock icon) diff --git a/fastlane/metadata/android/en-US/changelogs/360.txt b/fastlane/metadata/android/en-US/changelogs/360.txt new file mode 100644 index 000000000..87b92f033 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/360.txt @@ -0,0 +1 @@ +* Support for ?register and ?register;preauth XMPP uri parameters diff --git a/fastlane/metadata/android/en-US/changelogs/362.txt b/fastlane/metadata/android/en-US/changelogs/362.txt new file mode 100644 index 000000000..f4bbc2ab1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/362.txt @@ -0,0 +1 @@ +* Support automatic theme switching on Android 10 diff --git a/fastlane/metadata/android/en-US/changelogs/364.txt b/fastlane/metadata/android/en-US/changelogs/364.txt new file mode 100644 index 000000000..ed2c80678 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/364.txt @@ -0,0 +1,2 @@ +* Provide PDF preview on Android 5+ +* Use 12 byte IVs for OMEMO diff --git a/fastlane/metadata/android/en-US/changelogs/367.txt b/fastlane/metadata/android/en-US/changelogs/367.txt new file mode 100644 index 000000000..2f42bd95f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/367.txt @@ -0,0 +1,2 @@ +* Fix avatar selection on some Android 10 devices +* Fix file transfer for larger files diff --git a/fastlane/metadata/android/en-US/changelogs/379.txt b/fastlane/metadata/android/en-US/changelogs/379.txt new file mode 100644 index 000000000..a99adee16 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/379.txt @@ -0,0 +1 @@ +* Audio/Video calls (Requires server support in form of STUN and TURN servers discoverable via XEP-0215) diff --git a/fastlane/metadata/android/en-US/changelogs/381.txt b/fastlane/metadata/android/en-US/changelogs/381.txt new file mode 100644 index 000000000..a2df5e828 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/381.txt @@ -0,0 +1,2 @@ +* Audible feedback (dialing, call started, call ended) for voice calls. +* Fixed issue with retrying failed video call diff --git a/fastlane/metadata/android/en-US/changelogs/382.txt b/fastlane/metadata/android/en-US/changelogs/382.txt new file mode 100644 index 000000000..89fc89b78 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/382.txt @@ -0,0 +1,2 @@ +* Add button to switch camea during video call +* Fixed voice calls on tablets diff --git a/fastlane/metadata/android/en-US/changelogs/383.txt b/fastlane/metadata/android/en-US/changelogs/383.txt new file mode 100644 index 000000000..19c9a0116 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/383.txt @@ -0,0 +1,3 @@ +* Move call icon to the left in order to keep other toolbar icons in a consistent place +* Show call duration during audio calls +* Tie breaking for A/V calls (the same two people calling each other at the same time) diff --git a/fastlane/metadata/android/en-US/changelogs/387.txt b/fastlane/metadata/android/en-US/changelogs/387.txt new file mode 100644 index 000000000..2710be0a5 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/387.txt @@ -0,0 +1,2 @@ +* Rework Login with certificate UI +* Add ability to pin chats on top (add to favorites) diff --git a/fastlane/metadata/android/en-US/changelogs/388.txt b/fastlane/metadata/android/en-US/changelogs/388.txt new file mode 100644 index 000000000..6a4909652 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/388.txt @@ -0,0 +1,3 @@ +* Reduce echo during calls on some devices +* Fix login when passwords contains special characters +* Play dial and busy tones on speaker during video calls diff --git a/fastlane/metadata/android/en-US/changelogs/390.txt b/fastlane/metadata/android/en-US/changelogs/390.txt new file mode 100644 index 000000000..56ed78885 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/390.txt @@ -0,0 +1 @@ +* Offer to record voice message when callee is busy diff --git a/fastlane/metadata/android/en-US/changelogs/393.txt b/fastlane/metadata/android/en-US/changelogs/393.txt new file mode 100644 index 000000000..82250ee87 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/393.txt @@ -0,0 +1,3 @@ +* Show help button if A/V call fails +* Fixed some annoying crashes +* Fixed Jingle connections (file transfer + calls) with bare JIDs diff --git a/fastlane/metadata/android/en-US/changelogs/394.txt b/fastlane/metadata/android/en-US/changelogs/394.txt new file mode 100644 index 000000000..b04adbd56 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/394.txt @@ -0,0 +1,2 @@ +* Fixed notifications not showing up under certain conditions +* Fixed compatibility issues and crashes related to A/V calls diff --git a/fastlane/metadata/android/en-US/changelogs/395.txt b/fastlane/metadata/android/en-US/changelogs/395.txt new file mode 100644 index 000000000..76a654338 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/395.txt @@ -0,0 +1,3 @@ +* add 'Return to chat' to audio call screen +* Improve keyboard shortcuts +* bug fixes diff --git a/fastlane/metadata/android/en-US/changelogs/397.txt b/fastlane/metadata/android/en-US/changelogs/397.txt new file mode 100644 index 000000000..207b36708 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/397.txt @@ -0,0 +1,3 @@ +* Handle GPX files +* Improve performance for backup restore +* bug fixes diff --git a/fastlane/metadata/android/en-US/changelogs/398.txt b/fastlane/metadata/android/en-US/changelogs/398.txt new file mode 100644 index 000000000..95280ea88 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/398.txt @@ -0,0 +1,4 @@ +* Search individual conversations +* Notify user if message delivery fails +* Remember display names (nicks) from Quicksy users across restarts +* Add button to start Orbot (Tor) from notification if necessary diff --git a/fastlane/metadata/android/en-US/changelogs/401.txt b/fastlane/metadata/android/en-US/changelogs/401.txt new file mode 100644 index 000000000..0fba861d3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/401.txt @@ -0,0 +1,3 @@ +* fixed search on Android <= 5 +* optimize memory consumption + diff --git a/fastlane/metadata/android/en-US/changelogs/402.txt b/fastlane/metadata/android/en-US/changelogs/402.txt new file mode 100644 index 000000000..53f461756 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/402.txt @@ -0,0 +1,3 @@ +* Offer Easy Invite generation on supporting servers +* Display GIFs send from Movim +* store avatars in cache diff --git a/fastlane/metadata/android/en-US/changelogs/403.txt b/fastlane/metadata/android/en-US/changelogs/403.txt new file mode 100644 index 000000000..99d62ca48 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/403.txt @@ -0,0 +1,3 @@ +* Fixed connectivity issues when different accounts used different SCRAM mechanisms +* Add support for SCRAM-SHA-512 +* Allow P2P (Jingle) file transfer with self contact diff --git a/fastlane/metadata/android/en-US/changelogs/404.txt b/fastlane/metadata/android/en-US/changelogs/404.txt new file mode 100644 index 000000000..d4f2e7b6d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/404.txt @@ -0,0 +1 @@ +* minor stability improvements for A/V calls diff --git a/fastlane/metadata/android/en-US/changelogs/405.txt b/fastlane/metadata/android/en-US/changelogs/405.txt new file mode 100644 index 000000000..e858b6cd1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/405.txt @@ -0,0 +1 @@ +* Quicksy: Automatically receive verification SMS diff --git a/fastlane/metadata/android/en-US/changelogs/407.txt b/fastlane/metadata/android/en-US/changelogs/407.txt new file mode 100644 index 000000000..e746bc7d7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/407.txt @@ -0,0 +1,3 @@ +* Show call button for offline contacts if they previously announced support +* Back button no longer ends call when call is connected +* bug fixes diff --git a/fastlane/metadata/android/en-US/changelogs/42000.txt b/fastlane/metadata/android/en-US/changelogs/42000.txt new file mode 100644 index 000000000..1ecfe204d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42000.txt @@ -0,0 +1,4 @@ +* Ability to select incoming call ringtone +* Fix OpenPGP key id discovery for OpenKeychain 5.6+ +* Properly verify punycode TLS certificates +* Improve stability of RTP session establishment (calling) diff --git a/fastlane/metadata/android/en-US/changelogs/42006.txt b/fastlane/metadata/android/en-US/changelogs/42006.txt new file mode 100644 index 000000000..91e2b904f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42006.txt @@ -0,0 +1,2 @@ +* Verify A/V calls with preexisting OMEMO sessions +* Improve compatibility with non libwebrtc WebRTC implementations diff --git a/fastlane/metadata/android/en-US/changelogs/42010.txt b/fastlane/metadata/android/en-US/changelogs/42010.txt new file mode 100644 index 000000000..3a1c234c1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42010.txt @@ -0,0 +1,2 @@ +* Various bug fixes around Tor support +* Improve call compatibility with Dino diff --git a/fastlane/metadata/android/en-US/changelogs/42012.txt b/fastlane/metadata/android/en-US/changelogs/42012.txt new file mode 100644 index 000000000..967fae964 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42012.txt @@ -0,0 +1 @@ +* fix HTTP up/download for users that don’t trust system CAs diff --git a/fastlane/metadata/android/en-US/changelogs/42013.txt b/fastlane/metadata/android/en-US/changelogs/42013.txt new file mode 100644 index 000000000..8749f0a0f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42013.txt @@ -0,0 +1 @@ +* Fixed 'No Connectivity' issues on Android 7.1 diff --git a/fastlane/metadata/android/en-US/changelogs/42014.txt b/fastlane/metadata/android/en-US/changelogs/42014.txt new file mode 100644 index 000000000..8ae96511e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42014.txt @@ -0,0 +1,2 @@ +* Always verify domain name. No user overwrite +* Support roster pre authentication diff --git a/fastlane/metadata/android/en-US/changelogs/42015.txt b/fastlane/metadata/android/en-US/changelogs/42015.txt new file mode 100644 index 000000000..1d478b5a0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42015.txt @@ -0,0 +1 @@ +* minor A/V improvements diff --git a/fastlane/metadata/android/en-US/changelogs/42018.txt b/fastlane/metadata/android/en-US/changelogs/42018.txt new file mode 100644 index 000000000..8f4d66caa --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42018.txt @@ -0,0 +1,3 @@ +* Show black bars when remote video does not match aspect ratio of screen +* Improve search performance +* Add setting to prevent screenshots diff --git a/fastlane/metadata/android/en-US/changelogs/42022.txt b/fastlane/metadata/android/en-US/changelogs/42022.txt new file mode 100644 index 000000000..eaaa190fa --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42022.txt @@ -0,0 +1,2 @@ +* Fix issue with some videos not being compressed +* Fix rare crash when opening notification diff --git a/fastlane/metadata/android/en-US/changelogs/42023.txt b/fastlane/metadata/android/en-US/changelogs/42023.txt new file mode 100644 index 000000000..ed3c25380 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42023.txt @@ -0,0 +1,2 @@ +* Fix crash when rendering some quotes +* Fix crash in welcome screen diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 475532ab8..e3b806b02 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,18 +1,39 @@ -The Cheogram Android app allows you to join a worldwide communication network. It especially focuses on features useful to users who want to contact those on other networks as well, such as SMS-enabled phone numbers. +Easy to use, reliable, battery friendly. With built-in support for images, group chats and e2e encryption. -Based on the app Conversations, but with unique features: +Design principles: -* Messages with both media and text, including animated media -* Unobtrusive display of subject lines, where present -* Links to known contacts are shown with their name -* Show timestamps for calls -* Missed call notifications -* Integrates with gateways' add contact flows -* When using a gateway to the phone network, integrate with the native Android Phone app +* Be as beautiful and easy to use as possible without sacrificing security or privacy +* Rely on existing, well established protocols +* Do not require a Google Account or specifically Google Cloud Messaging (GCM) +* Require as few permissions as possible + +Features: + +* End-to-end encryption with either OMEMO or OpenPGP +* Sending and receiving images +* Encrypted audio and video calls (DTLS-SRTP) +* Intuitive UI that follows Android Design guidelines +* Pictures / Avatars for your Contacts +* Syncs with desktop client +* Conferences (with support for bookmarks) * Address book integration +* Multiple accounts / unified inbox +* Very low impact on battery life -Where to get service: +Conversations makes it very easy to create an account on the conversations.im server. Using that server comes with an annual fee of 8 Euro after a 6 month trial period. However Conversations will work with any other XMPP server as well. A lot of XMPP servers are run by volunteers and are free of charge. -Cheogram Android requires you have an account with a Jabber service. You can run your own service, or use one provided by someone else, for example: https://snikket.org/hosting/ +XMPP Features: -Art in screenshots is from https://www.peppercarrot.com by David Revoy, CC-BY. Artwork has been modified to crop out sections for avatars and photos, and in some cases add transparency. Use of this artwork does not imply endorsement of this project by the artist. +Conversations works with every XMPP server out there. However XMPP is an extensible protocol. These extensions are standardized as well in so called XEP’s. Conversations supports a couple of those to make the overall user experience better. There is a chance that your current XMPP server does not support these extensions. Therefore to get the most out of Conversations you should consider either switching to an XMPP server that does or - even better - run your own XMPP server for you and your friends. + +These XEPs are - as of now: + +* XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer files if both parties are behind a firewall (NAT). +* XEP-0163: Personal Eventing Protocol for avatars +* XEP-0191: Blocking command lets you blacklist spammers or block contacts without removing them from your roster. +* XEP-0198: Stream Management allows XMPP to survive small network outages and changes of the underlying TCP connection. +* XEP-0280: Message Carbons which automatically syncs the messages you send to your desktop client and thus allows you to switch seamlessly from your mobile client to your desktop client and back within one conversation. +* XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections +* XEP-0313: Message Archive Management synchronize message history with the server. Catch up with messages that were sent while Conversations was offline. +* XEP-0352: Client State Indication lets the server know whether or not Conversations is in the background. Allows the server to save bandwidth by withholding unimportant packages. +* XEP-0363: HTTP File Upload allows you to share files in conferences and with offline contacts. Requires an additional component on your server. diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png new file mode 100644 index 000000000..edf446926 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png new file mode 100644 index 000000000..a3ea7d690 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png new file mode 100644 index 000000000..b1847dae1 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png new file mode 100644 index 000000000..76d112650 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png new file mode 100644 index 000000000..bf13cd25d Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png new file mode 100644 index 000000000..fc57ca922 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png new file mode 100644 index 000000000..44ce5f93b Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png new file mode 100644 index 000000000..94840e6c6 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png new file mode 100644 index 000000000..0d18d8ce6 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/conversation.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/conversation.png deleted file mode 100644 index 860a7c132..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/conversation.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/dialler.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/dialler.png deleted file mode 100644 index c4c5e60be..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/dialler.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversation.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversation.png deleted file mode 100644 index 762cb978c..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversation.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversationOptions.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversationOptions.png deleted file mode 100644 index 0f3a7a4d4..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/startConversationOptions.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png new file mode 100644 index 000000000..d447c6b85 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png new file mode 100644 index 000000000..071008a45 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png new file mode 100644 index 000000000..03b513ea4 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png new file mode 100644 index 000000000..3e154ea82 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index cfce968a0..4b41cb27b 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Chat on the Jabber network (XMPP protocol); focus on features for gateway users +An encrypted, user friendly XMPP instant messaging client optimized for mobile \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..8c0fb64a8 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4dc267f8b..162dd9b7f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Sat Nov 14 09:59:55 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/gradlew b/gradlew index 1b6c78733..91a7e269e 100755 --- a/gradlew +++ b/gradlew @@ -1,129 +1,79 @@ -#!/bin/sh - -# -# 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. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# +#!/usr/bin/env bash ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# 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/. -# +## +## Gradle start up script for UN*X +## ############################################################################## -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - # 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"' +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" -warn () { +warn ( ) { echo "$*" -} >&2 +} -die () { +die ( ) { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +82,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" 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 @@ -140,95 +90,75 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# 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. +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi -exec "$JAVACMD" "$@" +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..aec99730b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,19 +1,3 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -24,23 +8,20 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if "%ERRORLEVEL%" == "0" goto init echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +35,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto execute +if exist "%JAVA_EXE%" goto init echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,14 +45,34 @@ echo location of your Java installation. goto fail +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + :execute @rem Setup the command line 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%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% :end @rem End local scope for the variables with windows NT shell diff --git a/src/androidTest/java/com/cheogram/android/test/ScreenshotTest.java b/src/androidTest/java/com/cheogram/android/test/ScreenshotTest.java deleted file mode 100644 index ce0fd62ad..000000000 --- a/src/androidTest/java/com/cheogram/android/test/ScreenshotTest.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.cheogram.android.test; - -import java.util.concurrent.TimeoutException; -import java.lang.Thread; -import java.util.Arrays; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import android.app.Activity; -import android.content.Intent; -import android.graphics.Bitmap; -import android.net.Uri; -import android.os.Bundle; -import android.util.Log; - -import androidx.test.InstrumentationRegistry; -import androidx.test.core.app.ActivityScenario; -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.rules.ActivityScenarioRule; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.rule.ServiceTestRule; -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.action.ViewActions.click; -import static androidx.test.espresso.matcher.ViewMatchers.withId; - -import tools.fastlane.screengrab.Screengrab; -import tools.fastlane.screengrab.cleanstatusbar.CleanStatusBar; -import tools.fastlane.screengrab.locale.LocaleTestRule; - -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.entities.ServiceDiscoveryResult; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.test.R; -import eu.siacs.conversations.ui.ConversationsActivity; -import eu.siacs.conversations.ui.StartConversationActivity; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; - -@RunWith(AndroidJUnit4.class) -public class ScreenshotTest { - - static String pkg = InstrumentationRegistry.getInstrumentation().getContext().getPackageName(); - static XmppConnectionService xmppConnectionService; - static Account account; - - @ClassRule - public static final LocaleTestRule localeTestRule = new LocaleTestRule(); - - @ClassRule - public static final ServiceTestRule xmppServiceRule = new ServiceTestRule(); - - @BeforeClass - public static void setup() throws TimeoutException { - CleanStatusBar.enableWithDefaults(); - - Intent intent = new Intent(ApplicationProvider.getApplicationContext(), XmppConnectionService.class); - intent.setAction("ui"); - xmppConnectionService = ((XmppConnectionBinder) xmppServiceRule.bindService(intent)).getService(); - account = xmppConnectionService.findAccountByJid(Jid.of("carrot@chaosah.hereva")); - if (account == null) { - account = new Account( - Jid.of("carrot@chaosah.hereva"), - "orangeandfurry" - ); - xmppConnectionService.createAccount(account); - } - - Uri avatarUri = Uri.parse("android.resource://" + pkg + "/" + String.valueOf(R.drawable.carrot)); - final Avatar avatar = xmppConnectionService.getFileBackend().getPepAvatar(avatarUri, 192, Bitmap.CompressFormat.WEBP); - xmppConnectionService.getFileBackend().save(avatar); - account.setAvatar(avatar.getFilename()); - - Contact cheogram = account.getRoster().getContact(Jid.of("cheogram.com")); - cheogram.setOption(Contact.Options.IN_ROSTER); - cheogram.setPhotoUri("android.resource://" + pkg + "/" + String.valueOf(R.drawable.cheogram)); - Presence cheogramPresence = Presence.parse(null, null, ""); - IqPacket discoPacket = new IqPacket(IqPacket.TYPE.RESULT); - Element query = discoPacket.addChild("query", "http://jabber.org/protocol/disco#info"); - Element identity = query.addChild("identity"); - identity.setAttribute("category", "gateway"); - identity.setAttribute("type", "pstn"); - cheogramPresence.setServiceDiscoveryResult(new ServiceDiscoveryResult(discoPacket)); - cheogram.updatePresence("gw", cheogramPresence); - } - - @AfterClass - public static void teardown() { - CleanStatusBar.disable(); - } - - @Test - public void testConversation() throws FileBackend.FileCopyException, InterruptedException { - Conversation conversation = xmppConnectionService.findOrCreateConversation(account, Jid.of("+15550737737@cheogram.com"), false, false); - conversation.getContact().setOption(Contact.Options.IN_ROSTER); - conversation.getContact().setSystemName("Pepper"); - conversation.getContact().setPhotoUri("android.resource://" + pkg + "/" + String.valueOf(R.drawable.pepper)); - - Message voicemail = new Message(conversation, "", 0, Message.STATUS_RECEIVED); - voicemail.setOob("https://example.com/thing.mp3"); - voicemail.setFileParams(new Message.FileParams("https://example.com/thing.mp3|5000|0|0|10000")); - voicemail.setType(Message.TYPE_FILE); - voicemail.setSubject("Voicemail Recording"); - - Message transcript = new Message(conversation, "Where are you?", 0, Message.STATUS_RECEIVED); - transcript.setSubject("Voicemail Transcription"); - - Message picture = new Message(conversation, "", 0, Message.STATUS_SEND_RECEIVED); - picture.setOob("https://example.com/thing.webp"); - picture.setType(Message.TYPE_FILE); - xmppConnectionService.getFileBackend().copyFileToPrivateStorage( - picture, - Uri.parse("android.resource://" + pkg + "/" + String.valueOf(R.drawable.komona)), - "image/webp" - ); - xmppConnectionService.getFileBackend().updateFileParams(picture); - - conversation.addAll(0, Arrays.asList( - voicemail, - transcript, - new Message(conversation, "Meow", 0, Message.STATUS_SEND_RECEIVED), - picture, - new Message(conversation, "👍", 0, Message.STATUS_RECEIVED) - )); - - ActivityScenario scenario = ActivityScenario.launch(ConversationsActivity.class); - scenario.onActivity((Activity activity) -> { - ((ConversationsActivity) activity).switchToConversation(conversation); - }); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); - Thread.sleep(100); // ImageView not paited yet after waitForIdleSync - Screengrab.screenshot("conversation"); - } - - @Test - public void testStartConversation() throws InterruptedException { - ActivityScenario scenario = ActivityScenario.launch(StartConversationActivity.class); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); - Thread.sleep(100); // ImageView not paited yet after waitForIdleSync - Screengrab.screenshot("startConversation"); - } - - @Test - public void testAddContact() throws InterruptedException { - ActivityScenario scenario = ActivityScenario.launch(StartConversationActivity.class); - onView(withId(eu.siacs.conversations.R.id.speed_dial)).perform(click()); - Screengrab.screenshot("startConversationOptions"); - - // Not actually online, so can't screenshot the gateway selector yet - /*onView(withId(eu.siacs.conversations.R.id.create_contact)).perform(click()); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); - Thread.sleep(10000); // ImageView not paited yet after waitForIdleSync - Screengrab.screenshot("addContact");*/ - } -} diff --git a/src/androidTest/res/drawable/carrot.webp b/src/androidTest/res/drawable/carrot.webp deleted file mode 100644 index cf0cd1288..000000000 Binary files a/src/androidTest/res/drawable/carrot.webp and /dev/null differ diff --git a/src/androidTest/res/drawable/cheogram.png b/src/androidTest/res/drawable/cheogram.png deleted file mode 100644 index ff4b5cf9c..000000000 Binary files a/src/androidTest/res/drawable/cheogram.png and /dev/null differ diff --git a/src/androidTest/res/drawable/komona.webp b/src/androidTest/res/drawable/komona.webp deleted file mode 100644 index 19cb20d1d..000000000 Binary files a/src/androidTest/res/drawable/komona.webp and /dev/null differ diff --git a/src/androidTest/res/drawable/pepper.webp b/src/androidTest/res/drawable/pepper.webp deleted file mode 100644 index fd3d822f0..000000000 Binary files a/src/androidTest/res/drawable/pepper.webp and /dev/null differ diff --git a/src/cheogram/java/com/cheogram/android/ConnectionService.java b/src/cheogram/java/com/cheogram/android/ConnectionService.java index 13b3041da..08091e2d7 100644 --- a/src/cheogram/java/com/cheogram/android/ConnectionService.java +++ b/src/cheogram/java/com/cheogram/android/ConnectionService.java @@ -249,7 +249,7 @@ public class ConnectionService extends android.telecom.ConnectionService { @Override public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set availableAudioDevices) { - if (Build.VERSION.SDK_INT < 26) return; + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) return; switch(selectedAudioDevice) { case SPEAKER_PHONE: diff --git a/src/cheogramPlaystore b/src/cheogramPlaystore deleted file mode 120000 index 8bac2e8a7..000000000 --- a/src/cheogramPlaystore +++ /dev/null @@ -1 +0,0 @@ -conversationsPlaystore/ \ No newline at end of file diff --git a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java index 6e4815159..90c214ab4 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java @@ -134,8 +134,6 @@ public class ImportBackupActivity extends ActionBarActivity implements ServiceCo } catch (final IOException | IllegalArgumentException e) { Log.d(Config.LOGTAG, "unable to open backup file " + uri, e); Snackbar.make(binding.coordinator, R.string.not_a_backup_file, Snackbar.LENGTH_LONG).show(); - } catch (final SecurityException e) { - Snackbar.make(binding.coordinator, R.string.sharing_application_not_grant_permission, Snackbar.LENGTH_LONG).show(); } } diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index bd4d625db..f3922675d 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -74,7 +74,7 @@ android:name="com.google.android.gms.car.application" android:resource="@xml/automotive_app_desc" /> - + diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 1af87324d..b00e27c62 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -37,7 +37,6 @@ import androidx.core.content.FileProvider; import androidx.exifinterface.media.ExifInterface; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; import com.google.common.io.ByteStreams; import java.io.ByteArrayOutputStream; @@ -88,38 +87,21 @@ public class FileBackend { private static final float IGNORE_PADDING = 0.15f; private final XmppConnectionService mXmppConnectionService; - private static final List STORAGE_TYPES; - - static { - final ImmutableList.Builder builder = - new ImmutableList.Builder() - .add( - Environment.DIRECTORY_DOWNLOADS, - Environment.DIRECTORY_PICTURES, - Environment.DIRECTORY_MOVIES, - Environment.DIRECTORY_DOCUMENTS); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - builder.add(Environment.DIRECTORY_RECORDINGS); - } - STORAGE_TYPES = builder.build(); - } - public FileBackend(XmppConnectionService service) { this.mXmppConnectionService = service; } public static long getFileSize(Context context, Uri uri) { - try (final Cursor cursor = - context.getContentResolver().query(uri, null, null, null, null)) { + try { + final Cursor cursor = context.getContentResolver().query(uri, null, null, null, null); if (cursor != null && cursor.moveToFirst()) { - final int index = cursor.getColumnIndex(OpenableColumns.SIZE); - if (index == -1) { - return -1; - } - return cursor.getLong(index); + long size = cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE)); + cursor.close(); + return size; + } else { + return -1; } - return -1; - } catch (final Exception ignored) { + } catch (Exception e) { return -1; } } @@ -384,12 +366,8 @@ public class FileBackend { } private static boolean weOwnFileLollipop(final Uri uri) { - final String path = uri.getPath(); - if (path == null) { - return false; - } try { - File file = new File(path); + File file = new File(uri.getPath()); FileDescriptor fd = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY) .getFileDescriptor(); @@ -884,20 +862,6 @@ public class FileBackend { return new File(appDirectory, filename); } - public static boolean inConversationsDirectory(final Context context, String path) { - final File fileDirectory = new File(path).getParentFile(); - for (final String type : STORAGE_TYPES) { - final File typeDirectory = - new File( - Environment.getExternalStoragePublicDirectory(type), - context.getString(R.string.app_name)); - if (typeDirectory.equals(fileDirectory)) { - return true; - } - } - return false; - } - public void setupRelativeFilePath( final Message message, final String filename, final String mime) { final File file = getStorageLocation(filename, mime); diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 7bcd9d8a5..88b40e044 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1185,7 +1185,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } if (m.isFileOrImage() && !deleted && !cancelable) { final String path = m.getRelativeFilePath(); - if (path == null || !path.startsWith("/") || FileBackend.inConversationsDirectory(requireActivity(), path)) { + if (path == null || !path.startsWith("/")) { deleteFile.setVisible(true); deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m))); } diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java index b9abae46b..1b5a816e5 100644 --- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java @@ -432,7 +432,7 @@ public class RtpSessionActivity extends XmppActivity } } else if (asList(ACTION_MAKE_VIDEO_CALL, ACTION_MAKE_VOICE_CALL).contains(action)) { proposeJingleRtpSession(account, with, actionToMedia(action)); - setWith(account.getRoster().getContact(with), null); + setWith(account.getRoster().getContact(with)); } else { throw new IllegalStateException("received onNewIntent without sessionId"); } @@ -456,7 +456,7 @@ public class RtpSessionActivity extends XmppActivity } } else if (asList(ACTION_MAKE_VIDEO_CALL, ACTION_MAKE_VOICE_CALL).contains(action)) { proposeJingleRtpSession(account, with, actionToMedia(action)); - setWith(account.getRoster().getContact(with), null); + setWith(account.getRoster().getContact(with)); } else if (Intent.ACTION_VIEW.equals(action)) { final String extraLastState = intent.getStringExtra(EXTRA_LAST_REPORTED_STATE); final RtpEndUserState state = @@ -469,7 +469,7 @@ public class RtpSessionActivity extends XmppActivity updateIncomingCallScreen(state); invalidateOptionsMenu(); } - setWith(account.getRoster().getContact(with), state); + setWith(account.getRoster().getContact(with)); if (xmppConnectionService .getJingleConnectionManager() .fireJingleRtpConnectionStateUpdates()) { @@ -486,19 +486,13 @@ public class RtpSessionActivity extends XmppActivity } } - private void setWith(final RtpEndUserState state) { - setWith(getWith(), state); + private void setWith() { + setWith(getWith()); } - private void setWith(final Contact contact, final RtpEndUserState state) { + private void setWith(final Contact contact) { binding.with.setText(contact.getDisplayName()); - if (Arrays.asList(RtpEndUserState.INCOMING_CALL, RtpEndUserState.ACCEPTING_CALL) - .contains(state)) { - binding.withJid.setText(contact.getJid().asBareJid().toEscapedString()); - binding.withJid.setVisibility(View.VISIBLE); - } else { - binding.withJid.setVisibility(View.GONE); - } + binding.withJid.setText(contact.getJid().asBareJid().toEscapedString()); } private void proposeJingleRtpSession( @@ -704,7 +698,7 @@ public class RtpSessionActivity extends XmppActivity requireRtpConnection().getState())) { putScreenInCallMode(); } - setWith(currentState); + setWith(); updateVideoViews(currentState); updateStateDisplay(currentState, media); updateVerifiedShield(verified && STATES_SHOWING_SWITCH_TO_CHAT.contains(currentState)); @@ -723,7 +717,7 @@ public class RtpSessionActivity extends XmppActivity finish(); return; } - final RtpEndUserState state = terminatedRtpSession.state; + RtpEndUserState state = terminatedRtpSession.state; resetIntent(account, with, terminatedRtpSession.state, terminatedRtpSession.media); updateButtonConfiguration(state); updateStateDisplay(state); @@ -731,7 +725,7 @@ public class RtpSessionActivity extends XmppActivity updateCallDuration(); updateVerifiedShield(false); invalidateOptionsMenu(); - setWith(account.getRoster().getContact(with), state); + setWith(account.getRoster().getContact(with)); } private void reInitializeActivityWithRunningRtpSession( diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java index 30ab1db48..90f27f65f 100644 --- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java @@ -528,12 +528,15 @@ public final class MimeUtils { public static String guessMimeTypeFromUriAndMime(final Context context, final Uri uri, final String mime) { Log.d(Config.LOGTAG, "guessMimeTypeFromUriAndMime " + uri + " and mime=" + mime); - final String guess = guessMimeTypeFromUri(context, uri); - if (guess != null) { - return guess; - } else { - return mime; + if (mime == null || mime.equals("application/octet-stream")) { + final String guess = guessMimeTypeFromUri(context, uri); + if (guess != null) { + return guess; + } else { + return mime; + } } + return guessMimeTypeFromUri(context, uri); } public static String guessMimeTypeFromUri(Context context, Uri uri) { diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml index 3d67d6727..e2a4dd9d2 100644 --- a/src/main/res/layout/activity_rtp_session.xml +++ b/src/main/res/layout/activity_rtp_session.xml @@ -53,27 +53,24 @@ android:layout_height="wrap_content" android:layout_below="@id/status" android:layout_marginLeft="16dp" + android:layout_marginTop="0dp" android:layout_marginRight="16dp" + android:layout_marginBottom="8dp" android:textAppearance="@style/TextAppearance.Conversations.Display2" android:textColor="@color/white" tools:text="Juliet Capulet" /> - - Lösche privaten Speicher, in dem die Dateien gespeichert werden (sie können erneut vom Server heruntergeladen werden) Ich habe diesen Link aus einer vertrauenswürdigen Quelle erhalten Du bist dabei, die OMEMO-Schlüssel von %1$s nach dem Klick auf diesen Link zu überprüfen. Dies ist nur sicher, wenn du diesen Link von einer vertrauenswürdigen Quelle erhalten hast, der nur von %2$s veröffentlicht werden konnte. - Du bist dabei, die OMEMO-Schlüssel deines eigenen Kontos zu verifizieren. Dies ist nur sicher, wenn du diesem Link aus einer vertrauenswürdigen Quelle gefolgt bist, bei der nur du diesen Link veröffentlicht haben kannst. - Weiter Überprüfe OMEMO-Schlüssel Inaktive anzeigen Inaktive ausblenden @@ -906,7 +904,6 @@ Eingehender Videoanruf Verbinden Verbunden - Erneut verbinden Anruf annehmen Anruf beenden Annehmen @@ -922,8 +919,6 @@ Auflegen Laufender Anruf Laufender Videoanruf - Anruf erneut verbinden - Videoanruf erneut verbinden Deaktiviere Tor, um Anrufe zu tätigen Eingehender Anruf Eingehender Anruf · %s @@ -973,7 +968,4 @@ Die Sicherung wurde gestartet. Du bekommst eine Benachrichtigung, sobald sie fertig ist. Video kann nicht aktiviert werden. Textdokument - Kontoregistrierungen werden nicht unterstützt - Keine XMPP-Adresse gefunden - - + diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index a5ea07ed0..be14eb100 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -622,8 +622,6 @@ Baleirar a almacenaxe privada onde se gardan os ficheiros (poderán volver a descargarse desde o servidor) Seguín esta ligazón desde unha fonte de confianza Vas verificar as chaves OMEMO de %1$s despois de premer na ligazón. Esto só é seguro se seguiches esta ligazón desde unha fonte de confianza onde só %2$s a podería ter publicado. - Vas verificar as chaves OMEMO da túa propia conta. Esto só é seguro se seguiches esta ligazón desde unha orixe segura onde só tí poderías ter publicado esta ligazón. - Continuar Validar chaves OMEMO Mostrar inactivos Agochar inactivos @@ -906,7 +904,6 @@ Videochamada entrante Conectando Conectado - Reconectando Aceptando a chamada Rematando a chamada Responder @@ -922,8 +919,6 @@ Colgar Chamada en curso Videochamada en curso - Reconectando a chamada - Reconectando a videochamada Desactivar Tor para facer chamadas Chamada entrante Conversa de · %s @@ -973,7 +968,4 @@ Comezou a creación da copia de apoio. Recibirás unha notificación cando remate. Non se puido activar o vídeo. Documento de texto plano - Non está permitido o rexistro de novas contas - Non se atopa un enderezo XMPP - - + diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 6fb2bc823..07a619dff 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -622,8 +622,6 @@ Svuota l\'archivio privato nella quale sono memorizzati i file (possono essere riscaricati dal server) Ho seguito questo link da una fonte fidata Stai per verificare le chiavi OMEMO di %1$s cliccando un link. Questo metodo è sicuro solo se hai seguito il link da una fonte fidata dove solo %2$s può averlo pubblicato. - Stai per verificare le chiavi OMEMO del tuo stesso account. Questo metodo è sicuro solo se hai seguito il link da una fonte fidata dove solo tu puoi averlo pubblicato. - Continua Verifica chiavi OMEMO Mostra inattivi Nascondi inattivi @@ -906,7 +904,6 @@ Chiamata video in arrivo Connessione Connesso - Riconnessione Accettazione chiamata Chiusura chiamata Rispondi @@ -922,8 +919,6 @@ Riaggancia Chiamata in corso Chiamata video in corso - Riconnessione chiamata - Riconnessione chiamata video Disattiva Tor per le chiamate Chiamata in arrivo Chiamata in arrivo · %s @@ -973,7 +968,4 @@ Il backup è iniziato. Riceverai una notifica una volta completato. Impossibile attivare il video. Documento di testo - Le registrazioni di profili non sono supportate - Nessun indirizzo XMPP trovato - - + diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index b1c0db084..2cba52246 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -632,8 +632,6 @@ Wyczyść prywatny magazyn gdzie trzymane są pliki (mogą zostać pobrane ponownie z serwera) Trafiłem na ten link w zaufanym źródle Zaraz zweryfikujesz klucz OMEMO %1$s klikając w link. Jest to bezpieczne jedynie, kiedy link pochodzi z zaufanego źródła gdzie tylko %2$s mógł go opublikować. - Weryfikujesz właśnie klucze OMEMO własnego konta. To jest bezpieczne tylko jeśli kliknąłeś łącze w miejscu w którym jedynie ty mogłeś je zamieścić. - Kontynuuj Zweryfikuj klucze OMEMO Pokaż nieaktywne Ukryj nieaktywne @@ -929,7 +927,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż Wideorozmowa przychodząca Łączenie Połączony - Ponowne łączenie Akceptowanie połączenia Kończenie połączenia Połącz @@ -945,8 +942,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż Rozłącz Połączenie wychodzące Wideorozmowa wychodząca - Ponowne łączenie rozmowy - Ponowne łączenie rozmowy wideo Wyłącz Tor aby dzwonić Połączenie przychodzące Połączenie przychodzące · %s @@ -1000,7 +995,4 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż Tworzenie kopii zapasowej się rozpoczęło. Dostaniesz powiadomienie kiedy się zakończy. Nie można włączyć wideo. Dokument zwykłego tekstu - Rejestracja kont nie jest wspierana - Nie znaleziono adresu XMPP - - + diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index 253c97ad1..93b11c506 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -627,8 +627,6 @@ Locul unde sunt fișierele păstrate (pot fi descărcate de pe server din nou) Am urmat această legătură de la o sursă de încredere Urmează să verificați cheile OMEMO pentru %1$s după ce veți deschide legătura. Acest lucru se poate face în siguranță doar dacă ați primit legătura de la o sursă de încredere unde doar %2$s putea publica. - Urmează să verificați cheile OMEMO pentru contul dumneavoastră. Acest lucru se poate face în siguranță doar dacă ați primit legătura de la o sursă de încredere unde doar dumneavoastră ați fi putut publica. - Continuă Verificare chei OMEMO Arată inactive Ascunde inactive @@ -917,7 +915,6 @@ Apel video primit Conectare Conectat - Reconectare Se acceptă apelul Se încheie apelul Răspunde @@ -933,8 +930,6 @@ Închide Apel în curs Apel video în curs - Reconectare apel - Reconectare apel video Dezactivați Tor pentru a face apeluri Apel primit Apel primit · %s @@ -986,7 +981,4 @@ Se creează copia de siguranță. Veți primi o notificare când acesta este completă. Nu s-a putut activa camera video. Document text - Nu este posibilă înregistrarea unui cont - Nu a fost găsită o adresă XMPP - - + diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index fe11961a4..6323cea4d 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -617,8 +617,6 @@ 清除保存私密文件的存储 (可以从服务器上重新下载) 此链接的源头是可信的 点击链接后将会开始校验%1$s的OMEMO密钥。只有%2$s发布的链接才是安全的。 - 您将验证您自己帐户的 OMEMO 密钥。只有当您从可信的来源跟踪此链接时，这才是安全的。“可信”指的是此链接只可能是你在来源中发布的。 - 继续 校验OMEMO密钥 显示不活跃设备 隐藏不活跃设备 @@ -895,7 +893,6 @@ 视频来电 正在连接 已连接 - 重新连接 正在接通来电 正在结束来电 应答 @@ -911,8 +908,6 @@ 挂断 正在进行的通话 正在进行的视频通话 - 重连通话 - 重连视频通话 禁用Tor以拨打电话 来电 来电 · %s @@ -960,7 +955,4 @@ 已启动备份。一旦完成，你会收到通知。 无法启用视频 纯文本文档 - 不支持注册账户 - 未找到 XMPP 地址 - - +