mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 11:58:35 +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
Onuray Sahin
1c12cdd69a Fix changelog. 2021-09-29 12:46:47 +03:00
Benoit Marty
4e15975c6c
Merge pull request #4107 from vector-im/dependabot/gradle/com.squareup-seismic-1.0.3 
Bump seismic from 1.0.2 to 1.0.3
 2021-09-29 10:54:57 +02:00
SpiritCroc
f167a00921 Increase gradle/java heap size to fix fdroid build again 
Was 4G before merge, upstream changed from 2G to 3G, which still seems
too small.

Change-Id: I1a9f334a1ea991e9c2d27950a37504e68fee87d2
 2021-09-29 10:34:41 +02:00
SpiritCroc
c53267cfce Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ie350414fc54f0a54bcc6088da4c15418804ec1d0
 2021-09-29 10:02:36 +02:00
SpiritCroc
0c7981dc26 Revert "Revert "Revert "Use Java 11 source code""" 
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
 2021-09-29 09:56:32 +02:00
SpiritCroc
d520e4f5c9 Automatic SchildiChat string correction 
Change-Id: Idb57c1c0d93edb977bac2bc29413417ba337a571
 2021-09-29 09:55:07 +02:00
SpiritCroc
b4439db163 Automatic upstream merge postprocessing 
Change-Id: Ifbee07c8f513672d861096f700749c4f41fb19ff
 2021-09-29 09:55:06 +02:00
SpiritCroc
4f93eb041c Merge tag 'v1.3.0' into sc 
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
 2021-09-29 09:55:02 +02:00
SpiritCroc
19f081ae45 [TMP] Automatic upstream merge preparation 
Change-Id: I7d0c4a91961a4f61bb1fc222384a3903f0abe223
 2021-09-29 09:14:19 +02:00
SpiritCroc
0e8b08145c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ifd2418160a2bfb4203d24516a37c10a0d3643ab7
 2021-09-29 09:14:19 +02:00
SpiritCroc
b51bd743c7 Revert "Revert "Use Java 11 source code"" 
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
 2021-09-29 09:13:59 +02:00
dependabot[bot]
ae3e6a0706
Bump seismic from 1.0.2 to 1.0.3 
Bumps [seismic](https://github.com/square/seismic) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/square/seismic/releases)
- [Changelog](https://github.com/square/seismic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/seismic/compare/seismic-parent-1.0.2...seismic-parent-1.0.3)

---
updated-dependencies:
- dependency-name: com.squareup:seismic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-28 23:06:09 +00:00
Benoit Marty
701b0fbeef
Merge pull request #4100 from vector-im/feature/adm/vector-tinting 
Missing vector tinting
 2021-09-28 22:44:18 +02:00
Onuray Sahin
e4d39880fd Fix crash to render failed message warning stub. 2021-09-28 20:43:54 +03:00
Benoit Marty
7c2fac39f4
Merge pull request #4104 from abaker/fix_settings_missing_accelerometer 
Fix settings crash when accelerometer unavailable
 2021-09-28 17:28:26 +02:00
Adam Brown
458c423dab removing unused drawable 2021-09-28 15:41:16 +01:00
Alex Baker
2d707720f6 Fix settings crash when accelerometer unavailable 
Signed-off-by: Alex Baker <alex@beeper.com>
 2021-09-28 09:34:38 -05:00
Benoit Marty
5929095523
Merge pull request #4095 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.1 
Bump constraintlayout from 2.1.0 to 2.1.1
 2021-09-28 15:59:38 +02:00
Benoit Marty
3bd3ac09bf
Merge pull request #4097 from vector-im/dependabot/gradle/vanniktechEmoji-0.8.0 
Bump vanniktechEmoji from 0.7.0 to 0.8.0
 2021-09-28 15:59:16 +02:00
Adam Brown
12ca487e93 using the existing theme utils logic for reading attributes 2021-09-28 14:57:59 +01:00
Benoit Marty
23615c0038
Merge pull request #4091 from vector-im/feature/adm/verify-exported-keys-output 
Verify exported keys output
 2021-09-28 15:14:34 +02:00
Adam Brown
0d737a9a5d removing unused import 2021-09-28 13:11:19 +01:00
Adam Brown
2fee68e0d0 tinting the radio buttons to the colorPrimary 2021-09-28 12:42:49 +01:00
Adam Brown
a66d88abb3 tinting the voice locked vector to the colorPrimary 
- extracts a helper extension for tinting image resources
 2021-09-28 12:35:46 +01:00
Adam Brown
3a79a7595d tinting the in progress recording icon to the colorPrimary 
- creates extension helpers for tinting and reading theme attributes
-extracts the background from the recording vector icon and set as a separate tintable background drawable
 2021-09-28 12:26:41 +01:00
Adam Brown
0eef248d7d tinting the jump to unread view to the colorPrimary 
- the vector itself is set to an obvious red to highlight an incorrect usage (we should tint at the consumer to allow for reuse/preparing for design components/compose)
 2021-09-28 11:33:46 +01:00
ntnguyen1234
ac196eca9c Translated using Weblate (Vietnamese) 
Currently translated at 57.5% (65 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/vi/
 2021-09-28 12:06:36 +02:00
dependabot[bot]
cd4cfd05b8
Bump vanniktechEmoji from 0.7.0 to 0.8.0 
Bumps `vanniktechEmoji` from 0.7.0 to 0.8.0.

Updates `emoji-material` from 0.7.0 to 0.8.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.7.0...0.8.0)

Updates `emoji-google` from 0.7.0 to 0.8.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.7.0...0.8.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-28 09:31:21 +00:00
Benoit Marty
7d7ea3b9ad Avoid multiple PRs from Dependabot when a new version of com.vanniktech:emoji* is available 
Not updating the vesion here, dependabot will do it.
 2021-09-28 11:29:52 +02:00
Benoit Marty
6d91482da1
Merge pull request #4013 from vector-im/feature/bma/a11y_guidelines 
Update pull request checklist
 2021-09-28 10:01:13 +02:00
dependabot[bot]
4cb735fec5
Bump constraintlayout from 2.1.0 to 2.1.1 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/commits)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 23:13:27 +00:00
Adam Brown
399b2a13ee fixing exception message parameter ordering 2021-09-27 18:08:32 +01:00
Adam Brown
19d1d981c3 linting 2021-09-27 17:39:21 +01:00
Adam Brown
6df03fc13b adding changelog entry 2021-09-27 17:28:06 +01:00
Adam Brown
509c61c1a8 extracting the test fakes to their own package 2021-09-27 17:23:07 +01:00
Adam Brown
ac0c7067e0 updating the keys exporter to validate the generated file size in an attempt to warn the user of malformed outputs 
- injects the io dispatcher to allow the testing
- adds unit tests around the different error flows
 2021-09-27 17:23:07 +01:00
Adam Brown
789cc6b597 exlcuding the slf4j logger from the test dependencies 
the videocache dependency includes slf4j which in turn causes mockk to reflectively attempt to call real Log functions, which crashes the units tests due to the stub android.jar
 2021-09-27 17:23:03 +01:00
Adam Brown
e6eb86538f wrapping the Dispatcher.IO and making it injectable for testing 2021-09-27 16:57:05 +01:00
Benoit Marty
7e5ec29977
Merge pull request #4088 from vector-im/feature/bma/update_release 
Small change in the recipe to release the SDK
 2021-09-27 15:44:43 +02:00
Benoit Marty
224aac7c73 Small change in the recipe to release the SDK 2021-09-27 15:41:17 +02:00
Benoit Marty
465b8bfe05 Version++ 2021-09-27 13:11:15 +02:00
Benoit Marty
5b5dcf988d Version++ 2021-09-27 13:09:58 +02:00
Benoit Marty
ccfab3957f Merge branch 'release/1.3.0' into main 2021-09-27 13:09:13 +02:00
Benoit Marty
fd4acbc216 Merge branch 'release/1.3.0' into develop 2021-09-27 13:09:13 +02:00
Benoit Marty
e544592b70 Merge release 1.3.0 to main 2021-09-27 13:08:54 +02:00
Benoit Marty
7349e48bd4 Merge branch 'release/1.3.0' into develop 2021-09-27 13:07:23 +02:00
Benoit Marty
0cd3bcaf15 Fastlane changelog 2021-09-27 13:06:52 +02:00
Benoit Marty
7e922d59ea Run towncrier 2021-09-27 13:05:37 +02:00
Benoit Marty
38015fe04d rename file 2021-09-27 13:04:10 +02:00
Benoit Marty
f39d2b141e Wait for emoji to load, it's async now 
Testing before release 1.3.0
 2021-09-27 12:56:05 +02:00