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

20559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Prat T
73eb63a35e
Fix add by QR code layout (#5424) 
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
 2022-09-10 10:53:34 -07:00
SpiritCroc
e314922280 [merge] Fix various crashes 
Change-Id: I0e10d09e84771d79b8d54cd9b1239162cc19ceda
 2022-09-10 15:55:49 +02:00
SpiritCroc
f1b4db73e4 Automatic SchildiChat string correction 
Change-Id: If64f2437f0ee0cab81023272dbd30cd218992d63
 2022-09-10 15:36:26 +02:00
SpiritCroc
05f8e43dce Automatic upstream merge postprocessing 
Change-Id: I81defeb0ee4582d805d897eb02ac632b9134386f
 2022-09-10 15:36:25 +02:00
SpiritCroc
715eefe184 [merge] Update merge helpers for moved resources 
Change-Id: I09de3d8c78e69386fe6020e8d1aa0f4d1b7aa9b6
 2022-09-10 15:36:20 +02:00
SpiritCroc
bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36 
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-09-10 15:24:40 +02:00
SpiritCroc
bcf7e069f1 [TMP] Automatic upstream merge preparation 
Change-Id: Icbdfae25a816938d002a288ab96e2d2f9d410026
 2022-09-10 09:31:51 +02:00
SpiritCroc
c6c106399a Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I69b561bc7fd50532d7a39387c79794ba2a4b5fdb
 2022-09-10 09:31:51 +02:00
SpiritCroc
484c418687 Merge remote-tracking branch 'weblate/sc' into merge-v1.4.36 
Change-Id: I83544f38202d2b546be390166a86297ddabe12b1
 2022-09-10 09:31:25 +02:00
Benoit Marty
e37344a059 Version++ 2022-09-10 08:15:31 +02:00
Benoit Marty
6cada8f6a3 Merge branch 'release/1.4.36' into main 2022-09-10 08:13:58 +02:00
Benoit Marty
5d035314b4 Merge branch 'release/1.4.36' into develop 2022-09-10 08:13:58 +02:00
Benoit Marty
59d3ff1671 fastlane 2022-09-10 08:13:43 +02:00
Benoit Marty
58b94aef2d Manually improve CHANGES.md 2022-09-10 08:11:58 +02:00
Benoit Marty
4de62d84b4 towncrier 2022-09-10 08:04:20 +02:00
Benoit Marty
4b63f4b9bf
Merge pull request #7085 from vector-im/feature/bma/fix_push 
Feature/bma/fix push
 2022-09-09 18:03:10 +02:00
Benoit Marty
8c884f45fb Ignore Instantiatable class warning 2022-09-09 16:50:55 +02:00
Benoit Marty
e19647f6ca Firebase provides Map<String, String?> 2022-09-09 16:33:57 +02:00
Benoit Marty
ca2805fb7f
Merge pull request #7083 from vector-im/dependabot/gradle/flipper-0.163.0 
Bump flipper from 0.162.0 to 0.163.0
 2022-09-09 16:05:56 +02:00
Benoit Marty
bdff23a74d update doc 2022-09-09 15:59:34 +02:00
Benoit Marty
d9ad9859ec Format 2022-09-09 15:59:34 +02:00
Benoit Marty
7c4527fba6 Fix test - no need to use Moshi to parse FCM Push data. 2022-09-09 15:59:34 +02:00
Maxime NATUREL
b501770fa9
Merge pull request #7058 from vector-im/fix/mna/run-sonar-only-when-token-available 
CI: only run sonarqube task when token is known
 2022-09-09 11:41:06 +02:00
Benoit Marty
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2 
Use firebaseReceiver with FCM
 2022-09-09 09:46:06 +02:00
Maxime NATUREL
ff9add5a0c Re-adding env variables section inside the sonarqube job 2022-09-09 09:25:36 +02:00
Maxime NATUREL
b60c279c06 Re-adding "always()" expression in the condition 2022-09-09 09:25:36 +02:00
Maxime NATUREL
41f75eed50 Adding changelog entry 2022-09-09 09:25:36 +02:00
Maxime NATUREL
398f9427df Only run sonarqube task if tokens are not empty to avoid failure 2022-09-09 09:25:36 +02:00
dependabot[bot]
b4d72d2219
Bump flipper from 0.162.0 to 0.163.0 
Bumps `flipper` from 0.162.0 to 0.163.0.

Updates `flipper` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0)

Updates `flipper-network-plugin` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-08 23:09:02 +00:00
dependabot[bot]
b66c405430
Bump libphonenumber from 8.12.54 to 8.12.55 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.54 to 8.12.55.
- [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.54...v8.12.55)

---
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>
 2022-09-08 23:08:41 +00:00
Onuray Sahin
11079afa6b Keep initial filter type on bottom sheet. 2022-09-08 19:25:11 +03:00
Onuray Sahin
41ca662dcc Update device list according to the filter type. 2022-09-08 18:28:17 +03:00
sim
a17a4fe4b1 Add logs for invalid push data 2022-09-08 17:16:55 +02:00
Benoit Marty
614383c08d
Merge pull request #7081 from vector-im/bugfix/nfe/app_layout_feature_flag_restart 
restart HomeActivity when app layout flag is changed
 2022-09-08 16:54:08 +02:00
sim
3e12907b26 Parse pushData in the push receiver 2022-09-08 16:25:48 +02:00
NIkita Fedrunov
4222c7c7c4 changed to only restart home activity when resumed with different app layout flag state 2022-09-08 16:24:34 +02:00
NIkita Fedrunov
cb36ef766c restart app when app layout flag is changed 2022-09-08 16:14:57 +02:00
sim
bc5309b5d7 Rename VectorMessagingReceiver to VectorUnifiedPushMessagingReceiver 2022-09-08 15:40:06 +02:00
sim
dbea1726ec Rename VectorMessagingHelper to VectorPushHandler 2022-09-08 15:38:52 +02:00
sim
2527dbbeb2 Rename FirebaseReceiver to VectorFirebaseMessagingService 2022-09-08 15:37:18 +02:00
Benoit Marty
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs 
New Layout - Labs Flag (to replace feature flag)
 2022-09-08 14:35:38 +02:00
Onuray Sahin
ab4ebc7f11 List devices. 2022-09-08 13:47:07 +03:00
NIkita Fedrunov
2ab0343e4f sanity test now reads properties value to determine app layout feature status + small fix for tests 2022-09-08 12:37:25 +02:00
sim
65654e7e8a Lint 2022-09-08 12:21:11 +02:00
NIkita Fedrunov
6badbe738d robots are not checking feature flag for newAppLayout 2022-09-08 12:09:33 +02:00
sim
f65074b3c5 Update pusher with FCM new token only if using FCM 2022-09-08 11:46:34 +02:00
Maxime NATUREL
62dbab907d
Merge pull request #7044 from vector-im/feature/mna/clean-vm-for-dm-v2 
[Devices Management] Refactor some code to improve testability (PSG-701)
 2022-09-08 11:44:56 +02:00
sim
48498020a0 Ensure FCM always have the good gateway 2022-09-08 11:23:15 +02:00
sim
3267cbbf78 Lint 2022-09-08 11:15:41 +02:00
sim
94e2a0a3e3 Ensure FCM token is always retrieved 2022-09-08 10:58:08 +02:00