filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,764 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

10764 Commits

Author SHA1 Message Date
Benoit Marty e9da63e3ee
Merge pull request #3635 from vector-im/feature/bma/crash_room_aliases 
Fix crash in room aliases
 2021-07-06 12:15:37 +02:00
Benoit Marty 8f1b7649aa Make the code compile... 2021-07-06 12:10:06 +02:00
Benoit Marty 4963025150 Decorelate interfaces for code clarity 2021-07-06 11:36:50 +02:00
Benoit Marty ca9f5161d1 Add retry support on Room Alias screen 2021-07-06 11:12:40 +02:00
Benoit Marty 5b149c8a34 Crash when opening room addresses screen with no internet connection 2021-07-06 10:57:59 +02:00
SpiritCroc 566feaecc1 Make jump to unread better visible for SC dark theme 
Change-Id: I9c95ab4348f4b4c2c77056b81a0e3de585d56cb0
 2021-07-06 10:14:47 +02:00
Benoit Marty e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 
Bump junit from 1.1.2 to 1.1.3
 2021-07-05 21:36:38 +02:00
Benoit Marty ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown 
Improve wellknown usage
 2021-07-05 21:36:16 +02:00
Benoit Marty 692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 
Bump material from 1.3.0 to 1.4.0
 2021-07-05 21:29:49 +02:00
Benoit Marty 07d6eaacf9 Quick cleanup after #3624 2021-07-05 21:28:37 +02:00
Benoit Marty a335c5eb4b
Merge pull request #3624 from vector-im/dbkr/scan_button_title 
Use different copy for self verification
 2021-07-05 21:25:57 +02:00
David Baker 04cad290f7 Also change the emoji button subtitle 
and tweak the other string more because it's not "each other" either
 2021-07-05 19:49:48 +01:00
SpiritCroc 0b8b9d3cad Fix jump-to-unread style for non-Element themes 
Change-Id: If203eb8af60542eff57269dfe318b754b1e83b10
 2021-07-05 18:00:51 +02:00
SpiritCroc 37b729c1d1 Remove freshly added corner radius from Element 
Change-Id: I966aeb01b0fdfd30f03b601beefa049d92a6b3ac
 2021-07-05 16:59:52 +02:00
SpiritCroc e0e17e8996 Automatic SchildiChat string correction 
Change-Id: I07253ef1a3be8dc753c734eb93fe50f6899d03e5
 2021-07-05 16:58:50 +02:00
SpiritCroc 0cb876485d Automatic upstream merge postprocessing 
Change-Id: Ie2b3c8142cf8fd3fe9a042b686c8f8ba57fac7dd
 2021-07-05 16:58:49 +02:00
SpiritCroc e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.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/GroupRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
Benoit Marty d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty 67f41028ff Remove Riot ref: Riot -> Web client 2021-07-05 16:41:26 +02:00
Benoit Marty 0e8018cbba ktlint and format 2021-07-05 16:24:19 +02:00
Benoit Marty 97cae9926b
Merge pull request #2848 from vector-im/neilalexander/vectorpreferences 
Add subscribeToChanges/unsubscribeToChanges to VectorPreferences
 2021-07-05 16:22:43 +02:00
dependabot[bot] 974d5c23d3
Bump junit from 1.1.2 to 1.1.3 
Bumps junit from 1.1.2 to 1.1.3.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 14:19:54 +00:00
Benoit Marty d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0 
Bump espresso_version from 3.3.0 to 3.4.0
 2021-07-05 16:19:17 +02:00
Benoit Marty edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields 
Cleanup redundant fields - TO BE MERGED ON JULY 1st
 2021-07-05 16:16:33 +02:00
Benoit Marty c2e649f64e Fix deprecated method 2021-07-05 16:07:44 +02:00
Benoit Marty b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
zeritti 084e497463 Translated using Weblate (Czech) 
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/cs/
 2021-07-05 13:34:54 +00:00
Jeff Huang 46320ef71b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-07-05 13:34:54 +00:00
Priit Jõerüüt f35050d4b4 Translated using Weblate (Estonian) 
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/et/
 2021-07-05 13:34:53 +00:00
sr093906 10e38d3319 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-07-05 13:34:52 +00:00
Szimszon 80d415b242 Translated using Weblate (Hungarian) 
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/hu/
 2021-07-05 13:34:52 +00:00
Jeff Huang e0f5099bd6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-07-05 13:34:51 +00:00
sr093906 900769174c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-07-05 13:34:51 +00:00
lvre 7ccc218c6b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-05 13:34:50 +00:00
Szimszon a610ea06aa Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-07-05 13:34:50 +00:00
Priit Jõerüüt 8034ea16e5 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-07-05 13:34:50 +00:00
zeritti 5fc818fac2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-07-05 13:34:49 +00:00
Benoit Marty c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1 
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
 2021-07-05 14:38:07 +02:00
dependabot[bot] 8639582671
Bump espresso_version from 3.3.0 to 3.4.0 
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 12:38:04 +00:00
Benoit Marty fa370861e8
Merge pull request #3597 from vector-im/dependabot/gradle/com.android.tools.build-gradle-4.2.2 
Bump gradle from 4.2.1 to 4.2.2
 2021-07-05 14:37:58 +02:00
Benoit Marty 5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 
Bump core-ktx from 1.5.0 to 1.6.0
 2021-07-05 14:37:48 +02:00
Benoit Marty 242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0 
Bump mockk-android from 1.11.0 to 1.12.0
 2021-07-05 14:37:33 +02:00
Benoit Marty ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0 
Bump mockk from 1.11.0 to 1.12.0
 2021-07-05 14:37:20 +02:00
Benoit Marty f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty 80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0 
Bump orchestrator from 1.3.0 to 1.4.0
 2021-07-05 14:37:07 +02:00
Benoit Marty c443cffca5
Merge pull request #3627 from vector-im/gradlew-update-7.1.1 
Update Gradle Wrapper from 7.1 to 7.1.1
 2021-07-05 14:36:04 +02:00
Benoit Marty 72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
SpiritCroc f8084dc2e2 [TMP] Automatic upstream merge preparation 
Change-Id: If4581aa8e4f43b4963a3ed44313f7dd1d00d7581
 2021-07-05 10:32:08 +02:00
SpiritCroc a4ba5998e1 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I145b127da93a119944cdd13879644787c875a52e
 2021-07-05 10:32:08 +02:00
Benoit Marty 2da0379505 Merge branch 'release/1.1.12' into main 2021-07-05 09:57:57 +02:00