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

621 commits

Author SHA1 Message Date
S1m
450b0bbbaf Update UnifiedPush:android-connector to 1.2.2 2021-10-06 09:24:48 +02:00
SpiritCroc
38ae03893f Merge tag 'v1.3.1' into sc 
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
 2021-09-30 09:27:15 +02:00
SpiritCroc
de0f44307b Switch to own UP FCM fork for now 
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
 2021-09-30 09:18:57 +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
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
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
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
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
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
Benoit Marty
5b5dcf988d Version++ 2021-09-27 13:09:58 +02:00
Benoit Marty
53c8862ca2 Change version to 1.3.0 2021-09-27 11:57:23 +02:00
dependabot[bot]
5e7e66b18c
Bump barista from 4.1.0 to 4.2.0 
Bumps [barista](https://github.com/AdevintaSpain/Barista) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases)
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.1.0...4.2.0)

---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-24 07:53:52 +00:00
Benoit Marty
1b262a4df8
Merge pull request #4071 from vector-im/tools/adm/connected_tests 
Fixing no tests found when running vector:connectedAndroidTest
 2021-09-24 09:53:04 +02:00
Adam Brown
7bd8890276 extracting orchestrator dependency to the dependencies.gradle file 2021-09-23 20:24:16 +01:00
Adam Brown
d7bc32d7ca including tech orchestrator in the vector module script, fixes the no tests found error 2021-09-23 17:22:19 +01:00
Benoit Marty
e4bc60d255
Merge pull request #4020 from vector-im/dependabot/gradle/androidx.media-media-1.4.2 
Bump media from 1.4.1 to 1.4.2
 2021-09-23 15:53:17 +02:00
Benoit Marty
93506d18fa Display push counter on debug mode 2021-09-23 13:54:03 +02:00
dependabot[bot]
654010570e
Bump libphonenumber from 8.12.32 to 8.12.33 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.32 to 8.12.33.
- [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.32...v8.12.33)

---
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-22 23:05:09 +00:00
SpiritCroc
f97549073e Increment version 
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
 2021-09-18 20:38:14 +02:00
SpiritCroc
756529e565 Revert "Use Java 11 source code" 
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.

Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.

This reverts commit 80f23f1f3c.

Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
 2021-09-18 20:26:29 +02:00
dependabot[bot]
a3a49593e4
Bump media from 1.4.1 to 1.4.2 
Bumps media from 1.4.1 to 1.4.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-17 13:29:35 +00:00
ariskotsomitopoulos
1dcf6b9539 Enhance dependencies handling to support Dependabot 2021-09-17 14:58:44 +03:00
ariskotsomitopoulos
87fefdc7bb Add more dependencies to common dependencies.gradle 2021-09-15 20:22:52 +03:00
ariskotsomitopoulos
c89b2c0536 Optimize dependencies handling 2021-09-15 13:21:25 +03:00
SpiritCroc
c38ece586e Increment version 
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
 2021-09-13 16:20:06 +02:00
SpiritCroc
741ac9f3f6 Merge tag 'v1.2.2' into sc 
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
 2021-09-13 15:37:54 +02:00
Benoit Marty
db55693201 version++ 2021-09-13 15:29:51 +02:00
Benoit Marty
cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +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
SpiritCroc
3be0b85dcf Actually, this is 1.2.1 now 
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
 2021-09-09 16:21:19 +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
Benoit Marty
5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
SpiritCroc
832f0e0e5b Increment version 
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
 2021-09-09 09:39:24 +02:00
Benoit Marty
9914fb2d0f Version++ 2021-09-08 19:15:08 +02:00
Benoit Marty
73881d0813 Upgrade dependency on Barista. 
Should fix #3929

Barista has changed location since 4.0.0
 2021-09-03 17:02:14 +02:00
Benoit Marty
ec6bae6b1e Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now 
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
 2021-09-02 10:43:33 +02:00
Benoit Marty
80f23f1f3c Use Java 11 source code 
https://developer.android.com/studio/releases/gradle-plugin#java-11
 2021-09-02 09:50:34 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Benoit Marty
54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1 
Bump daggerVersion from 2.38 to 2.38.1
 2021-08-27 17:37:03 +02:00
Benoit Marty
0046de576e
Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0 
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
 2021-08-27 16:39:34 +02:00
dependabot[bot]
7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1 
Bumps `daggerVersion` from 2.38 to 2.38.1.

Updates `dagger` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

Updates `dagger-compiler` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 14:33:17 +00:00
Benoit Marty
fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1 
Bump timber from 4.7.1 to 5.0.1
 2021-08-27 16:32:29 +02:00
ganfra
fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
David Langley
ce9acd440e Enabled Notifications V2 2021-08-25 17:54:23 +01:00
Benoit Marty
f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings 
Room Notification Settings V2
 2021-08-25 15:20:43 +02:00
dependabot[bot]
8988ea8997
Bump libphonenumber from 8.12.30 to 8.12.31 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.30 to 8.12.31.
- [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.30...v8.12.31)

---
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-08-24 23:09:52 +00:00
David Langley
4d4d370b8f checks and remove build settings 2021-08-24 22:33:32 +01:00
David Langley
f8114dd7a1 Fix HomeList error snackbar and add dialog for bottom sheet errors 2021-08-24 22:28:31 +01:00
ganfra
42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00