Skip to content

Commit 1b0d3f8

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 8d61477 + d81cb23 commit 1b0d3f8

File tree

87 files changed

+3184
-1965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3184
-1965
lines changed

CHANGELOG-upstream.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Delta Chat Android Changelog
22

3+
## Unreleased
4+
5+
* Don't notify notification-to-all from in-chat apps if the chat is muted
6+
* Allow to see inbox quota for all relays in connectivity screen
7+
* Update to core 2.36.0
8+
9+
## v2.35.0
10+
2026-01
11+
12+
* Protect profile deletion and relays management with system lock/pin
13+
* Fix: Remove address from profile switcher
14+
* Fix: Avoid crash if the system doesn't allow to start foreground service
15+
* Remove deprecated "real-time apps" switch
16+
* Update to core 2.35.0
17+
318
## v2.34.0
419
2025-12
520

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ android {
3333
useLibrary 'org.apache.http.legacy'
3434

3535
defaultConfig {
36-
versionCode 30000735
37-
versionName "2.34.0"
36+
versionCode 30000736
37+
versionName "2.36.0"
3838

3939
applicationId "chat.delta.lite"
4040
multiDexEnabled true

jni/deltachat-core-rust

Submodule deltachat-core-rust updated 62 files

src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,19 @@ public static String getToken() {
9191
@Override
9292
public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
9393
Log.i(TAG, "FCM push notification received");
94-
FetchForegroundService.start(this);
94+
// Note: The system can downgrade the high priority messages to normal priority
95+
// if the app is not using the high priority messages for surfacing time sensitive
96+
// content to the user. If the message's priority is downgraded, your app cannot
97+
// start a foreground service and attempting to start one results in a
98+
// ForegroundServiceStartNotAllowedException.
99+
// So, it's recommended to check the result of RemoteMessage.getPriority() and
100+
// confirm it's PRIORITY_HIGH() before attempting to start a foreground service.
101+
// source: https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start
102+
if (remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) {
103+
FetchForegroundService.start(this);
104+
} else {
105+
FetchForegroundService.fetchSynchronously();
106+
}
95107
}
96108

97109
@Override

src/main/AndroidManifest.xml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,7 @@
208208
<activity android:name=".NewConversationActivity"
209209
android:theme="@style/TextSecure.LightNoActionBar"
210210
android:windowSoftInputMode="stateHidden"
211-
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
212-
android:exported="true">
213-
214-
<intent-filter>
215-
<data android:scheme="mailto"/>
216-
<action android:name="android.intent.action.VIEW"/>
217-
<category android:name="android.intent.category.DEFAULT"/>
218-
<category android:name="android.intent.category.BROWSABLE"/>
219-
</intent-filter>
220-
211+
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
221212
</activity>
222213

223214
<activity android:name=".ContactMultiSelectionActivity"
@@ -236,8 +227,7 @@
236227
<activity android:name=".relay.EditRelayActivity"
237228
android:launchMode="singleTask"
238229
android:windowSoftInputMode="stateUnchanged"
239-
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
240-
android:exported="true">
230+
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
241231
</activity>
242232

243233
<activity android:name=".relay.RelayListActivity"
@@ -365,15 +355,13 @@
365355
<activity android:name=".calls.CallActivity"
366356
android:label=""
367357
android:theme="@style/TextSecure.LightTheme"
368-
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
369-
android:exported="true">
358+
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
370359
</activity>
371360

372361
<activity android:name=".WebxdcActivity"
373362
android:label=""
374363
android:theme="@style/TextSecure.LightTheme"
375-
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
376-
android:exported="true">
364+
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
377365
</activity>
378366

379367
<activity android:name=".WebxdcStoreActivity"

0 commit comments

Comments
 (0)