3 лет назад · 2aba229447
--- a/README.md
+++ b/README.md
@@ -251,7 +251,7 @@ language, please sign up at <https://threema.oneskyapp.com/collaboration/>.
 
				 
			
 
				 Threema for Android is licensed under the GNU Affero General Public License v3.
			
 
				 
			
 
				-    Copyright (c) 2013-2022 Threema GmbH
			
 
				+    Copyright (c) 2013-2023 Threema GmbH
			
 
				 
			
 
				     This program is free software: you can redistribute it and/or modify
			
 
				     it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/assets/license.html
+++ b/app/assets/license.html
@@ -43,7 +43,7 @@
 
				 
			
 
				 <body>
			
 
				 
			
 
				-<p class="maincopyright">Copyright © 2022 Threema GmbH.<br/>
			
 
				+<p class="maincopyright">Copyright © 2023 Threema GmbH.<br/>
			
 
				     All rights reserved.</p>
			
 
				 
			
 
				 <p>This product contains artwork and code from the following rights holders:</p>
			
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ if (getGradle().getStartParameter().getTaskRequests().toString().contains("Hms")
 
				 }
			
 
				 
			
 
				 // version codes
			
 
				-def app_version = "5.0.2.1"
			
 
				+def app_version = "5.0.3"
			
 
				 def beta_suffix = "" // with leading dash
			
 
				 
			
 
				 /**
			
@@ -92,7 +92,7 @@ android {
 
				         vectorDrawables.useSupportLibrary = true
			
 
				         applicationId "ch.threema.app"
			
 
				         testApplicationId 'ch.threema.app.test'
			
 
				-        versionCode 781
			
 
				+        versionCode 784
			
 
				         versionName "${app_version}${beta_suffix}"
			
 
				         resValue "string", "app_name", "Threema"
			
 
				         // package name used for sync adapter - needs to match mime types below
			
@@ -704,7 +704,7 @@ dependencies {
 
				     }
			
 
				 
			
 
				     implementation 'org.saltyrtc:chunked-dc:1.0.1'
			
 
				-    implementation 'ch.threema:webrtc-android:0.108.0-group-call-2'
			
 
				+    implementation 'ch.threema:webrtc-android:108.0.0'
			
 
				     implementation('org.saltyrtc:saltyrtc-task-webrtc:0.18.1') {
			
 
				         exclude module: 'saltyrtc-client'
			
 
				     }
			
--- a/app/src/androidTest/java/ch/threema/app/DangerousTest.java
+++ b/app/src/androidTest/java/ch/threema/app/DangerousTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/ScreenshotTakingRule.java
+++ b/app/src/androidTest/java/ch/threema/app/ScreenshotTakingRule.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/TestApplication.java
+++ b/app/src/androidTest/java/ch/threema/app/TestApplication.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2017-2022 Threema GmbH
			
 
				+ * Copyright (c) 2017-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/TestFastlaneOnly.java
+++ b/app/src/androidTest/java/ch/threema/app/TestFastlaneOnly.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/ThreemaTestRunner.java
+++ b/app/src/androidTest/java/ch/threema/app/ThreemaTestRunner.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2017-2022 Threema GmbH
			
 
				+ * Copyright (c) 2017-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/backuprestore/csv/BackupServiceTest.java
+++ b/app/src/androidTest/java/ch/threema/app/backuprestore/csv/BackupServiceTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/emojis/MarkupParserTest.java
+++ b/app/src/androidTest/java/ch/threema/app/emojis/MarkupParserTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/processors/MessageAckProcessorTest.java
+++ b/app/src/androidTest/java/ch/threema/app/processors/MessageAckProcessorTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/processors/MessageProcessorTest.java
+++ b/app/src/androidTest/java/ch/threema/app/processors/MessageProcessorTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/service/GroupInviteServiceTest.java
+++ b/app/src/androidTest/java/ch/threema/app/service/GroupInviteServiceTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/testutils/CaptureLogcatOnTestFailureRule.java
+++ b/app/src/androidTest/java/ch/threema/app/testutils/CaptureLogcatOnTestFailureRule.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/testutils/InstructionUtil.java
+++ b/app/src/androidTest/java/ch/threema/app/testutils/InstructionUtil.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2017-2022 Threema GmbH
			
 
				+ * Copyright (c) 2017-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/testutils/RecyclerViewMatcher.java
+++ b/app/src/androidTest/java/ch/threema/app/testutils/RecyclerViewMatcher.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2017-2022 Threema GmbH
			
 
				+ * Copyright (c) 2017-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/testutils/TestHelpers.java
+++ b/app/src/androidTest/java/ch/threema/app/testutils/TestHelpers.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/testutils/ThreemaAssert.java
+++ b/app/src/androidTest/java/ch/threema/app/testutils/ThreemaAssert.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/utils/BackgroundErrorNotificationTest.java
+++ b/app/src/androidTest/java/ch/threema/app/utils/BackgroundErrorNotificationTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/utils/GeoLocationUtilTest.kt
+++ b/app/src/androidTest/java/ch/threema/app/utils/GeoLocationUtilTest.kt
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2022 Threema GmbH
			
 
				+ * Copyright (c) 2022-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/utils/LinkifyUtilTest.kt
+++ b/app/src/androidTest/java/ch/threema/app/utils/LinkifyUtilTest.kt
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2022 Threema GmbH
			
 
				+ * Copyright (c) 2022-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/utils/TextUtilTest.java
+++ b/app/src/androidTest/java/ch/threema/app/utils/TextUtilTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/voip/SdpTest.java
+++ b/app/src/androidTest/java/ch/threema/app/voip/SdpTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/voip/VoipStatusMessageTest.java
+++ b/app/src/androidTest/java/ch/threema/app/voip/VoipStatusMessageTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/webclient/activities/SessionsActivityTest.java
+++ b/app/src/androidTest/java/ch/threema/app/webclient/activities/SessionsActivityTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/webclient/converter/MessageTest.java
+++ b/app/src/androidTest/java/ch/threema/app/webclient/converter/MessageTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/app/webclient/converter/MsgpackTest.java
+++ b/app/src/androidTest/java/ch/threema/app/webclient/converter/MsgpackTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2017-2022 Threema GmbH
			
 
				+ * Copyright (c) 2017-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/logging/backend/DebugLogFileBackendTest.java
+++ b/app/src/androidTest/java/ch/threema/logging/backend/DebugLogFileBackendTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/androidTest/java/ch/threema/storage/SQLDHSessionStoreTest.java
+++ b/app/src/androidTest/java/ch/threema/storage/SQLDHSessionStoreTest.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2022 Threema GmbH
			
 
				+ * Copyright (c) 2022-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/foss_based/java/ch/threema/app/activities/VoiceActionActivity.java
+++ b/app/src/foss_based/java/ch/threema/app/activities/VoiceActionActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/foss_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
+++ b/app/src/foss_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/foss_based/java/ch/threema/app/push/PushRegistrationWorker.java
+++ b/app/src/foss_based/java/ch/threema/app/push/PushRegistrationWorker.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/foss_based/java/ch/threema/app/push/PushService.java
+++ b/app/src/foss_based/java/ch/threema/app/push/PushService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/foss_based/java/ch/threema/app/services/VoiceActionService.java
+++ b/app/src/foss_based/java/ch/threema/app/services/VoiceActionService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/activities/VoiceActionActivity.java
+++ b/app/src/google_services_based/java/ch/threema/app/activities/VoiceActionActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2016-2022 Threema GmbH
			
 
				+ * Copyright (c) 2016-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
+++ b/app/src/google_services_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/licensing/ThreemaLicensePolicy.java
+++ b/app/src/google_services_based/java/ch/threema/app/licensing/ThreemaLicensePolicy.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/push/PushRegistrationWorker.java
+++ b/app/src/google_services_based/java/ch/threema/app/push/PushRegistrationWorker.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/push/PushService.java
+++ b/app/src/google_services_based/java/ch/threema/app/push/PushService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/ch/threema/app/services/VoiceActionService.java
+++ b/app/src/google_services_based/java/ch/threema/app/services/VoiceActionService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2016-2022 Threema GmbH
			
 
				+ * Copyright (c) 2016-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/AESObfuscator.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/AESObfuscator.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/DeviceLimiter.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/DeviceLimiter.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/ILicenseResultListener.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/ILicenseResultListener.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/ILicensingService.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/ILicensingService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseChecker.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseChecker.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseCheckerCallback.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseCheckerCallback.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseValidator.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/LicenseValidator.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/NullDeviceLimiter.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/NullDeviceLimiter.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/Obfuscator.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/Obfuscator.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/Policy.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/Policy.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/PreferenceObfuscator.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/PreferenceObfuscator.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/ResponseData.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/ResponseData.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/StrictPolicy.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/StrictPolicy.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/ValidationException.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/ValidationException.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/util/Base64.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/util/Base64.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/util/Base64DecoderException.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/util/Base64DecoderException.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/google_services_based/java/com/google/android/vending/licensing/util/URIQueryDecoder.java
+++ b/app/src/google_services_based/java/com/google/android/vending/licensing/util/URIQueryDecoder.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms/java/ch/threema/app/activities/DownloadApkActivity.java
+++ b/app/src/hms/java/ch/threema/app/activities/DownloadApkActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms/java/ch/threema/app/utils/DownloadUtil.java
+++ b/app/src/hms/java/ch/threema/app/utils/DownloadUtil.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_services_based/java/ch/threema/app/activities/VoiceActionActivity.java
+++ b/app/src/hms_services_based/java/ch/threema/app/activities/VoiceActionActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_services_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
+++ b/app/src/hms_services_based/java/ch/threema/app/licensing/StoreLicenseCheck.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_services_based/java/ch/threema/app/push/PushRegistrationWorker.java
+++ b/app/src/hms_services_based/java/ch/threema/app/push/PushRegistrationWorker.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_services_based/java/ch/threema/app/push/PushService.java
+++ b/app/src/hms_services_based/java/ch/threema/app/push/PushService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_services_based/java/ch/threema/app/services/VoiceActionService.java
+++ b/app/src/hms_services_based/java/ch/threema/app/services/VoiceActionService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2021-2022 Threema GmbH
			
 
				+ * Copyright (c) 2021-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_work/java/ch/threema/app/activities/DownloadApkActivity.java
+++ b/app/src/hms_work/java/ch/threema/app/activities/DownloadApkActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/hms_work/java/ch/threema/app/utils/DownloadUtil.java
+++ b/app/src/hms_work/java/ch/threema/app/utils/DownloadUtil.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/libre/java/ch/threema/app/activities/DownloadApkActivity.java
+++ b/app/src/libre/java/ch/threema/app/activities/DownloadApkActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/libre/java/ch/threema/app/utils/DownloadUtil.java
+++ b/app/src/libre/java/ch/threema/app/utils/DownloadUtil.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/androidx/appcompat/widget/PopupMenuWrapper.java
+++ b/app/src/main/java/androidx/appcompat/widget/PopupMenuWrapper.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2020-2022 Threema GmbH
			
 
				+ * Copyright (c) 2020-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/androidx/core/app/FixedJobIntentService.java
+++ b/app/src/main/java/androidx/core/app/FixedJobIntentService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/annotation/SameThread.java
+++ b/app/src/main/java/ch/threema/annotation/SameThread.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/AutostartService.java
+++ b/app/src/main/java/ch/threema/app/AutostartService.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/BuildFlavor.java
+++ b/app/src/main/java/ch/threema/app/BuildFlavor.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/NamedFileProvider.java
+++ b/app/src/main/java/ch/threema/app/NamedFileProvider.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/ThreemaApplication.java
+++ b/app/src/main/java/ch/threema/app/ThreemaApplication.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
@@ -87,6 +87,8 @@ import java.util.Objects;
 
				 import java.util.concurrent.ExecutorService;
			
 
				 import java.util.concurrent.Executors;
			
 
				 import java.util.concurrent.TimeUnit;
			
 
				+import java.util.concurrent.locks.Lock;
			
 
				+import java.util.concurrent.locks.ReentrantLock;
			
 
				 
			
 
				 import ch.threema.app.backuprestore.csv.BackupService;
			
 
				 import ch.threema.app.exceptions.DatabaseMigrationFailedException;
			
@@ -135,12 +137,12 @@ import ch.threema.app.stores.PreferenceStore;
 
				 import ch.threema.app.utils.ConfigUtils;
			
 
				 import ch.threema.app.utils.ConnectionIndicatorUtil;
			
 
				 import ch.threema.app.utils.ConversationNotificationUtil;
			
 
				+import ch.threema.app.utils.DeviceCookieManagerImpl;
			
 
				 import ch.threema.app.utils.FileUtil;
			
 
				 import ch.threema.app.utils.LinuxSecureRandom;
			
 
				 import ch.threema.app.utils.LoggingUEH;
			
 
				 import ch.threema.app.utils.NameUtil;
			
 
				 import ch.threema.app.utils.PushUtil;
			
 
				-import ch.threema.app.utils.RogueDeviceMonitorImpl;
			
 
				 import ch.threema.app.utils.RuntimeUtil;
			
 
				 import ch.threema.app.utils.ShortcutUtil;
			
 
				 import ch.threema.app.utils.StateBitmapUtil;
			
@@ -277,6 +279,8 @@ public class ThreemaApplication extends MultiDexApplication implements DefaultLi
 
				 	public static final String WORKER_PERIODIC_THREEMA_SAFE_UPLOAD = "PeriodicSafeUpload";
			
 
				 	public static final String WORKER_CONNECTIVITY_CHANGE = "ConnectivityChange";
			
 
				 
			
 
				+	public static final Lock onAndroidContactChangeLock = new ReentrantLock();
			
 
				+
			
 
				 	private static final String EXIT_REASON_LOGGING_TIMESTAMP = "exit_reason_timestamp";
			
 
				 
			
 
				 	private static Context context;
			
@@ -1004,7 +1008,7 @@ public class ThreemaApplication extends MultiDexApplication implements DefaultLi
 
				 
			
 
				 			connection.setServerAddressProvider(serviceManager.getServerAddressProviderService().getServerAddressProvider());
			
 
				 
			
 
				-			connection.setRogueDeviceMonitor(new RogueDeviceMonitorImpl(serviceManager));
			
 
				+			connection.setDeviceCookieManager(new DeviceCookieManagerImpl(serviceManager));
			
 
				 
			
 
				 			// get application restrictions
			
 
				 			if (ConfigUtils.isWorkBuild()) {
			
@@ -1829,6 +1833,7 @@ public class ThreemaApplication extends MultiDexApplication implements DefaultLi
 
				 
			
 
				 				if (!selfChange && serviceManager != null && !isRunning) {
			
 
				 					this.isRunning = true;
			
 
				+					onAndroidContactChangeLock.lock();
			
 
				 
			
 
				 					boolean cont;
			
 
				 					//check if a sync is in progress.. wait!
			
@@ -1856,6 +1861,7 @@ public class ThreemaApplication extends MultiDexApplication implements DefaultLi
 
				 						}
			
 
				 					}
			
 
				 					this.isRunning = false;
			
 
				+					onAndroidContactChangeLock.unlock();
			
 
				 				}
			
 
				 			}
			
 
				 		};
			
--- a/app/src/main/java/ch/threema/app/actions/LocationMessageSendAction.java
+++ b/app/src/main/java/ch/threema/app/actions/LocationMessageSendAction.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/actions/SendAction.java
+++ b/app/src/main/java/ch/threema/app/actions/SendAction.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/actions/TextMessageSendAction.java
+++ b/app/src/main/java/ch/threema/app/actions/TextMessageSendAction.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/AboutActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/AboutActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/AddAccountActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/AddAccountActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/AddContactActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/AddContactActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/AppLinksActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/AppLinksActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/BackupAdminActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/BackupAdminActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/BiometricLockActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/BiometricLockActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2019-2022 Threema GmbH
			
 
				+ * Copyright (c) 2019-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/BlackListActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/BlackListActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/ComposeMessageActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ComposeMessageActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/ContactDetailActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ContactDetailActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
@@ -76,6 +76,7 @@ import ch.threema.app.listeners.GroupListener;
 
				 import ch.threema.app.managers.ListenerManager;
			
 
				 import ch.threema.app.messagereceiver.MessageReceiver;
			
 
				 import ch.threema.app.services.ContactService;
			
 
				+import ch.threema.app.services.ConversationService;
			
 
				 import ch.threema.app.services.DeadlineListService;
			
 
				 import ch.threema.app.services.GroupService;
			
 
				 import ch.threema.app.services.IdListService;
			
@@ -909,6 +910,23 @@ public class ContactDetailActivity extends ThreemaToolbarActivity
 
				 
			
 
				 			//only save contact stuff if the name has changed!
			
 
				 			this.contactService.setName(this.contact, firstName, lastName);
			
 
				+
			
 
				+			// Reset conversation cache because at this point the MessageSectionFragment is destroyed
			
 
				+			// and it cannot react to the listeners.
			
 
				+			if (serviceManager == null) {
			
 
				+				logger.warn("Service manager is null; could not reset conversation cache");
			
 
				+				return;
			
 
				+			}
			
 
				+			try {
			
 
				+				ConversationService conversationService = serviceManager.getConversationService();
			
 
				+				if (conversationService == null) {
			
 
				+					logger.warn("Conversation service is null; could not reset conversation cache");
			
 
				+					return;
			
 
				+				}
			
 
				+				conversationService.updateContactConversation(this.contact);
			
 
				+			} catch (ThreemaException e) {
			
 
				+				logger.error("Could not get conversation service to reset conversation cache", e);
			
 
				+			}
			
 
				 		}
			
 
				 	}
			
 
				 
			
--- a/app/src/main/java/ch/threema/app/activities/ContactNotificationsActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ContactNotificationsActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/CropImageActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/CropImageActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/DirectoryActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/DirectoryActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2018-2022 Threema GmbH
			
 
				+ * Copyright (c) 2018-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/DisableBatteryOptimizationsActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/DisableBatteryOptimizationsActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2016-2022 Threema GmbH
			
 
				+ * Copyright (c) 2016-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/DistributionListAddActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/DistributionListAddActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/DummyActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/DummyActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/EditSendContactActivity.kt
+++ b/app/src/main/java/ch/threema/app/activities/EditSendContactActivity.kt
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2014-2022 Threema GmbH
			
 
				+ * Copyright (c) 2014-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/EnterSerialActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/EnterSerialActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/EulaActivity.kt
+++ b/app/src/main/java/ch/threema/app/activities/EulaActivity.kt
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2022 Threema GmbH
			
 
				+ * Copyright (c) 2022-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/ExcludedSyncIdentitiesActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ExcludedSyncIdentitiesActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/ExportIDActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ExportIDActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/ExportIDResultActivity.java
+++ b/app/src/main/java/ch/threema/app/activities/ExportIDResultActivity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2013-2022 Threema GmbH
			
 
				+ * Copyright (c) 2013-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,
			
--- a/app/src/main/java/ch/threema/app/activities/GroupAdd2Activity.java
+++ b/app/src/main/java/ch/threema/app/activities/GroupAdd2Activity.java
@@ -4,7 +4,7 @@
 
				  *   |_| |_||_|_| \___\___|_|_|_\__,_(_)
			
 
				  *
			
 
				  * Threema for Android
			
 
				- * Copyright (c) 2015-2022 Threema GmbH
			
 
				+ * Copyright (c) 2015-2023 Threema GmbH
			
 
				  *
			
 
				  * This program is free software: you can redistribute it and/or modify
			
 
				  * it under the terms of the GNU Affero General Public License, version 3,