Commit graph

11433 commits

Author SHA1 Message Date
Denis Kasak
9c06b9b0f7
Merge pull request from GHSA-p2m5-74vh-pj57
Store device key in SharedSessionEntity
2021-09-14 11:13:52 +00:00
Le Dang Trung
c69f0db5b4 Translated using Weblate (Vietnamese)
Currently translated at 52.3% (1368 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-09-14 08:25:40 +00:00
Nikita Epifanov
b48dbd1a52 Translated using Weblate (Russian)
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/ru/
2021-09-14 08:25:31 +00:00
Nikita Epifanov
59d5cfbb24 Translated using Weblate (Russian)
Currently translated at 99.3% (2597 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2021-09-14 08:25:30 +00:00
random
0dc88c71ab Translated using Weblate (Italian)
Currently translated at 99.8% (2612 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2021-09-14 08:25:26 +00:00
SpiritCroc
61662b9774 Troubleshoot FCM: this should not be a format string right now
Change-Id: Ifff301e55530c2f14c0a54b6e909f199e1706717
2021-09-14 10:00:29 +02:00
SpiritCroc
b96f150dd0 Add labs setting to use UP endpoint as gateway directly
Change-Id: I8117a4bd15d67703d15be20023146dec8ceec07f
2021-09-14 09:57:26 +02:00
ariskotsomitopoulos
c9b294f737 Remove unused commented lines 2021-09-14 10:45:29 +03:00
ariskotsomitopoulos
fe1d9aa589 - Optimize build time for local builds
- Enhance CI/CD workflows (7GB Ram, 2CPU) by adding custom gradle arguments to properly run
- Add unit test UI comment representation plugin
2021-09-13 19:03:35 +03:00
SpiritCroc
c38ece586e Increment version
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
2021-09-13 16:20:06 +02:00
SpiritCroc
ddceeaff0d Automatic SchildiChat string correction
Change-Id: I9447b4a54567537195c0bf814e8d001a438ccd2f
2021-09-13 15:37:58 +02:00
SpiritCroc
99549b0827 Automatic upstream merge postprocessing
Change-Id: Ie0be3b5c124ab589b52fa585e9e330f8c906bd6a
2021-09-13 15:37:57 +02:00
SpiritCroc
741ac9f3f6 Merge tag 'v1.2.2' into sc
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
2021-09-13 15:37:54 +02:00
Benoit Marty
eb962cfb1e Update Changelog for 1.2.2 2021-09-13 15:37:25 +02:00
Benoit Marty
db55693201 version++ 2021-09-13 15:29:51 +02:00
Valere
3a0734f6e2 Store device key in SharedSessionEntity
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
2021-09-13 15:29:45 +02:00
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