mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 17:35:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
19542 commits 6 branches 120 tags 229 MiB
Commit graph

19542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hugh Nimmo-Smith
e554b43bc6 Merge branch 'feature/ons/qr_code_login_ui' of https://github.com/vector-im/element-android into feature/ons/qr_code_login_ui 2022-10-13 21:27:09 +01:00
Onuray Sahin
fb2776dca4 Cherry pick previous commits. 2022-10-13 20:33:52 +03:00
Hugh Nimmo-Smith
6e58f2fa51 Only do completeOnNewDevice if we received a confirmation code 2022-10-12 13:08:01 +01: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
Hugh Nimmo-Smith
4b14ee4695 Partial implementation of QR login logic 2022-10-11 23:34:05 +01:00
Hugh Nimmo-Smith
1235db7895 Implementations of MSC3886 and MSC3903 2022-10-11 23:33:30 +01:00
Hugh Nimmo-Smith
87956e9438 Retry scanning if not a QR code 2022-10-11 23:32:49 +01:00
Onuray Sahin
d8ea9c8215 Add flag for qr code login. 2022-10-11 20:04:18 +03:00
Onuray Sahin
f272e566b0 Implement link a device flow. 2022-10-11 19:03:15 +03:00
Jorge Martin Espinosa
def67b2e7d
Integrate WYSIWYG editor (#7288) 
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
 2022-10-11 17:05:47 +02:00
Onuray Sahin
5566300665 Add qr code options to layout. 2022-10-11 14:15:44 +03:00
Onuray Sahin
aacf2ba8a6 Refactor layout. 2022-10-11 13:08:43 +03:00
Eric Decanini
2fe636e93b
Adds Push Notification toggle to Device Manager (#7261) 
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Fixes post merge errors

* Fixes legal copies

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error
 2022-10-10 19:21:34 -04:00
Eric Decanini
a096ff03c8
Merge pull request #7217 from vector-im/feature/eric/msc3881 
Implements MSC3881 (enabled and device_id fields for Pusher API)
 2022-10-10 12:37:47 -04:00
Benoit Marty
31a79594fb
Merge pull request #7301 from vector-im/dependabot/gradle/androidx.sharetarget-sharetarget-1.2.0 
Bump sharetarget from 1.1.0 to 1.2.0 - REQUIRE DEVELOPER BRAIN
 2022-10-10 18:14:06 +02:00
Benoit Marty
23654a9ff8
Merge pull request #7315 from vector-im/dependabot/gradle/glide-4.14.2 
Bump glide from 4.14.1 to 4.14.2
 2022-10-10 18:13:36 +02:00
Benoit Marty
7878d6f565
Merge pull request #7316 from vector-im/dependabot/gradle/flipper-0.169.0 
Bump flipper from 0.164.0 to 0.169.0
 2022-10-10 18:13:12 +02:00
ericdecanini
267431d06e Fixes error 2022-10-10 11:37:39 -04:00
Benoit Marty
ac5a5015ba
Merge pull request #7326 from vrifox/patch-1 
correct login_set_email_notice
 2022-10-10 17:03:57 +02:00
Vri
5430ca2966
correct login_set_email_notice 
Corrected the string as noted in this comment by @lvre (https://translate.element.io/translate/element-android/element-app/en/?checksum=8cfc63845b17eca4#comments) over on Weblate.
 2022-10-10 16:18:37 +02:00
Onuray Sahin
ad208a0819 Refactor layout. 2022-10-10 13:48:25 +03:00
Benoit Marty
34cc5e8bd7
Merge pull request #7311 from vector-im/feature/bma/fix_bc 
Fix breadcrumbs
 2022-10-10 10:08:03 +02:00
ericdecanini
618cf7ac0e Fixes error 2022-10-09 14:55:43 -04:00
ericdecanini
c94884b9d3 Fixes error 2022-10-09 14:55:25 -04:00
ericdecanini
4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
ericdecanini
31d4fc9ab0 Fixes lint error 2022-10-09 12:45:11 -04:00
ericdecanini
78555ec6ba Rearranges imports 2022-10-09 10:59:11 -04:00
ericdecanini
cd2e693f0c Fixes legal copy 2022-10-09 09:48:36 -04:00
ericdecanini
11e251fc1d Fixes legal copy 2022-10-09 09:48:18 -04:00
ericdecanini
d191bfeaf7 Fixes legal copy 2022-10-09 09:46:07 -04:00
dependabot[bot]
90afced6aa
Bump flipper from 0.164.0 to 0.169.0 
Bumps `flipper` from 0.164.0 to 0.169.0.

Updates `flipper` from 0.164.0 to 0.169.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.164.0...v0.169.0)

Updates `flipper-network-plugin` from 0.164.0 to 0.169.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.164.0...v0.169.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-10-07 23:12:38 +00:00
dependabot[bot]
9ec2b6e8d5
Bump glide from 4.14.1 to 4.14.2 
Bumps `glide` from 4.14.1 to 4.14.2.

Updates `glide` from 4.14.1 to 4.14.2
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.14.1...v4.14.2)

Updates `compiler` from 4.14.1 to 4.14.2
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.14.1...v4.14.2)

---
updated-dependencies:
- dependency-name: com.github.bumptech.glide:glide
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.bumptech.glide:compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-07 23:11:33 +00:00
Onuray Sahin
236b30367f Fix ui test case. 2022-10-07 19:13:59 +03:00
Onuray Sahin
2b452d6fe5 Implement qr code login failed states. 2022-10-07 19:04:27 +03:00
Onuray Sahin
2527cab73e Fix cancel actions. 2022-10-07 17:48:40 +03:00
Onuray Sahin
04fb31666b Implement show qr code screen. 2022-10-07 17:34:41 +03:00
Maxime NATUREL
9827ffb1e5
Merge pull request #7312 from vector-im/fix/mna/device-manager-long-session-name 
[Device Management] Long session names not rendered well (PSG-820)
 2022-10-07 15:57:12 +02:00
Florian Renaud
b9f474041f
Merge pull request #7283 from vector-im/feature/fre/aggregate_voice_broadcast_state_events 
Aggregate voice broadcast state events
 2022-10-07 15:54:21 +02:00
ericdecanini
42d0e4f265 Fixes bindings 2022-10-07 09:09:19 -04:00
Florian Renaud
48d2cc4745
Merge pull request #7273 from vector-im/feature/fre/voice_broadcast_state_event 
Voice Broadcast - Send state events
 2022-10-07 14:53:30 +02:00
Benoit Marty
b1d3cc85c2 Remove the workaround, this is fixed in androidx.sharetarget:sharetarget:1.2.0. (with exported="true" declared in the library) 
https://android-review.googlesource.com/c/platform/frameworks/support/+/1742473
 2022-10-07 14:31:19 +02:00
Maxime NATUREL
3ceb19486a Adding changelog entry 2022-10-07 11:29:33 +02:00
Maxime NATUREL
bcf315aece Fix UI for long session names in SessionDetailsContentItem 2022-10-07 11:28:05 +02:00
Maxime NATUREL
824752a4ec Fix UI for long session names in SessionInfoView 2022-10-07 11:28:05 +02:00
Benoit Marty
bbc4b35b23 Remove unused val. 2022-10-07 11:27:08 +02:00
Benoit Marty
e08028378b Fix broken Breadcrumbs 2022-10-07 11:26:37 +02:00
Benoit Marty
bd36831b31
Merge pull request #7302 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.4.3 
Bump sentry-android from 6.4.1 to 6.4.3
 2022-10-07 09:47:35 +02:00
Benoit Marty
6086c4de7f
Merge pull request #7303 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.4 
Bump exifinterface from 1.3.3 to 1.3.4
 2022-10-07 09:47:20 +02:00
Onuray Sahin
1932edad46 Fix instructions view visibility. 2022-10-06 18:48:07 +03:00
Onuray Sahin
a00afa7a30 Simulate qr login states. 2022-10-06 18:17:02 +03:00