Commit Graph

27 Commits

Author SHA1 Message Date
valere 638442f6f0 remove app_name from resource 2023-03-15 09:20:03 +01:00
valere a70e3c2533 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-07 11:36:11 +01:00
Florian Renaud 9a31aa3b91 Move clock to core-utils module 2023-01-31 16:45:48 +01:00
valere 6965c0c5ab move app_name to xml res 2022-12-06 18:11:31 +01:00
valere ea37029631 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-04 11:13:46 +01:00
Onuray Sahin 4050975a19 Implement new logic for new login banner. 2022-12-02 18:15:10 +03:00
valere cb4720f6d5 CI update for ER 2022-12-02 12:40:48 +01:00
Benoit Marty 46d1795276 Fix crash due to missing notification
Thread: main, Exception: java.lang.RuntimeException: Unable to start service org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService@3d1f0bc with Intent { cmp=im.vector.app.debug/org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService (has extras) }: java.lang.IllegalArgumentException: Invalid notification (no valid small icon): Notification(channel=JitsiOngoingConferenceChannel pri=0 contentView=null vibrate=null sound=null defaults=0x0 flags=0xa color=0x00000000 category=call actions=2 vis=PUBLIC semFlags=0x0 semPriority=0 semMissedCount=0)
2022-10-28 11:10:08 +02:00
Benoit Marty 16a5046601 Add a DebugJitsiActivity for debug build only. It's quite useless... 2022-10-27 14:34:58 +02:00
jonnyandrew 31811bb7e0
Fix crash by disabling Flipper on API 22 and below (#7428)
* Disable Flipper on API 21 and below - only affects debug builds.

Due to a bug: https://github.com/facebook/flipper/issues/3572

* Add jonnyandrew to PR sign-off allowlist

Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
2022-10-21 17:36:31 +01:00
Benoit Marty f3309692a4
Merge pull request #7239 from vector-im/feature/bma/arch_fixes
Feature/bma/arch fixes
2022-10-18 11:47:12 +02:00
Benoit Marty aa806ed2c6 More cleanup on @Inject members 2022-10-17 15:07:11 +02:00
Benoit Marty cbd0972eca Reuse injected members in parent activity. 2022-10-17 15:06:22 +02:00
Onuray Sahin 6c10a9bf2d Code review fixes. 2022-10-14 18:10:18 +03:00
Onuray Sahin 5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
Hugh Nimmo-Smith 343cf74871 Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 01:45:03 +01:00
Benoit Marty 92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
Android 13
2022-10-13 13:52:52 +02:00
Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
Onuray Sahin d8ea9c8215 Add flag for qr code login. 2022-10-11 20:04:18 +03:00
Maxime NATUREL 7b352b44dc Replacing the feature flag by the new lab flag 2022-10-11 17:48:19 +02:00
Benoit Marty 652069d520 Manage new Android 13 notification permission. 2022-10-06 18:56:23 +02:00
Florian Renaud 0b0ea64a4b Add Voice Broadcast feature flag 2022-10-03 09:25:02 +02:00
Benoit Marty 2266723789 Remove `DefaultSharedPreferences` since we now have @DefaultPreferences which provide a singleton. 2022-09-22 16:32:14 +02:00
Florian Renaud e9d809d9c3 Move and enable deferred DMs into labs settings 2022-09-21 09:36:07 +02:00
Adam Brown 1d50bbdbda fixing manifest imports and giving androidTest its own dedicated manifest 2022-09-15 14:50:08 +01:00
Adam Brown 373a0ca4fb split commit to make debug changes to avoid files being seen as new! 2022-09-15 14:50:08 +01:00
Adam Brown 5d533d4ec9 lifting debug build type to the application module 2022-09-15 14:50:08 +01:00