From aea1e80900c5ac70ebe01fb736ed3a43df63d1dd Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Mon, 15 Aug 2022 11:56:05 +0000 Subject: [PATCH 1/8] Add fastlane changelog (#4354) --- fastlane/metadata/android/en-US/changelogs/42037.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/42037.txt diff --git a/fastlane/metadata/android/en-US/changelogs/42037.txt b/fastlane/metadata/android/en-US/changelogs/42037.txt new file mode 100644 index 0000000000000000000000000000000000000000..375905aa8b402b893a18b8cc89c58f4e88a22bad --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42037.txt @@ -0,0 +1,11 @@ +Version 2.10.9 +* Ask for Bluetooth permissions when making A/V calls (You can reject this if you don’t use Bluetooth headsets) +* Fix bug when calling Movim +* Fix wrong avatar being shown for group chats +* Always ask for battery optimizations opt-out +* Set local only flag on 'x connected accounts' notifications +* Fix interaction with Google Maps Share Location Plugin +* Remove footnote with regards to server fee +* Store files in location appropriate for Android 11 +* Attempt to reconnect call after network switch +* Show caller JID and account JID in incoming call screen From 9fdbd64d024d5493b5ebc0aa8c8c40a856f38894 Mon Sep 17 00:00:00 2001 From: linkmauve Date: Tue, 16 Aug 2022 09:02:57 +0200 Subject: [PATCH 2/8] Update recommendations for Gajim (#4355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two of the recommended plugins got merged in 1.4, and don’t exist any longer, and when using flatpak the plugins must be installed that way. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e78332827810e602b29cf7971aed9180c909345..5f62f6195469892c30eae3ea4622e747ba03e2ef 100644 --- a/README.md +++ b/README.md @@ -365,7 +365,7 @@ OTR was removed because it was highly unreliable. It didn’t work with multiple ### What clients do I use on other platforms There are XMPP Clients available for all major platforms. #### Windows / Linux -For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the plugins `OMEMO`, `HTTP Upload` and `URL image preview` to get the best compatibility with Conversations. Plugins can be installed from within the app. +For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the `OMEMO` plugin to get the best compatibility with Conversations. Plugins can be installed from within the app, from your distribution, or from flatpak if you installed it from there. #### iOS Unfortunately we don‘t have a recommendation for iPhones right now. There are three clients available [Siskin](https://siskin.im/), [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Each with their own pros and cons. From 56a6b17e7e4d04405f907c0a4f25ffe2628b20ea Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 22 Aug 2022 02:50:26 -0500 Subject: [PATCH 3/8] Use the same mechanism for link copying and linkification (#4357) Prevents copying something different from what was linked, such as in the message "fine.gif https://example.com" --- .../conversations/ui/util/ShareUtil.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java index 2470a428f35dd4e2d9e58cb0d268bea124fe5cac..31c239b47a64c1ce49e5db7938242fc6663c5476 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java @@ -31,6 +31,9 @@ package eu.siacs.conversations.ui.util; import android.content.ActivityNotFoundException; import android.content.Intent; +import android.net.Uri; +import android.text.SpannableStringBuilder; +import android.text.style.URLSpan; import android.widget.Toast; import java.util.regex.Matcher; @@ -106,25 +109,25 @@ public class ShareUtil { } public static void copyLinkToClipboard(XmppActivity activity, Message message) { - String body = message.getMergedBody().toString(); - Matcher xmppPatternMatcher = Patterns.XMPP_PATTERN.matcher(body); - if (xmppPatternMatcher.find()) { - try { - Jid jid = new XmppUri(body.substring(xmppPatternMatcher.start(), xmppPatternMatcher.end())).getJid(); - if (activity.copyTextToClipboard(jid.asBareJid().toString(), R.string.account_settings_jabber_id)) { - Toast.makeText(activity,R.string.jabber_id_copied_to_clipboard, Toast.LENGTH_SHORT).show(); + SpannableStringBuilder body = message.getMergedBody(); + MyLinkify.addLinks(body, true); + for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) { + Uri uri = Uri.parse(urlspan.getURL()); + if ("xmpp".equals(uri.getScheme())) { + try { + Jid jid = new XmppUri(uri).getJid(); + if (activity.copyTextToClipboard(jid.asBareJid().toString(), R.string.account_settings_jabber_id)) { + Toast.makeText(activity,R.string.jabber_id_copied_to_clipboard, Toast.LENGTH_SHORT).show(); + } + return; + } catch (Exception e) { + e.printStackTrace(); + return; + } + } else { + if (activity.copyTextToClipboard(urlspan.getURL(),R.string.web_address)) { + Toast.makeText(activity,R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show(); } - return; - } catch (Exception e) { - e.printStackTrace(); - return; - } - } - Matcher webUrlPatternMatcher = Patterns.AUTOLINK_WEB_URL.matcher(body); - if (webUrlPatternMatcher.find()) { - String url = body.substring(webUrlPatternMatcher.start(),webUrlPatternMatcher.end()); - if (activity.copyTextToClipboard(url,R.string.web_address)) { - Toast.makeText(activity,R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show(); } } } From 8111460913921ffb6193879ddd77e249f4e70a7e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 22 Aug 2022 10:01:15 +0200 Subject: [PATCH 4/8] minor code clean up --- .../eu/siacs/conversations/ui/util/ShareUtil.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java index 31c239b47a64c1ce49e5db7938242fc6663c5476..8ff81a203eac33f72c04bca72ce960baddc9eb7a 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java @@ -108,20 +108,19 @@ public class ShareUtil { } } - public static void copyLinkToClipboard(XmppActivity activity, Message message) { - SpannableStringBuilder body = message.getMergedBody(); + public static void copyLinkToClipboard(final XmppActivity activity, final Message message) { + final SpannableStringBuilder body = message.getMergedBody(); MyLinkify.addLinks(body, true); for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) { - Uri uri = Uri.parse(urlspan.getURL()); + final Uri uri = Uri.parse(urlspan.getURL()); if ("xmpp".equals(uri.getScheme())) { try { - Jid jid = new XmppUri(uri).getJid(); + final Jid jid = new XmppUri(uri).getJid(); if (activity.copyTextToClipboard(jid.asBareJid().toString(), R.string.account_settings_jabber_id)) { Toast.makeText(activity,R.string.jabber_id_copied_to_clipboard, Toast.LENGTH_SHORT).show(); } return; - } catch (Exception e) { - e.printStackTrace(); + } catch (final Exception e) { return; } } else { From c2d37f43591ecc94cf6b9aa542b8589f9cea960c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 22 Aug 2022 11:17:30 +0200 Subject: [PATCH 5/8] use custom libwebrtc (m104) for playstore release --- build.gradle | 11 ++++++----- src/conversations/AndroidManifest.xml | 9 ++++----- src/playstore/AndroidManifest.xml | 24 ++++++++++++++---------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 7678d888baddf4f92132def8e3cfb97c4ed03a10..06c5f003026589556421a1db99656ce1c4036402 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configurations { dependencies { implementation 'androidx.viewpager:viewpager:1.0.0' - playstoreImplementation('com.google.firebase:firebase-messaging:23.0.6') { + playstoreImplementation('com.google.firebase:firebase-messaging:23.0.7') { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' @@ -42,14 +42,14 @@ dependencies { quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1' implementation 'org.sufficientlysecure:openpgp-api:10.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.appcompat:appcompat:1.5.0' implementation 'androidx.exifinterface:exifinterface:1.3.3' implementation 'androidx.cardview:cardview:1.0.0' 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.2.0" + freeImplementation "androidx.emoji2:emoji2-bundled:1.2.0" implementation 'org.bouncycastle:bcmail-jdk15on:1.64' //zxing stopped supporting Java 7 so we have to stick with 3.3.3 @@ -75,7 +75,8 @@ dependencies { implementation 'com.google.guava:guava:30.1.1-android' quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.49' - implementation 'ch.threema:webrtc-android:100.0.0' + freeImplementation 'ch.threema:webrtc-android:100.0.0' + playstoreImplementation fileTree(include: ['libwebrtc-m104.aar'], dir: 'libs') } ext { diff --git a/src/conversations/AndroidManifest.xml b/src/conversations/AndroidManifest.xml index d573b32d3dae88e55c506eeaf0d51ec065fca73c..c79e4e265bca078e5a85822f784cffb9415a9600 100644 --- a/src/conversations/AndroidManifest.xml +++ b/src/conversations/AndroidManifest.xml @@ -1,8 +1,7 @@ - + - + + android:launchMode="singleTask"> diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml index 6deb7d2a43c1c65e0332c1a12225bc3c1b1d145b..402d957f48c83d0bc620353eb3af4e8fb5cb003f 100644 --- a/src/playstore/AndroidManifest.xml +++ b/src/playstore/AndroidManifest.xml @@ -1,23 +1,27 @@ - + - + - - + + - + - + + android:exported="false"> From e8736d5f1ba73a83ce110791ecea27c364544575 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 22 Aug 2022 11:29:04 +0200 Subject: [PATCH 6/8] bump guava library --- build.gradle | 4 ++-- .../conversations/http/HttpUploadConnection.java | 14 +++++++------- .../siacs/conversations/ui/RtpSessionActivity.java | 4 ++-- .../conversations/xmpp/jingle/RtpContentMap.java | 11 +---------- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 06c5f003026589556421a1db99656ce1c4036402..c102d9e39327a9061db113a481bdd7730302679b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.2.2' } } @@ -73,7 +73,7 @@ dependencies { implementation "com.squareup.retrofit2:converter-gson:2.9.0" implementation "com.squareup.okhttp3:okhttp:4.10.0" - implementation 'com.google.guava:guava:30.1.1-android' + implementation 'com.google.guava:guava:31.1-android' quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.49' freeImplementation 'ch.threema:webrtc-android:100.0.0' playstoreImplementation fileTree(include: ['libwebrtc-m104.aar'], dir: 'libs') diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index 20db7bfbd31bb1f94cde0af1ac69fdbbb24fff82..3e478dd0ff5f9ff0effedf66d39ba88f5969ace2 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -2,14 +2,14 @@ package eu.siacs.conversations.http; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import org.checkerframework.checker.nullness.compatqual.NullableDecl; -import org.jetbrains.annotations.NotNull; - import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -132,7 +132,7 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan this.slotFuture = new SlotRequester(mXmppConnectionService).request(method, account, file, mime); Futures.addCallback(this.slotFuture, new FutureCallback() { @Override - public void onSuccess(@NullableDecl SlotRequester.Slot result) { + public void onSuccess(@Nullable SlotRequester.Slot result) { HttpUploadConnection.this.slot = result; try { HttpUploadConnection.this.upload(); @@ -142,7 +142,7 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan } @Override - public void onFailure(@NotNull final Throwable throwable) { + public void onFailure(@NonNull final Throwable throwable) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to request slot", throwable); // TODO consider fall back to jingle in 1-on-1 chats with exactly one online presence fail(throwable.getMessage()); @@ -169,13 +169,13 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan this.mostRecentCall = client.newCall(request); this.mostRecentCall.enqueue(new Callback() { @Override - public void onFailure(@NotNull Call call, IOException e) { + public void onFailure(@NonNull Call call, IOException e) { Log.d(Config.LOGTAG, "http upload failed", e); fail(e.getMessage()); } @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { + public void onResponse(@NonNull Call call, @NonNull Response response) { final int code = response.code(); if (code == 200 || code == 201) { Log.d(Config.LOGTAG, "finished uploading file"); diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java index fc7b504494ff6edbce00e23ae7ca40a3ba2d9a41..cbf00d04b83b10bdb4712eb3bf2e5ddc2f01fa96 100644 --- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java @@ -25,6 +25,7 @@ import android.view.WindowManager; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.annotation.StringRes; import androidx.databinding.DataBindingUtil; @@ -37,7 +38,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; -import org.checkerframework.checker.nullness.compatqual.NullableDecl; import org.webrtc.RendererCommon; import org.webrtc.SurfaceViewRenderer; import org.webrtc.VideoTrack; @@ -999,7 +999,7 @@ public class RtpSessionActivity extends XmppActivity requireRtpConnection().switchCamera(), new FutureCallback() { @Override - public void onSuccess(@NullableDecl Boolean isFrontCamera) { + public void onSuccess(@Nullable Boolean isFrontCamera) { binding.localVideo.setMirror(isFrontCamera); } diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java index e7693d6a8345bcb01bd6354caa25a5a529a1c9e5..bba44f9634bd476f3329ab19da28f2e8bac79433 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java @@ -1,6 +1,5 @@ package eu.siacs.conversations.xmpp.jingle; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Collections2; @@ -11,8 +10,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.checkerframework.checker.nullness.compatqual.NullableDecl; - import java.util.Collection; import java.util.List; import java.util.Map; @@ -292,13 +289,7 @@ public class RtpContentMap { return ImmutableMap.copyOf( Maps.transformValues( contents, - new Function() { - @NullableDecl - @Override - public DescriptionTransport apply(@NullableDecl Content content) { - return content == null ? null : of(content); - } - })); + content -> content == null ? null : of(content))); } } From 7b9cf7bb28af3364e19ebd11baa28500925864fb Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 22 Aug 2022 11:33:16 +0200 Subject: [PATCH 7/8] pulled translations from transifex --- src/main/res/values-nl/strings.xml | 46 ++++++++++++++++++++++++++++++ src/main/res/values-pl/strings.xml | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index b08726ee89a3f0d014976c481d795beeb6eab593..9b7f72a7c52f0ce9a5c67e087fd9f0a08fbc4576 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -97,6 +97,7 @@ Verstuur OMEMO-versleuteld bericht Verstuur v\\OMEMO-versleuteld bericht Verstuur OpenPGP-versleuteld bericht + Nieuwe bijnaam in gebruik Verstuur onversleuteld Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel. OpenKeychain @@ -122,6 +123,7 @@ Verstuur nooit crashrapportages Bevestig berichten Laat je contacten weten wanneer je hun berichten ontvangen en gelezen hebt + Voorkom schermafdrukken Gebruikersomgeving OpenKeychain veroorzaakte een fout. Slechte sleutel voor versleuteling. @@ -150,7 +152,9 @@ Registratie mislukt Gebruikersnaam is al in gebruik Registratie voltooid + Ongeldig registratietoken TLS-onderhandeling mislukt + Domein niet verifieerbaar Beleidsschending Incompatibele server Fout bij stream @@ -174,6 +178,7 @@ gebruikersnaam@voorbeeld.nl Wachtwoord Dit is geen geldig XMPP-adres + Geen geheugen beschikbaar. Afbeelding is te groot Wil je %s toevoegen aan je adresboek? Server-info XEP-0313: MAM @@ -195,9 +200,12 @@ %d uur geleden voor het laatst gezien een dag geleden voor het laatst gezien %d dagen geleden voor het laatst gezien + Nieuw OpenPGP-versleuteld bericht gevonden OpenPGP-sleutel-ID OMEMO-vingerafdruk v\\OMEMO-vingerafdruk + OMEMO-vingerafdruk (herkomst bericht) + v\\OMEMO-vingerafdruk (herkomst bericht) Andere apparaten Vertrouw OMEMO-vingerafdrukken Sleutels ophalen… @@ -232,13 +240,16 @@ Ook toevoegen %s heeft tot hier gelezen %s hebben tot hier gelezen + %1$s en nog %2$d meer hebben tot hier gelezen Iedereen heeft tot hier gelezen Publiceer Tik op avatar om een foto uit de galerij te kiezen Publiceren… De server weigerde de publicatie van je afbeelding + Kon de afbeelding niet converteren Fout bij opslaan van avatar (Of hou lang ingedrukt om de oorspronkelijke terug te zetten) + Je server ondersteunt de publicatie van avatars niet gefluisterd naar %s Privébericht sturen naar %s @@ -266,6 +277,7 @@ Tijdens stille uren worden meldingen onderdrukt Andere Synchroniseren met bladwijzers + OMEMO-vingerafdruk gekopieerd naar klembord Je bent verbannen uit dit groepsgesprek Dit groepsgesprek is enkel voor leden Bronbeperking @@ -779,4 +791,38 @@ Lokale server Over Bezig + Videogesprek + Je microfoon is niet beschikbaar + Je kunt slechts één gesprek tegelijk voeren. + Terug naar lopend gesprek + Kon camera niet wisselen + Bovenaan vastzetten + Bovenaan losmaken + Kon bericht niet corrigeren + Alle gesprekken + Dit gesprek + Je avatar + Avatar voor %s + Versleuteld met OMEMO + Onversleuteld + Speel audio + Pauzeer audio + + Bekijk %1$d deelnemer + Bekijk %1$d deelnemers + + + Een bericht kon niet worden afgeleverd + Sommige berichten konden niet worden afgeleverd + + Mislukte afleveringen + Meer opties + Geen applicatie gevonden + Nodig uit bij Conversations + Kan uitnodiging niet verwerken + Geen actieve accounts ondersteunen deze functie + De backup is gestart. Je krijgt een bericht als het voltooid is. + Kan video niet schakelen. + Onversleuteld document + Accountregistraties zijn niet ondersteund diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index d5d494124728448aa234cd0020eed725de9702f7..a25411374ee176162f71ca40ea309f3b132ee503 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -413,7 +413,7 @@ Ręcznie Odłóż Odpowiedz - Oznacz jako przeczytane + Już przeczytane Ustawienia wprowadzania Enter wysyła Użyj klawisza Enter aby wysłać wiadomość. Możesz zawsze użyć Ctrl+Enter do wysyłania wiadomości, nawet jeśli ta opcja jest wyłączona. From 1aaff18bb5ece9ef51a374523957a76be85be26a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 22 Aug 2022 11:36:29 +0200 Subject: [PATCH 8/8] version bump to 2.10.10 + changelog --- CHANGELOG.md | 5 +++++ build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/42038.txt | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/42038.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index ac29b5f883dd4a74a1b369567e61eaf9489975fe..1a10c80882082d356d9407ca86dd08ad4980dea2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### Version 2.10.10 + +* Minor bug fixes +* Restore ability to call out via JMP and other services (Playstore version) + ### Version 2.10.9 * Ask for Bluetooth permissions when making A/V calls (You can reject this if you don’t use Bluetooth headsets) diff --git a/build.gradle b/build.gradle index c102d9e39327a9061db113a481bdd7730302679b..063dac0ce53af7e3699455ca595d124fb745aabd 100644 --- a/build.gradle +++ b/build.gradle @@ -92,8 +92,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 32 - versionCode 42037 - versionName "2.10.9" + versionCode 42038 + versionName "2.10.10" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" resValue "string", "applicationId", applicationId diff --git a/fastlane/metadata/android/en-US/changelogs/42038.txt b/fastlane/metadata/android/en-US/changelogs/42038.txt new file mode 100644 index 0000000000000000000000000000000000000000..da3c42237f1a1b58be3ee50209e60a08c3c684b9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42038.txt @@ -0,0 +1,2 @@ +* Minor bug fixes +* Restore ability to call out via JMP and other services (Playstore version)