mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-04 07:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
10733 commits 7 branches 124 tags 230 MiB
Commit graph

10733 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Langley
da993b5b58 lint 2021-07-19 22:13:23 +01:00
David Langley
89ece22f73 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-19 22:08:34 +01:00
David Langley
55902b58ac checks 2021-07-19 22:07:20 +01:00
SpiritCroc
045f95326a Fix for crash on rendering media items 
07-19 19:28:53.039 E/AndroidRuntime(12141): java.lang.NoSuchMethodError: No virtual method updateMessageBubble(Landroid/content/Context;Lim/vector/app/features/home/room/detail/timeline/item/AbsMessageItem$Holder;)V in class Lim/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem; or its super classes (declaration of 'im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem' appears in base.apk)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem$bind$onImageSizeListener$1.onImageSizeUpdated(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.media.ImageContentRenderer.render(ImageContentRenderer.kt:20)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:12)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at com.airbnb.epoxy.BaseEpoxyAdapter.onBindViewHolder(BaseEpoxyAdapter.java:25)

Change-Id: Ic803b3bfb328ed3a56202df789500b162886250d
 2021-07-19 22:55:11 +02:00
David Langley
a29ccda68e move mutable push rule logic to static declarations as on web 2021-07-19 21:29:46 +01:00
ganfra
f7e2e741c0 Missed call: start showing notification when there is a missed call 2021-07-19 20:25:09 +02:00
Benoit Marty
256df7e869 Rework on how we dispose the subscriptions 2021-07-19 19:18:49 +02:00
Benoit Marty
ac2f1ee7fe Cleanup and comment 2021-07-19 19:03:41 +02:00
Benoit Marty
5990e5a52b Cleanup constructors 2021-07-19 18:59:27 +02:00
Benoit Marty
14b4bff477 Use the interface power! 2021-07-19 18:56:15 +02:00
Benoit Marty
b8abe1b7ad Rename class for code clarity 2021-07-19 18:54:14 +02:00
Benoit Marty
40907a71b6 Cleanup 2021-07-19 18:44:57 +02:00
Benoit Marty
ac8303bb99 Add low priority section in DM tab #3463 2021-07-19 18:43:05 +02:00
Benoit Marty
ca2794193c Typo 2021-07-19 18:16:36 +02:00
Benoit Marty
a34d445215
Merge pull request #3699 from vector-im/feature/bma/part_dl 
Complement for #3656
 2021-07-19 18:09:33 +02:00
SpiritCroc
a5db52fe62 increment_version.sh: exclude "Merge branch" lines 
Change-Id: I392d38c5408e7e3e1d76baffda246106536c5912
 2021-07-19 16:50:32 +02:00
Benoit Marty
a2996ee042 Rename var 2021-07-19 16:32:02 +02:00
Benoit Marty
765f7d634e
Merge pull request #3700 from psrpinto/fix/naming-2 
Standardise casing of terms in source strings
 2021-07-19 16:26:41 +02:00
SpiritCroc
37621d1fc7 Automatic SchildiChat string correction 
Change-Id: I20c511ac19bfbf0bd11c0ae96a5a1ff97b19a59e
 2021-07-19 16:15:39 +02:00
SpiritCroc
fc8be0c8c5 Automatic upstream merge postprocessing 
Change-Id: I76c44254c911cca11449d24928721ef0e01c5f3e
 2021-07-19 16:15:38 +02:00
SpiritCroc
8497a307a1 Merge tag 'v1.1.13' into sc 
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-07-19 16:10:57 +02:00
SpiritCroc
2aa4d868e4 [TMP] Automatic upstream merge preparation 
Change-Id: Iaf09a78fbaad18a6581bfd5384239f471b007fdf
 2021-07-19 16:05:39 +02:00
SpiritCroc
a4f87f49dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I432f4130ab60f0a891a48609ad5bbe6a3a2b9583
 2021-07-19 16:05:38 +02:00
Benoit Marty
6d1cabaee3 Version++ 2021-07-19 15:28:14 +02:00
Benoit Marty
e9a668be0d Merge branch 'release/1.1.13' into main 2021-07-19 15:26:52 +02:00
Benoit Marty
1896208181 Merge branch 'release/1.1.13' into develop 2021-07-19 15:26:50 +02:00
Paulo Pinto
0bdba9eb7d Standardise casing of terms in source strings 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-19 12:47:10 +01:00
Benoit Marty
60a9f6fcb8 Changelog - fastlane 2021-07-19 13:38:08 +02:00
Benoit Marty
1894ad21e1 Changelog 2021-07-19 13:36:34 +02:00
Benoit Marty
9f631768eb Avoid crash in debug app 2021-07-19 13:34:51 +02:00
Benoit Marty
2f6d2cfe09 Avoid crash in debug app 2021-07-19 13:31:09 +02:00
Benoit Marty
c21625079e Improve the template 2021-07-19 12:34:44 +02:00
Benoit Marty
6d8262077d
Merge pull request #3698 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-07-19 11:29:47 +02:00
Benoit Marty
7643cc506d Remove part file(s) in case of failure 
Will not always delete part files in case of crashes
 2021-07-19 11:08:03 +02:00
Benoit Marty
9c1bec94c9 Create AtomicFileCreator class to avoid code copy/paste 2021-07-19 10:59:40 +02:00
Benoit Marty
2e64f89ec6
Merge pull request #3656 from SpiritCroc/broken_downloads 
Avoid incomplete downloads in cache
 2021-07-19 10:50:52 +02:00
Weblate
9b829ddd04 Merge branch 'origin/develop' into Weblate. 2021-07-19 08:08:18 +00:00
Benoit Marty
f51769174d bundle update fastlane 2021-07-19 09:55:06 +02:00
Ihor Hordiichuk
5a5486c4b9 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-07-17 21:25:06 +00:00
ppnplusdf0eb2eb726b4bb3
a4cb5b1d28 Translated using Weblate (Thai) 
Currently translated at 12.3% (309 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
 2021-07-16 16:25:05 +00:00
Benoit Marty
45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68 
Bump kluent-android from 1.67 to 1.68
 2021-07-16 18:05:45 +02:00
Benoit Marty
6caa2b9ae0 Fix issue with RTL 
Still a pb when Mic is on, margins are not correct
 2021-07-16 17:12:08 +02:00
Benoit Marty
30bb91892d Fix issue about move overflow. 
Now use limit for distances
 2021-07-16 16:04:50 +02:00
Benoit Marty
646dfd5029
Merge pull request #3671 from vector-im/dependabot/gradle/kotlin_version-1.5.21 
Bump kotlin_version from 1.5.20 to 1.5.21
 2021-07-16 15:28:59 +02:00
Benoit Marty
3116b1a1c4
Merge pull request #3680 from psrpinto/fix/naming 
Standardise spelling and casing of homeserver, identity server, and integration manager
 2021-07-16 15:26:50 +02:00
SpiritCroc
e985d18df6 increment_version.sh: Fix for empty changelog 
Change-Id: Ic3a2a789b73a7a4c672c1edf9632bcd15f37b01e
 2021-07-16 13:26:21 +02:00
SpiritCroc
0dcb14482d Increment version 
Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707
 2021-07-16 12:34:43 +02:00
SpiritCroc
134dfcea81 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Icbff97960912b362e923897d1764aeafb06b6665
 2021-07-16 12:33:58 +02:00
SpiritCroc
ce03789c1a increment_version.sh: Update translation before 
Change-Id: I74953d63d3a944640a62923ba0f1bd6ff02ef859
 2021-07-16 12:33:26 +02:00
Benoit Marty
6da4f1d84f Add comment 2021-07-16 11:19:06 +02:00