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

11517 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
bcbe8d3144 Merge branch 'hotfix/1.2.2' into main 2021-09-13 15:26:16 +02:00
Benoit Marty
cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +02:00
Valere
8d2f95d5db Store device key in SharedSessionEntity 
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
 2021-09-13 15:25:30 +02:00
SpiritCroc
b084febf96 [TMP] Automatic upstream merge preparation 
Change-Id: I49e0bface447e2900d1133a5b14895591a99887c
 2021-09-13 14:18:47 +02:00
SpiritCroc
70b8b3a22f Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I831bc3b9509ded5c8bea671810a2c067e8c1f984
 2021-09-13 14:18:47 +02:00
Benoit Marty
60004f02c3
Merge pull request #4002 from vector-im/feature/bma/fix_check_result 
Fix annoying issue detected by lint (CheckResult)
 2021-09-13 11:27:28 +02:00
dependabot[bot]
d54549bdf3
Bump robolectric from 4.5.1 to 4.6.1 
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.5.1 to 4.6.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.5.1...robolectric-4.6.1)

---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-13 09:25:33 +00:00
Benoit Marty
e8e9278b82
Merge pull request #4004 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.32 
Bump libphonenumber from 8.12.31 to 8.12.32
 2021-09-13 11:24:37 +02:00
Le Dang Trung
9c94fd26e2 Translated using Weblate (Vietnamese) 
Currently translated at 47.8% (1250 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-09-12 08:25:35 +00:00
libexus
e07e2c11a4 Translated using Weblate (German) 
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-09-12 08:25:29 +00:00
Ihor Hordiichuk
66ec25d8eb Translated using Weblate (Ukrainian) 
Currently translated at 81.5% (2132 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-12 08:25:28 +00:00
jannikac
b5c08a13ff Translated using Weblate (German) 
Currently translated at 98.8% (2585 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-09-12 08:25:28 +00:00
libexus
370b9cabf7 Translated using Weblate (German) 
Currently translated at 98.8% (2585 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-09-12 08:25:27 +00:00
SpiritCroc
4f1cde6c07 Add some secret setting 
Change-Id: I8f43d720c556389555128da07e8c6571afea13c3
 2021-09-11 11:16:37 +02:00
SpiritCroc
8a8ad86806 Drawer notif count badge: use total count 
Upstream decided to only count notifications for other spaces than the
currently selected one for the drawer icon. This however leads to
notification counts multiplying for rooms present in multiple spaces.
Instead, it's more useful to just show the total notification count,
without doing any kind of space-based filtering.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/79

Change-Id: I2a76d4fbc768b36470d9183741f57a5f834d374a
 2021-09-11 10:22:23 +02:00
SpiritCroc
4803fbbc05 merge_helpers.sh: Allow restoring upstream files deleted downstream 
Change-Id: Ib02d37f4c5e2414b04e5fdf6006e6e3c13f4827a
 2021-09-11 10:01:11 +02:00
SpiritCroc
75a9c748af Hide secure backup "backing up keys" banner 
Change-Id: I432561ac30d70509c38e07e8ed3ea4cecb9fe4b2
 2021-09-11 10:00:46 +02:00
SpiritCroc
9d25264a19 Merge remote-tracking branch 'p1gp1g/unifiedpush' into sc 
Change-Id: I3c3bd1405fad1eba0974e65f089dcbdd4c152671
 2021-09-11 09:41:59 +02:00
dependabot[bot]
57abc04752
Bump libphonenumber from 8.12.31 to 8.12.32 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.31 to 8.12.32.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.31...v8.12.32)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-10 23:07:44 +00:00
Le Dang Trung
49821805d1 Translated using Weblate (Vietnamese) 
Currently translated at 44.9% (1175 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-09-10 21:25:50 +00:00
Glandos
6a0cc66f43 Translated using Weblate (French) 
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-09-10 21:25:30 +00:00
Ihor Hordiichuk
13ac4851fc Translated using Weblate (Ukrainian) 
Currently translated at 81.5% (2132 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-10 21:25:29 +00:00
Glandos
0e956f1f5a Translated using Weblate (French) 
Currently translated at 100.0% (2615 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-09-10 21:25:28 +00:00
Benoit Marty
449eac0d99 Fix annoying issue detected by lint (CheckResult) and consider that's errors from now 2021-09-10 18:14:39 +02:00
Benoit Marty
938540d9e9
Merge pull request #3895 from vector-im/dependabot/gradle/kotlin_version-1.5.30 
Bump kotlin_version from 1.5.21 to 1.5.30
 2021-09-10 16:30:39 +02:00
Benoit Marty
ea6c8a6981
Merge pull request #3993 from vector-im/feature/bma/fix_for_the_sdk 
Add code necessary to release the SDK
 2021-09-10 16:23:17 +02:00
Benoit Marty
8d7cd183b4 Update the recipe to upload to MavenCentral. 
In the future the CI will do that, but keep it manual for now.
 2021-09-10 16:22:19 +02:00
Benoit Marty
397f576e68
Merge pull request #3994 from vector-im/feature/bma/sdk_version 
Feature/bma/sdk version
 2021-09-10 15:59:22 +02:00
Valere
cda95dd23c Store device key in SharedSessionEntity 
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
 2021-09-10 14:27:39 +02:00
SpiritCroc
1b8874e8cb Expose and theme some upstream colors concerning video conferences 
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
 2021-09-10 12:26:56 +02:00
ganfra
f96485c493 Timeline: use json directly to be a bit more speedy (those methods are called a lot) 2021-09-09 19:06:09 +02:00
ganfra
2144bb9d49 Timeline: remove reaction animation views for now 2021-09-09 18:30:45 +02:00
SpiritCroc
dc2f9f883e Increase gradle/java heap size to fix fdroid build 
Change-Id: I28b682acf672eef7438fbc74d2aa697258f6c6e7
 2021-09-09 16:36:29 +02:00
SpiritCroc
3be0b85dcf Actually, this is 1.2.1 now 
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
 2021-09-09 16:21:19 +02:00
SpiritCroc
d9db4fffb2 Make new notification mode radio items look nicer 
Change-Id: I5ce2373a7b855da74d4a29f595171644bb3d5ae0
 2021-09-09 14:30:26 +02:00
Valere
d758d5c270 Fix / Kick user dialog for spaces talks about rooms 2021-09-09 14:20:38 +02:00
SpiritCroc
4b241a00a3 Refactor power-level based display name color updates 
Use similar mechanism as recently added for isDirect changes.

Change-Id: Ida304ae2cc2fbe85cc4b47cb32d6c343cd5e2bd6
 2021-09-09 12:48:41 +02:00
SpiritCroc
f4d8f78ac7 Fix timeline rebuild on DM state change 
Needs slightly different handling after
50a042683b "Architecture: get rid of RoomSummariesHolder as it can lead to errors"

Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
 2021-09-09 12:12:31 +02:00
SpiritCroc
25b11084f4 Merge branch 'merge_v1.2.1' into sc 
Change-Id: I003540479c02eae32fdeee7230ef11e5d373e9b0
 2021-09-09 11:30:00 +02:00
SpiritCroc
ca40676070 Automatic SchildiChat string correction 
Change-Id: Ie159d8065491758645b608d097daee74e61d1000
 2021-09-09 10:59:34 +02:00
SpiritCroc
4d3f0d734e Automatic upstream merge postprocessing 
Change-Id: I4ba951dbf6b6d874ac22d3f22f84bebb03f5e8bc
 2021-09-09 10:59:33 +02:00
SpiritCroc
11093ee015 Add back unifiedpush strings, but to SC strings 
Change-Id: Idea333c040aaf761d080e2ca15f463549da94efa
 2021-09-09 10:55:42 +02:00
SpiritCroc
133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
SpiritCroc
fc2775d86a Fix Fastfile 
Change-Id: Id98dd7c3f1e56775a88a4401407e518265250d95
 2021-09-09 10:16:11 +02:00
Benoit Marty
3fcfe7000f Update user agent: MatrixAndroidSDK_X is replaced by MatrixAndroidSdk2 2021-09-09 09:59:06 +02:00
Benoit Marty
5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
Benoit Marty
529a7aedcb Cleanup useless values 2021-09-09 09:55:24 +02:00
Benoit Marty
6a1409ba59 Better management of SDK version 2021-09-09 09:55:24 +02:00
SpiritCroc
3b85ab988b [TMP] Automatic upstream merge preparation 
Change-Id: I2893c4d5476417ed6eb7d0c7ec3bf7b68338a8f3
 2021-09-09 09:41:38 +02:00
SpiritCroc
99ada07157 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ibfce6aea9c9404a43e9adc6de365626ad4d43e5e
 2021-09-09 09:41:38 +02:00