mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
16108 commits 7 branches 124 tags 230 MiB
Commit graph

16108 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
af73df3ed4 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I06c0936f3ec8e0ec1b2c5c8de2127b0f4ab7b037
 2022-04-24 10:47:15 +02:00
SpiritCroc
30db09cea3 Split existing timeline loops 
Change-Id: I116b77df62601138da35efee9dc2ab40a8f32856
 2022-04-24 10:46:45 +02:00
SpiritCroc
fe4ec79214 Attempt to prevent timeline loops 
This doesn't fix existing loops, and I'm not sure if this will lead to
missing messages (but probably still better than timeline looping...?).

Change-Id: I9c14da58736d61b89d09458168eb2d33e9f21d80
 2022-04-24 10:46:45 +02:00
SpiritCroc
b3599aac23 Put redactions into bubbles, no matter what the original type was 
Change-Id: I6b7e424a29b1f8eb54862fc0a58102dcfaa8642c
 2022-04-24 10:46:45 +02:00
SpiritCroc
06ab920ef8 Unread marker: follow accent color 
Change-Id: I9fe33ed237146105297ebac26afa4bce279152ff
 2022-04-24 10:46:45 +02:00
SpiritCroc
51aec8551b Use Schildi-blue for notifications, unread marker, links 
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
 2022-04-24 10:46:45 +02:00
SpiritCroc
bb5af3da7f Remove viewpager debug toasts again 
Change-Id: Ib905adf383ca77290320c157f467edd12aca2618
 2022-04-19 10:28:54 +02:00
SpiritCroc
ed2b05628a Timeline consistency debug: do not toast -1->-1, these seem rather common as well 
Change-Id: I90bc46dddf0760192221c4936111dd8460046c6c
 2022-04-19 10:28:48 +02:00
SpiritCroc
ed891a4445 Use accent color setting for attachments previewer 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/120

Change-Id: Iedcc1808b8408fd82ce8a6ce92c1f0c560b66cc2
 2022-04-19 10:28:44 +02:00
SpiritCroc
616a121ccf Increment version 
Change-Id: I384a270af4f41a76e9aeecd043eb5122b9306489
 2022-04-16 08:58:58 +02:00
Linerly
bd93cb41e6 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2022-04-15 16:55:49 +02:00
waclaw66
ff93586171 Translated using Weblate (Czech) 
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-04-15 16:55:49 +02:00
waclaw66
b228eb9fb7 Translated using Weblate (Czech) 
Currently translated at 100.0% (147 of 147 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-04-15 16:55:49 +02:00
SpiritCroc
35047580ce Accent color for location icons, again 
Change-Id: I792cb73c00fcff7c17948e90644fecac61dad7f0
 2022-04-15 16:49:56 +02:00
SpiritCroc
0eca1e03c0 Fix beginTransaction crash when continuing a transaction 
Change-Id: Ied0911c1f310ed59a5bf18e423efa5c8b146c668
 2022-04-14 13:56:53 +02:00
SpiritCroc
23f4f72ba3 Home pager: avoid re-applying space id that we persisted onPause 
Change-Id: I101de2548db20747e753c4f6401b9bf82fab31d7
 2022-04-13 12:00:33 +02:00
SpiritCroc
fb68ba92fa Catch possible exception during push message parsing 
E AndroidRuntime: FATAL EXCEPTION: main
E AndroidRuntime: Process: de.spiritcroc.riotx, PID: 26135
E AndroidRuntime: java.lang.RuntimeException: Unable to start receiver im.vector.app.core.pushers.VectorMessagingReceiver: com.squareup.moshi.JsonDataException: Expected BEGIN_OBJECT but was NUMBER at path $
E AndroidRuntime: 	at android.app.ActivityThread.handleReceiver(ActivityThread.java:4384)
E AndroidRuntime: 	at android.app.ActivityThread.access$1600(ActivityThread.java:256)
E AndroidRuntime: 	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2102)
E AndroidRuntime: 	at android.os.Handler.dispatchMessage(Handler.java:106)
E AndroidRuntime: 	at android.os.Looper.loopOnce(Looper.java:201)
E AndroidRuntime: 	at android.os.Looper.loop(Looper.java:288)
E AndroidRuntime: 	at android.app.ActivityThread.main(ActivityThread.java:7870)
E AndroidRuntime: 	at java.lang.reflect.Method.invoke(Native Method)
E AndroidRuntime: 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
E AndroidRuntime: 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1003)
E AndroidRuntime: Caused by: com.squareup.moshi.JsonDataException: Expected BEGIN_OBJECT but was NUMBER at path $
E AndroidRuntime: 	at com.squareup.moshi.JsonUtf8Reader.beginObject(JsonUtf8Reader.java:6)
E AndroidRuntime: 	at im.vector.app.core.pushers.UnifiedPushMessageJsonAdapter.fromJson(UnifiedPushMessageJsonAdapter.kt:2)
E AndroidRuntime: 	at com.squareup.moshi.internal.NullSafeJsonAdapter.fromJson(NullSafeJsonAdapter.java:3)
E AndroidRuntime: 	at com.squareup.moshi.JsonAdapter.fromJson(JsonAdapter.java:3)
E AndroidRuntime: 	at im.vector.app.core.pushers.VectorMessagingReceiverKt$upHandler$1.onMessage(VectorMessagingReceiver.kt:17)
E AndroidRuntime: 	at im.vector.app.core.pushers.InjectedMessagingReceiver.onReceive(VectorMessagingReceiver.kt:49)
E AndroidRuntime: 	at im.vector.app.core.pushers.Hilt_VectorMessagingReceiver.onReceive(Hilt_VectorMessagingReceiver.java:7)
E AndroidRuntime: 	at android.app.ActivityThread.handleReceiver(ActivityThread.java:4375)
E AndroidRuntime: 	... 9 more

Change-Id: I7df9744b5987d681502638640f0fd8ee276fefa8
 2022-04-13 09:26:21 +02:00
SpiritCroc
753a675914 [merge] Fix voice message rendering 
Change-Id: I9a02986855a520969232746a79d86e40de7a826c
 2022-04-12 12:38:52 +02:00
SpiritCroc
e3a32334c8 Add schildi.chat to suggested room directory servers 
Change-Id: Id488d51aba7d4bcca9a24f262f0d88a5ff895ab5
 2022-04-12 11:58:34 +02:00
SpiritCroc
b8057930c8 [merge] Disable threads feedback 
Change-Id: Icd139b1a54519ff276e8d5ef40accd38cf5fadef
 2022-04-12 11:57:37 +02:00
SpiritCroc
8a4e914861 Automatic SchildiChat string correction 
Change-Id: Ia324118f9893f08e5daa8aabf338615f5e10b2bc
 2022-04-12 11:57:24 +02:00
SpiritCroc
4c457de2eb Automatic upstream merge postprocessing 
Change-Id: Ia380e6cb16012ca8e2902918eee60a24d893749a
 2022-04-12 11:57:23 +02:00
SpiritCroc
7c35f5fda5 Merge tag 'v1.4.11' into sc 
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
 2022-04-12 11:57:16 +02:00
SpiritCroc
97b181997f [TMP] Automatic upstream merge preparation 
Change-Id: Ia7ca6b9e94631fc9ccfa911669376a472f5012d5
 2022-04-12 11:07:58 +02:00
SpiritCroc
1ae13292a5 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I39238d970aeee2af9fafc69604ff5d5dfb7b2b09
 2022-04-12 11:07:57 +02:00
SpiritCroc
096bbb696f Open without reading: remember for rooms opened from room 
Change-Id: I6ea5675b4cfb5d65d0a5a66d41a0cd489fe263b0
 2022-04-12 11:02:43 +02:00
SpiritCroc
d5b0ffacf8 Home pager space swipe: ensure we don't use legacy groups 
Change-Id: Icb7ce90dcb1ae013b999c9db9b7b9a3d984dc83f
 2022-04-12 11:02:40 +02:00
SpiritCroc
1e62bbfdb3 TokenChunkEventPersistor: log sync tokens 
Change-Id: I916808b1839171b8bd96dc5560d97c43c801165b
 2022-04-12 11:02:36 +02:00
SpiritCroc
68c9c5459d ViewPager: Change how initial page is selected 
Change-Id: Id1a7f29526dc6957dfed61ba016c89e9b45638a2
 2022-04-12 11:02:22 +02:00
SpiritCroc
66f5b5c771 Update ViewPager debugging 
Change-Id: I969a649335f069ddc68762975be8e8aad018a37d
 2022-04-12 11:01:05 +02:00
Benoit Marty
aec196564d Merge branch 'hotfix/1.4.11' into main 2022-04-07 18:01:46 +02:00
Benoit Marty
c2bdfe0f19 Fastlane 2022-04-07 17:59:03 +02:00
Benoit Marty
0e1c587eff Version 1.4.11 2022-04-07 17:58:25 +02:00
NIkita Fedrunov
4a2b573ef4 Towncrier 2022-04-07 17:57:51 +02:00
NIkita Fedrunov
190a425aa6 don't leave DMs when leaving all rooms in space 2022-04-07 17:55:33 +02:00
SpiritCroc
48d632cce5 Quicker updates of toolbar title on space swipe 
Change-Id: I89b89ab50aa8dab59e6db719332641e8376f5c76
 2022-04-07 15:34:43 +02:00
SpiritCroc
e4c0883312 Rageshake: add field about what debug settings to expect 
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
 2022-04-07 15:15:29 +02:00
Benoit Marty
e7a2e654e5 Merge branch 'release/1.4.10' into main 2022-04-05 22:35:07 +02:00
Benoit Marty
ee63c75cec fastlane 2022-04-05 22:34:40 +02:00
Benoit Marty
5429521c70 Update generated changelog 2022-04-05 22:33:20 +02:00
Benoit Marty
1ef2b1d05a Towncrier 2022-04-05 22:30:59 +02:00
Benoit Marty
fd76db9616 Update test 2022-04-05 22:16:42 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply 
Threads Beta opt-in mechanism
 2022-04-05 20:40:16 +02:00
ariskotsomitopoulos
598892de53 Injecting stringProvider instead of context in ThreadsManager class 2022-04-05 20:53:11 +03:00
ariskotsomitopoulos
37dc77cc3e Add isValid check to RealmChangeListener to prevent crashes on deleted objects 2022-04-05 20:36:33 +03:00
ariskotsomitopoulos
59d87df0ca Add string resource comment 2022-04-05 19:44:01 +03:00
ariskotsomitopoulos
5ee2579efc Revert "Remove duplicate learn more string resources" 
This reverts commit 2ac3306382.
 2022-04-05 19:39:13 +03:00
ariskotsomitopoulos
72d4c7612a Revert comment change 2022-04-05 19:39:11 +03:00
Benoit Marty
c76dc7b62f
Update vector/src/main/res/values/strings_login_v2.xml 
Fix typo
 2022-04-05 17:40:27 +02:00
Benoit Marty
fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback 
Feature/aris/threads beta feedback
 2022-04-05 17:25:29 +02:00