filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,606 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

4743 Commits

Author SHA1 Message Date
SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
SpiritCroc ad36a7ca8c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I736ff2eb773f682790e80897bff5e41c84ec7559
 2021-02-04 17:00:39 +01:00
Benoit Marty 3c06517d9e Fix crash on API < 30 and light theme (#2774) 2021-02-04 12:32:13 +01:00
Benoit Marty a65f846929 Version++ 2021-02-03 17:09:32 +01:00
Benoit Marty 9b13381938
Merge pull request #2762 from vector-im/feature/bma/track 
Improvements
 2021-02-03 17:02:25 +01:00
Benoit Marty bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth 
Feature/bca/sso reauth
 2021-02-03 16:12:54 +01:00
Valere 73fccdd6de fix test compilation 2021-02-03 15:38:16 +01:00
Benoit Marty ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere 286f00396d Removed unused var 2021-02-03 14:20:58 +01:00
Valere 2a12cf22f5 fix code quality, line too long 2021-02-03 09:39:26 +01:00
Valere 97daf57b0a cleaning 2021-02-03 09:32:51 +01:00
Valere 697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere 0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
ganfra 49aed39711 Fix multiple tasks 2021-02-02 17:11:45 +01:00
Valere 2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Valere 8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
Valere 0bc203e0d5 Setup cross signing after initial sync if not yet done 
Use grace period if available, if not fail silently
 2021-02-02 09:02:10 +01:00
Valere 6c9b16088f Secure secrets passed to intent 2021-02-02 08:59:28 +01:00
Valere 76b425ee8a Cleaning 2021-02-01 16:39:14 +01:00
Valere 5b8215a356 Support SSO provider brand + UI fixes 2021-02-01 16:39:14 +01:00
Valere da16ec0af3 UIA fixes + better error support 2021-02-01 16:39:14 +01:00
Valere 1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
Benoit Marty afa3149504 Use lifecycleScope rather than an Empty ViewModel 2021-01-25 23:09:14 +01:00
Benoit Marty f2f4d325eb Bugfix: remove duplicate "More" section 2021-01-25 20:57:38 +01:00
Benoit Marty 57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit 2021-01-25 16:05:26 +01:00
Benoit Marty 602ea3327b URL preview: improve fix regarding message edition 2021-01-25 15:11:42 +01:00
SpiritCroc 417bf48dd1 Increment version 
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
 2021-01-23 11:58:10 +01:00
Benoit Marty 4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration 
Migrate to Android 11, API 30.
 2021-01-22 17:17:04 +01:00
Onuray Sahin 883a7cecf0 Fix viewbinding npe crashes. 2021-01-22 15:34:40 +03:00
Onuray Sahin 5eeb545ae2 Update url preview when the event is edited. 2021-01-21 15:20:19 +03:00
Benoit Marty 277fc4bf61
Merge branch 'develop' into feature/bma/fix_clear_cache 2021-01-20 17:15:02 +01:00
Benoit Marty c75eb050df Cleanup and fix test compilation 2021-01-20 16:32:41 +01:00
Benoit Marty 4709002429 Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started. 
Migratiing to supend methods fixes the problem, I'm not sure why...
 2021-01-20 15:19:48 +01:00
SpiritCroc 783212961c Sticker picker: pass dark/light theme 
Change-Id: I3c0152cab2d991c4439c10834a06b4c2753510e1
 2021-01-19 19:46:30 +01:00
Onuray Sahin f36bab0a7a Limit drawer layout with max width. 2021-01-19 15:33:35 +03:00
SpiritCroc 41e9e1e4f5 Revert "Revert "Remove empty task affinity"" 
Still issues with duplicated tasks otherwise

This reverts commit aca8715ec8.

Change-Id: Iae1f3e540fae10aa3fe2cc2f1efc418cf53d37b7
 2021-01-19 11:04:18 +01:00
SpiritCroc 4a95b69fcd Add some padding when hiding emoji button 
Otherwise, some elements are too close to the edge (especially on edge
displays).

Change-Id: I305fc343e134661964f1d83d10d0d02aa9c22131
 2021-01-16 18:43:34 +01:00
SpiritCroc 9d2c763b16 Fix hidden emoji button re-appearing on reply 
Change-Id: Ibfff4135d8ac24355a0e7fd3f3395c6ba56b0a85
 2021-01-16 16:04:58 +01:00
SpiritCroc e019222b76 Fix compose layout (missed renamed ids from latest upstream merge) 
Change-Id: I8c2928be45cc6bd3774fa23e7d73d99378f8bc89
 2021-01-16 15:49:01 +01:00
SpiritCroc e58a13ea91 Uniform bubble width in group chats 
Previously, we had a fixed margin for bubbles to the other side.
However, in group chats, we currently display avatars on one side and
not on the other, which leads to inhomogeneous message bubbles widths.

This patch leaves the width for direct chats unchanged, but adapts the
widths in group chats as following:
- Incoming messages a little bit wider, as these already are "missing"
  the avatar space.
- Outgoin messages a little bit narrower, so we have a more homogeneous
  look in group chats, and also do not start nearly at the same x-offset
  as incoming messages.

Closes https://github.com/SchildiChat/SchildiChat-android/issues/42.

Change-Id: Ic5391f1d512d4425ce4694182049ba0630ec9498
 2021-01-16 15:01:01 +01:00
SpiritCroc aca8715ec8 Revert "Remove empty task affinity" 
Upstream found a better fix.

This reverts commit 3cb5f6087c.

Change-Id: I65a3c7628a67ed3ab2782894855c5dba38c3856f
 2021-01-16 15:00:53 +01:00
SpiritCroc 4564c36fac Automatic SchildiChat string correction 
Change-Id: I09bcc6fec991cc5d7a965eada1a6673bfd6e10bc
 2021-01-16 11:21:51 +01:00
SpiritCroc 500a62e0a5 Automatic color correction 
Change-Id: I8155fded8bf096693b0cca1f6de5794c0b1247a4
 2021-01-16 11:21:49 +01:00
SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
SpiritCroc 26d178305e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I6d2fe7f0634e303fd12e8d37f2aa2b6274dcaca1
 2021-01-15 17:33:21 +01:00
ganfra 2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
Benoit Marty 72ee1ace48 Version++ 2021-01-15 11:14:59 +01:00
Benoit Marty 1a5291537d Correct support for Hebrew 2021-01-14 14:27:22 +01:00
Benoit Marty d6ef3ea08e Fix lint issues 2021-01-14 14:08:08 +01:00
Weblate 93fc64ff33 Merge branch 'origin/develop' into Weblate. 2021-01-14 09:57:30 +00:00