Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
adbenitez committed Oct 27, 2024
2 parents 7a738ab + 512f810 commit de4e95d
Show file tree
Hide file tree
Showing 14 changed files with 132 additions and 34 deletions.
55 changes: 47 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
# ArcaneChat Android Changelog

## v1.46.15
2024-09

* new proxy settings screen available at "Advanced / Proxy"
* manage a list of HTTP(S), SOCKS5 or Shadowsocks proxies
* proxies icon shown on the chatlist if proxies are used
## v1.48.1
2024-10

* new Proxy settings screen available at "Advanced / Proxy"
* manage a list of HTTP(S), SOCKS5 or Shadowsocks Proxies
* Proxies icon shown on the chatlist if proxies are used
* share Proxies by showing a QR code
* scan Proxies' QR code and use them
* make Proxy URLs inside Delta Chat tappable
* open Delta Chat when tapping Proxy URLs in other apps
* "New Contact / Link" button to view, share or copy the invite line
* "New Contact / Scan" button to easier access the scanner functionality
* open "New Contact" scan/show activities directly, do not try to be too smart and open the last active tab
* allow to attach multiple images in one step
* to easier differ between multiple profiles, set a "Private Tag" (long tap profile switcher)
* "Private Tag" is shown in notifications
* improve profile deletion dialog: show name, size and avatar of the profile being deleted
* show profile name in title bar when the user has multiple profiles
* improve profile switcher layout
* improve notification: allow to "Mark Read" from the notification
* search for unread chats in the search's three-dot-menu
* allow pasting QR codes from "Add As Second Device" screen
* save traffic by supporting "IMAP COMPRESS"
* automatic reconfiguration, e.g. switching to implicit TLS if STARTTLS port stops working
* parallelize IMAP and SMTP connection attempts
* improve DNS caching
* always use preloaded DNS results
* prioritize cached results if DNS resolver returns many results
* always move auto-generated messages to DeltaChat folder
* ignore invalid securejoin messages silently
* delete messages from a chatmail server immediately by default
Expand All @@ -20,14 +37,36 @@
* don't put displayname into From/To/Sender if it equals to address
* hide sync messages from INBOX (use IMAP APPEND command to upload sync messages)
* more verbose SMTP connection establishment errors
* add "Learn More" button to "Manage keys"
* visual feedback when tapping the action button of a message
* log unexpected message state when resending fails
* smoother backup and "Add Second Device" progress bars
* assign messages to ad-hoc group with matching name and members
* use stricter TLS checks for HTTPS downloads (images in HTML mails, Autoconfig)
* improve logging for failed QR code scans, AEAP, Autocrypt, notification permissions and sending errors
* show more context for the "Cannot establish guaranteed..." info message
* show original file name in "Message Info"
* fix: Sort received outgoing message down if it's fresher than all non fresh messages
* fix: avoid app being killed when processing a PUSH notification
* fix crash when refreshing avatar
* fix crash in gallery
* fix: shorten message text in locally sent messages too
* fix: Set http I/O timeout to 1 minute rather than whole request timeout
* fix: don't sync QR code token before populating the group
* update to core 1.145.0
* fix: do not get stuck if the message to download does not exist anymore
* fix: do not attempt to reference info messages
* fix: do not get stuck if there is an error transferring backup
* fix: make it possible to cancel ongoing backup transfer
* fix: reset quota when entering a new address
* fix: better detection of file extensions
* fix: "database locked" errors
* fix: never initialize realtime channels if realtime is disabled
* fix reception of realtime channels
* fix: normalize proxy URLs
* fix connections getting stuck in "Updating..." sometimes
* fix scanning "add second device" QR code from scanner above chatlist
* update translations and local help
* update to core 1.148.4


## v1.46.14
Expand Down Expand Up @@ -732,7 +771,7 @@

* fix sending status updates of private apps
* show full messages: do not load remote content for requests automatically
* using to core107.1
* using core107.1


## v1.34.12
Expand Down
16 changes: 10 additions & 6 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ the "update-core-and-stuff-DATE" PR can be merged without review

the following steps are done in a PR called `prep-VERSION` (no leading "v"):

3. update `CHANGELOG.md`
from <https://github.com/deltachat/deltachat-core-rust/blob/main/CHANGELOG.md>
and <https://github.com/deltachat/deltachat-android/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc>.
avoid technical terms, library versions etc. the changelog is for the end user.
do not forget to update/mention used core version and release month.
3. a) update `CHANGELOG.md`
from <https://github.com/deltachat/deltachat-core-rust/blob/main/CHANGELOG.md>
and <https://github.com/deltachat/deltachat-android/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc>.
do not just copy and avoid technical terms.
the changelog is for the end user and shall show impacts form that angle.
b) update changelog date as `YYYY-MM`
c) add used core version to end of changelog entry
as `update to core 1.2.3` or `using core 1.2.3`

in case previous entries of the changelog refer to betas or to not officially released versions,
the entries can be summarized.
this makes it easier for the end user to follow changes by showing major changes atop
this makes it easier for the end user to follow changes by showing major changes atop.

4. add a device message to `ConversationListActivity::onCreate()` or remove the old one.
do not repeat the CHANGELOG here: write what really is the ux outcome
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ android {
useLibrary 'org.apache.http.legacy'

defaultConfig {
versionCode 30000692
versionName "1.46.20"
versionCode 30000693
versionName "1.48.1"

applicationId "chat.delta.lite"
multiDexEnabled true
Expand Down
2 changes: 1 addition & 1 deletion jni/dc_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getConfig(JNIEnv *env, jobje
}
dc_str_unref(temp);
CHAR_UNREF(key);
return ret; /* returns NULL only if key is unset and "def" is NULL */
return ret;
}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.thoughtcrime.securesms.notifications;

import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PRIVATE_TAG;

import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationChannelGroup;
Expand Down Expand Up @@ -389,10 +391,16 @@ public void addNotification(int accountId, int chatId, int msgId) {
builder.setGroup(GRP_MSG + "." + accountId);
}

String accountAddr = dcContext.getConfig("addr");
String accountTag = dcContext.getConfig(CONFIG_PRIVATE_TAG);
if (accountTag.isEmpty() && context.dcAccounts.getAll().length > 1) {
accountTag = dcContext.getName();
}

if (privacy.isDisplayContact()) {
builder.setContentTitle(dcChat.getName());
builder.setSubText(accountAddr);
if (!TextUtils.isEmpty(accountTag)) {
builder.setSubText(accountTag);
}
}

// if privacy allows, for better accessibility,
Expand Down Expand Up @@ -536,8 +544,8 @@ public void addNotification(int accountId, int chatId, int msgId) {
.setContentTitle("ArcaneChat") // content title would only be used on SDK <24
.setContentText("New messages") // content text would only be used on SDK <24
.setContentIntent(getOpenChatlistIntent(accountId));
if (privacy.isDisplayContact()) {
summary.setSubText(accountAddr);
if (privacy.isDisplayContact() && !TextUtils.isEmpty(accountTag)) {
summary.setSubText(accountTag);
}
notificationManager.notify(String.valueOf(accountId), ID_MSG_SUMMARY, summary.build());
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.ForegroundDetector;
import org.thoughtcrime.securesms.notifications.FcmReceiveService;
import org.thoughtcrime.securesms.notifications.NotificationCenter;
import org.thoughtcrime.securesms.util.Util;
Expand All @@ -23,6 +24,11 @@ public final class FetchForegroundService extends Service {
private static Intent service;

public static void start(Context context) {
ForegroundDetector foregroundDetector = ForegroundDetector.getInstance();
if (foregroundDetector != null && foregroundDetector.isForeground()) {
return;
}

GenericForegroundService.createFgNotificationChannel(context);
synchronized (SERVICE_LOCK) {
if (service == null) {
Expand Down
21 changes: 13 additions & 8 deletions src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<!-- deprecated, the word "or" to separate blocks in the user interface that are mutually exclusive -->
<string name="or_separator">o</string>
<string name="clear_search">Cancella Ricerca</string>
<!-- a noun, used on a button, short for "show link" -->
<string name="link">Collegamento</string>
<!-- "scan" in the meaning of "scan QR code" -->
<string name="scan">Scansiona</string>
<string name="yes">Sì</string>
<string name="no">No</string>
<string name="select">Seleziona</string>
Expand Down Expand Up @@ -242,17 +246,18 @@
<string name="menu_delete_location">Elimino questa Posizione?</string>
<string name="menu_message_details">Dettagli Messaggio</string>
<string name="menu_copy_to_clipboard">Copia negli Appunti</string>
<string name="share_invite_link">Condividi Link d\'Invito</string>
<string name="share_invite_link">Condividi Collegamento D\'Invito</string>
<string name="share_invite_link_explain">Chiunque abbia questo collegamento può visualizzare il tuo profilo e iniziare una chat con te. Condividilo solo con persone di cui ti fidi.</string>
<string name="invite_friends">Invita Gli Amici</string>
<!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
<string name="invite_friends_text">Contattami su Delta Chat:\n%1$s</string>
<string name="menu_copy_selection_to_clipboard">Copia Selezione</string>
<string name="menu_copy_link_to_clipboard">Copia Link</string>
<string name="menu_copy_link_to_clipboard">Copia Collegamento</string>
<string name="menu_copy_text_to_clipboard">Copia Testo</string>
<string name="menu_copy_image_to_clipboard">Copia l\'Immagine</string>
<string name="menu_copy_email_to_clipboard">Copia E-Mail</string>
<string name="paste_from_clipboard">Incolla dagli Appunti</string>
<string name="ask_copy_unopenable_link_to_clipboard">Il link \"%1$d\" non può essere aperto nel browser web. Vuoi invece copiare il collegamento negli appunti?</string>
<string name="ask_copy_unopenable_link_to_clipboard">Il collegamento \"%1$d\" non può essere aperto nel browser web. Vuoi invece copiare il collegamento negli appunti?</string>
<string name="menu_forward">Inoltra Messaggio</string>
<string name="menu_reply">Rispondi al Messaggio</string>
<string name="menu_mute">Silenzia Notifiche</string>
Expand Down Expand Up @@ -386,7 +391,7 @@
<string name="ask_remove_members">Rimuovere %1$s dal gruppo?</string>
<!-- %1$s is replaced by a comma-separated list of names -->
<string name="ask_remove_from_broadcast">Rimuovere %1$s dalla lista di trasmissione?</string>
<string name="open_url_confirmation">Vuoi aprire questo link?</string>
<string name="open_url_confirmation">Vuoi aprire questo collegamento?</string>


<!-- contact list -->
Expand Down Expand Up @@ -474,11 +479,11 @@
<!-- punycode warning / labeled links -->
<!-- placeholder is domain/hostname that should be trusted -->
<string name="open_external_url_trust_domain">Non chiedere di nuovo per %1$s</string>
<string name="puny_code_warning_header">Rilevato link sospetto</string>
<string name="puny_code_warning_header">Rilevato collegamento sospetto</string>
<!-- placeholder contains the hostname converted to ascii -->
<string name="puny_code_warning_question">Sei sicuro di voler visitare %1$s?</string>
<!-- this message is shown whenever a link with non-latin characters is clicked. first placeholder is original hostname with special chars, second placeholder is hostname encoded in ascii -->
<string name="puny_code_warning_description">Hai seguito un link che potrebbe rappresentare in modo errato i caratteri utilizzando caratteri dall\'aspetto simile ad alfabeti diversi. Se si segue il link con l\'etichetta %1$s si arriva a %2$s che è normale per i caratteri non latini. Se non ti aspettavi tali caratteri, questo collegamento potrebbe essere dannoso</string>
<string name="puny_code_warning_description">Hai seguito un collegamento che potrebbe rappresentare in modo errato i caratteri utilizzando caratteri dall\'aspetto simile ad alfabeti diversi. Se si segue il collegamento con l\'etichetta %1$s si arriva a %2$s che è normale per i caratteri non latini. Se non ti aspettavi tali caratteri, questo collegamento potrebbe essere dannoso</string>


<!-- search -->
Expand Down Expand Up @@ -954,7 +959,7 @@
<string name="chat_protection_broken_explanation">La crittografia end-to-end non può più essere garantita, probabilmente perché %1$s ha reinstallato Delta Chat o inviato un messaggio da un altro dispositivo.\n\nPuoi incontrarlo di persona e scansionare nuovamente il suo Codice QR per ristabilire la crittografia end-to-end garantita.</string>
<string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s richiede la crittografia end-to-end che non è ancora configurata per questa chat. Tocca per saperne di più.</string>
<string name="invalid_unencrypted_explanation">Per stabilire la crittografia end-to-end, potresti incontrare i contatti di persona e scansionare il loro codice QR per presentarli.</string>
<string name="encryption_required_for_new_contact">È richiesta la crittografia end-to-end, ma non è ancora configurata per %1$s.\n\nPuoi condividere con loro il link d\'invito o incontrarli di persona e scansionare il loro Codice QR.</string>
<string name="encryption_required_for_new_contact">È richiesta la crittografia end-to-end, ma non è ancora configurata per %1$s.\n\nPuoi condividere con loro il collegamento d\'invito o incontrarli di persona e scansionare il loro Codice QR.</string>
<string name="learn_more">Per Saperne di Più</string>

<string name="devicemsg_self_deleted">Hai eliminato la chat \"Messaggi salvati\".\n\nℹ️ Per utilizzare nuovamente la funzione \"Messaggi salvati\", crea una nuova chat con te stesso.</string>
Expand Down Expand Up @@ -1026,7 +1031,7 @@
<string name="mailto_dialog_header_select_chat">Seleziona la chat a cui inviare il messaggio</string>
<!-- first placeholder is the name of the chat -->
<string name="confirm_replace_draft">%1$s ha già una bozza di messaggio, vuoi sostituirla?</string>
<string name="mailto_link_could_not_be_decoded">Il link mailto non può essere decodificato: %1$s</string>
<string name="mailto_link_could_not_be_decoded">Il collegamento mailto non può essere decodificato: %1$s</string>

<!-- notifications -->
<!-- deprecated, use mark_as_read or mark_as_read_short -->
Expand Down
5 changes: 5 additions & 0 deletions src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<!-- deprecated, the word "or" to separate blocks in the user interface that are mutually exclusive -->
<string name="or_separator">of</string>
<string name="clear_search">Zoekopdracht wissen</string>
<!-- a noun, used on a button, short for "show link" -->
<string name="link">Link</string>
<!-- "scan" in the meaning of "scan QR code" -->
<string name="scan">Scannen</string>
<string name="yes">Ja</string>
<string name="no">Nee</string>
<string name="select">Selecteren</string>
Expand Down Expand Up @@ -234,6 +238,7 @@
<string name="menu_message_details">Berichtinformatie</string>
<string name="menu_copy_to_clipboard">Kopiëren naar klembord</string>
<string name="share_invite_link">Uitnodigingslink versturen</string>
<string name="share_invite_link_explain">Iedereen die deze link ontvangt kan je profiel bekijken en een gesprek met je starten. Deel hem daarom alleen met mensen die je vertrouwt.</string>
<string name="invite_friends">Vrienden uitnodigen</string>
<!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
<string name="invite_friends_text">Neem contact met me op via Delta Chat:\n%1$s</string>
Expand Down
11 changes: 11 additions & 0 deletions src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<!-- deprecated, the word "or" to separate blocks in the user interface that are mutually exclusive -->
<string name="or_separator">lub</string>
<string name="clear_search">Wyczyść wyszukiwanie</string>
<!-- a noun, used on a button, short for "show link" -->
<string name="link">Link</string>
<!-- "scan" in the meaning of "scan QR code" -->
<string name="scan">Skanuj</string>
<string name="yes">Tak</string>
<string name="no">Nie</string>
<string name="select">Zaznacz</string>
Expand Down Expand Up @@ -135,6 +139,12 @@
<item quantity="many">%d wiadomości</item>
<item quantity="other">%d wiadomości </item>
</plurals>
<plurals name="n_reactions">
<item quantity="one">%d reakcja</item>
<item quantity="few">%d reakcje</item>
<item quantity="many">%d reakcji</item>
<item quantity="other">%d reakcji</item>
</plurals>
<plurals name="n_members">
<item quantity="one">%d członek</item>
<item quantity="few">%d członków </item>
Expand Down Expand Up @@ -246,6 +256,7 @@
<string name="menu_message_details">Szczegóły wiadomości</string>
<string name="menu_copy_to_clipboard">Kopiuj do schowka</string>
<string name="share_invite_link">Udostępnij link zaproszenia</string>
<string name="share_invite_link_explain">Każdy, kto ma ten link, może zobaczyć twój profil i rozpocząć z tobą czat. Udostępniaj go tylko osobom, którym ufasz.</string>
<string name="invite_friends">Zaproś znajomych</string>
<!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
<string name="invite_friends_text">Skontaktuj się ze mną przez Delta Chat:\n%1$s</string>
Expand Down
Loading

0 comments on commit de4e95d

Please sign in to comment.