mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-23 18:05:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
14654 commits 6 branches 120 tags 229 MiB
Commit graph

9216 commits

Author SHA1 Message Date
Onuray Sahin
f18a107df8 Merge branch 'develop' into feature/ons/live_location_service 
* develop: (152 commits)
  Remove exhaustive.
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  Code review fixes.
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
#	vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
#	vector/src/main/res/values/strings.xml
 2022-03-23 16:25:01 +03:00
Onuray Sahin
3fa4aea506 Navigate to room list when user clicks to the sticky notification. 2022-03-23 15:37:44 +03:00
Adam Brown
55b946a019 fixing the onboarding sanity test failing 
- adds tapping the new take me home button within the sanity test
 2022-03-23 12:57:53 +01:00
Onuray Sahin
7ead3f93f4 Remove exhaustive. 2022-03-23 13:52:53 +03:00
Onuray Sahin
c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing 
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
 2022-03-23 13:32:36 +03:00
ganfra
20b2af4432
Merge pull request #5610 from vector-im/feature/adm/account-creation-sanity-test-update 
Sanity test getting stuck on account created screen
 2022-03-23 11:03:46 +01:00
Benoit Marty
c6fe084507
Merge pull request #4471 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 
Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED
 2022-03-23 10:08:53 +01:00
Adam Brown
5bbc9dc102 fixing the onboarding sanity test failing 
- adds tapping the new take me home button within the sanity test
 2022-03-23 09:02:37 +00:00
ganfra
c06c9ea1d6 Fix lint issues on weblate sync 2022-03-22 18:55:34 +01:00
ganfra
3d3f5444b1
Merge pull request #5606 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-03-22 18:11:28 +01:00
Adam Brown
fdf3cc36ce fixing view model tests not collecting flow results 
- the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
 2022-03-22 17:01:34 +00:00
ericdecanini
bfd31de05e Renames call option to be more agnostic 2022-03-22 17:56:07 +01:00
ClaireG
6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
Weblate
095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz
8550db9f23 Translated using Weblate (Spanish) 
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-03-22 15:58:54 +00:00
Benoit Marty
012cdf4b4d runBlocking -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3 runBlockingTest -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:39:39 +01:00
Benoit Marty
f791ddb7bb Small cleanup 2022-03-22 16:14:15 +01:00
Benoit Marty
03fee2a131 The .exhaustive trick is not needed anymore in Kotlin 1.6.0 
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
 2022-03-22 16:14:15 +01:00
Benoit Marty
57bee40211 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ganfra
67804da205
Merge pull request #5604 from vector-im/feature/adm/toolbar-icon-positions 
Fixing presence icon anchoring to the middle of the room icon
 2022-03-22 15:16:17 +01:00
Onuray Sahin
24bdad3ae1 Code review fixes. 2022-03-22 17:04:35 +03:00
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
Adam Brown
1e6e8b546d fixing presence icon anchoring to the middle of the room icon 
- creates a secondary verification shield and aligns to the start of the room title when presence is present
 2022-03-22 13:43:43 +00:00
ericdecanini
7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-22 14:15:29 +01:00
Onuray Sahin
70c8a8bf34 Support sharing live location in multiple rooms. 2022-03-22 16:01:51 +03:00
ariskotsomitopoulos
c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
Benoit Marty
835497682f
Merge pull request #5572 from p1gp1g/play-sticker 
Show stickers on click
 2022-03-21 15:51:36 +01:00
Benoit Marty
579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch 
Presence indicator theme attribute
 2022-03-21 15:45:36 +01:00
Onuray Sahin
7e5c293ebc Use primary color for location notification item. 2022-03-21 17:27:14 +03:00
Onuray Sahin
334368083e Track location in foreground service. 2022-03-21 16:46:40 +03:00
ariskotsomitopoulos
ed2cb5f0fe Enhance text constants 2022-03-21 15:45:08 +02:00
Onuray Sahin
c63fc3d6c2 Start the foreground service when users start live location sharing. 2022-03-21 14:27:15 +03:00
Linerly
75fe14561e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-03-21 08:38:31 +00:00
bmarty
ffb007e96d Sync Emojis 2022-03-21 00:03:12 +00:00
notramo
06af5a8017 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2154 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-03-19 21:38:31 +00:00
Jeanne Lavoie
8a783a7a0b Translated using Weblate (French (Canada)) 
Currently translated at 83.9% (1811 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
 2022-03-19 21:38:31 +00:00
libexus
7910b4cd35 Translated using Weblate (German) 
Currently translated at 99.9% (2155 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-03-19 21:38:31 +00:00
ravit
cb290550a9 Translated using Weblate (Hebrew) 
Currently translated at 94.5% (2039 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2022-03-18 18:38:46 +00:00
Эдуард Гера
db828152a6 Translated using Weblate (Hebrew) 
Currently translated at 94.5% (2039 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2022-03-18 18:38:39 +00:00
Modificator
20d9f68679 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-03-18 18:38:35 +00:00
Besnik Bleta
1ecbe41529 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2145 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2022-03-18 18:38:35 +00:00
Jeanne Lavoie
d24f01c001 Translated using Weblate (French) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-03-18 18:38:35 +00:00
Jeanne Lavoie
4b6c8b8980 Translated using Weblate (French (Canada)) 
Currently translated at 83.7% (1806 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
 2022-03-18 18:38:35 +00:00
Theo
96904d0fd7 Translated using Weblate (Greek) 
Currently translated at 16.0% (347 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/el/
 2022-03-18 18:38:34 +00:00
waclaw66
805666b2f5 Translated using Weblate (Czech) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-03-18 18:38:33 +00:00
Zet
df717dd82d Translated using Weblate (Arabic) 
Currently translated at 32.7% (706 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-03-18 18:38:33 +00:00
Adam Brown
ea9c9ae490
Merge pull request #5408 from vector-im/feature/adm/onboarding-tests 
FTUE - Onboarding registration steps unit tests
 2022-03-18 15:57:38 +00:00
Maxime Naturel
d1aba46b52 Using one line per parameter for the custom view 2022-03-18 15:58:42 +01:00
Maxime Naturel
840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00
Adam Brown
ce2c309d72 including verification to ensure no other methods are being called 2022-03-18 14:00:56 +00:00
ariskotsomitopoulos
06db7e2374 Enhance migration logic & PR remarks 2022-03-18 14:51:06 +01:00
Adam Brown
7f943d37fd explicitly declaring the fake registrationb wizard as not relaxed and creating new test instances for each case 2022-03-18 13:15:14 +00:00
Maxime Naturel
526d11e912 Removing TODO 2022-03-18 14:12:55 +01:00
Maxime Naturel
56bffb2657 Adding stop button 2022-03-18 14:11:16 +01:00
Maxime Naturel
67297bbdef Custom View in timeline screen without stop button 2022-03-18 14:11:08 +01:00
Maxime Naturel
70ab5354c3 Adding strings of the view 2022-03-18 14:10:57 +01:00
Onuray Sahin
a1d27940cd Create a foreground service. 2022-03-18 15:26:11 +03:00
Maxime NATUREL
3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions 
Live Location Sharing - Background permission
 2022-03-18 12:06:30 +01:00
ariskotsomitopoulos
2e5d45ec6e Format code 2022-03-18 12:03:17 +01:00
ariskotsomitopoulos
f00b1f29bf Enhance text context for thread migration notice 2022-03-18 11:58:29 +01:00
ariskotsomitopoulos
a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
 2022-03-18 11:28:21 +01:00
sim
e5c04d9cc8 Show stickers on click 
Play animated stickers

Signed-off-by: sim <git@sgougeon.fr>
 2022-03-18 01:03:34 +01:00
ariskotsomitopoulos
61cb7a6ffb Prepare next RC threads migration to all users 2022-03-17 19:09:09 +01:00
ariskotsomitopoulos
2ca3387ab3 Migrate Threads and notify user 2022-03-17 18:51:54 +01:00
Adam Brown
abf62aff47 extracting named function out for cancelling the email validation job, giving more context to the currentjob=null 2022-03-17 17:51:01 +00:00
Adam Brown
192d1c4f2d converting open class to sealed interface for extra type safety 2022-03-17 17:01:16 +00:00
Adam Brown
ba76aac965 removing unused fake helper methods 2022-03-17 16:54:51 +00:00
Adam Brown
d514751ffd avoiding shadowed lambda parameters 2022-03-17 16:52:37 +00:00
Adam Brown
5df2ae9ae2 updating with previous state helper and including javadoc to help explain its usage 2022-03-17 16:50:20 +00:00
Adam Brown
d77061b229 removing fully qualified import 2022-03-17 16:38:42 +00:00
Arnaud Ringenbach
7593f7a2c6 Fix lint issues 2022-03-17 17:15:16 +01:00
Onuray Sahin
a13ba13fb5 Code review fixes. 2022-03-17 18:30:39 +03:00
Arnaud Ringenbach
d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
ericdecanini
d11fc060ee Fixes crash due to empty constructor in CreatePollViewState 2022-03-17 13:46:16 +01:00
Eric Decanini
9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Arnaud Ringenbach
4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
Onuray Sahin
33e5a206bd Fix background location permission for Android > 10. 2022-03-17 12:29:46 +03:00
Adam Brown
4154f036db fixing crash when tapping verification item 
- caused by the setArguments being called on the TimelineFragment not the bottomsheet we've just created
 2022-03-16 16:19:39 +00:00
Aris Kotsomitopoulos
d1a77d2eca
Merge pull request #5378 from vector-im/feature/aris/threads_analytics 
Feature/aris/threads analytics
 2022-03-16 15:51:24 +01:00
ClaireG
d1bca78083
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client 2022-03-16 14:51:10 +01:00
ariskotsomitopoulos
bcf3f1e302 Format code 2022-03-16 14:49:40 +01:00
Onuray Sahin
575d62a354 Naming convention fix. 2022-03-16 16:34:48 +03:00
ariskotsomitopoulos
eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
Adam Brown
99b43fd771
Merge pull request #5433 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-03-16 12:04:59 +00:00
ericdecanini
f722b2eb85 Removes unused import 2022-03-15 19:16:22 +01:00
ericdecanini
82ead4f3f5 Replaces call option condition with isDirect 2022-03-15 19:09:19 +01:00
Adam Brown
c257488ca8
Merge pull request #5513 from chagai95/add-presence-indicator-online 
add  presence indicator online
 2022-03-15 17:58:02 +00:00
Adam Brown
3d20d46eb3 enabling the personalize step for the unit tests preemptively for the feature to be enabled 2022-03-15 17:49:44 +00:00
Adam Brown
fe206fe130 fixing wrong action for starting the sign up 2022-03-15 17:49:44 +00:00
Adam Brown
694016fc16 adding test case for the non loading registration steps 2022-03-15 17:49:44 +00:00
Adam Brown
390ae4344d allowing test withPrevious to be supplied a list 2022-03-15 17:49:44 +00:00
Adam Brown
804513c808 adding case for result ignoring register actions 2022-03-15 17:49:44 +00:00
Adam Brown
75cbb727a4 cleaning up test names and bodies to be clearer 2022-03-15 17:49:43 +00:00
Adam Brown
b2a1aa17bd adding commas to separate the test name sections 2022-03-15 17:49:17 +00:00
Adam Brown
434ee67982 ensure the pid add/resend methods do not trigger the next registration steps 
- keeps the previous behaviour
 2022-03-15 17:49:17 +00:00
Adam Brown
3fa415007c extracting registration steps to separate handler to make testing the flow simpler 2022-03-15 17:49:16 +00:00
Adam Brown
4225f62120 adding test helper for asserting states whilst combining previous updates 2022-03-15 17:42:42 +00:00
Adam Brown
c15e908a15 converting onboarding action to sealed interface 2022-03-15 17:42:42 +00:00
Adam Brown
17d363cf9a
Merge pull request #5389 from vector-im/feature/adm/personalisation-complete 
FTUE - Personalisation complete
 2022-03-15 17:33:29 +00:00