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

7615 Commits

Author SHA1 Message Date
Benoit Marty fef0404ac7
Merge pull request #2706 from vector-im/feature/ons/fix_url_preview_on_edit 
Update url preview when the event is edited.
 2021-01-25 18:06:04 +01:00
Benoit Marty d6a5b9fb48 fulfill assertion about eventId 2021-01-25 16:42:53 +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 f64db7f5f3 Fix test compilation 2021-01-25 16:03:31 +01:00
Benoit Marty 128d3845b9 Small rework 2021-01-25 15:19:01 +01:00
Benoit Marty 602ea3327b URL preview: improve fix regarding message edition 2021-01-25 15:11:42 +01:00
Benoit Marty e55178612c
Merge pull request #2665 from vector-im/feature/bca/dendrite_sync_fix 
Fix Dendrite sync response support
 2021-01-25 14:23:13 +01:00
Benoit Marty 5a0d62db6f Cleanup (PR review) 
Also add some doc and add missing `internal` keyword
 2021-01-25 12:42:39 +01:00
Benoit Marty ed62e6a390
Merge pull request #2715 from vector-im/gradlew-update-6.8.1 
Update Gradle Wrapper from 6.8 to 6.8.1
 2021-01-25 09:55:03 +01:00
Benoit Marty 25a6b0ddfb
Merge pull request #2714 from vector-im/feature/bma/bulk_clean 
Feature/bma/bulk clean
 2021-01-25 09:54:46 +01:00
SpiritCroc 417bf48dd1 Increment version 
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
 2021-01-23 11:58:10 +01:00
gradle-update-robot 89cf1f3237 Update Gradle Wrapper from 6.8 to 6.8.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-01-23 01:32:49 +00:00
Benoit Marty b65fc4f46b rename val 2021-01-22 17:59:56 +01:00
Benoit Marty 401b5e2b7a Move private fun 2021-01-22 17:48:13 +01:00
Benoit Marty a44d00a31c Create data class. 2021-01-22 17:44:24 +01:00
Benoit Marty 267ae457ee Use const 2021-01-22 17:38:17 +01:00
Benoit Marty 887da0a3d6 Improve code #2 2021-01-22 17:37:25 +01:00
Benoit Marty 07ffd3ded3 Improve code 2021-01-22 17:32:00 +01:00
Benoit Marty 25dbb3e9ea Fix bad copy/paste 2021-01-22 17:26:10 +01:00
Benoit Marty 68177a02e1
Merge pull request #2709 from AndrewFerr/develop 
Identity: Recompute hashes after M_INVALID_PEPPER
 2021-01-22 17:20:43 +01:00
Benoit Marty 0a96841336
Merge branch 'develop' into develop 2021-01-22 17:20:36 +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
Benoit Marty dc48cd4d16
Merge pull request #2712 from vector-im/feature/ons/fix_viewbinding_crashes 
Fix viewbinding NPE crashes
 2021-01-22 16:53:56 +01:00
Onuray Sahin 883a7cecf0 Fix viewbinding npe crashes. 2021-01-22 15:34:40 +03:00
Andrew Ferrazzutti daf019b288 Identity: Recompute hashes after M_INVALID_PEPPER 
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
 2021-01-21 21:52:19 -05:00
Onuray Sahin 5eeb545ae2 Update url preview when the event is edited. 2021-01-21 15:20:19 +03:00
Benoit Marty 618d1f5de6
Merge pull request #2701 from vector-im/feature/bma/fix_clear_cache 
Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
 2021-01-20 17:15:12 +01: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 304b489470
Merge pull request #2699 from vector-im/feature/ons/fix_navigation_drawer_max_width 
Drawer layout width limit for landscape and tablets
 2021-01-20 15:37:46 +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 be9eaca775 Minor FEATURES.md phrasing change 
Change-Id: I2cd5b0fe9029a3dceaa00531b35e1e818e0ce71b
 2021-01-19 11:04:11 +01:00
SpiritCroc 7d50a8e172 Add FEATURES.md 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/40.

Change-Id: I744b1a7d5cb39a747ae17744f9a258a628a2c878
 2021-01-18 17:52:36 +01:00
SpiritCroc 44fcc2c89c Changelog improvement, with respect to maximum length 
Change-Id: I6d8845c53adaa7346b81ba5539eed929ef63ca7f
 2021-01-17 10:25:24 +01:00
SpiritCroc 92d799ea5a Automated changelog: just link to github for automated builds 
Change-Id: I5aa98f07a6c2053fe263d26f9d2265fb2193afef
 2021-01-16 18:59:42 +01:00
SpiritCroc 9687bacd9a increment_version: Ensure higher version code than previous test builds 
Change-Id: Ia48c13930ca1a26b43a4bb71fd642e0d7d139b60
 2021-01-16 18:51:51 +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 6652ed9a1f Small versioning rework 
- Remove the second dot in upstream_version.sc.scVersion
    - Reason: some programs linkify upstream_version.sc
- Always increment scVersion
    - Reason: Easier to identify unique SchildiChat versions
- Increment versionCode independently from versionName
    - Reason: version codes are limitted, don't waste them!
        - ok, it's unlikely that we'll reach the limit either way...
- Unique versionName for test versions (as long as used correctly)!

Change-Id: I7464d27255d55c4b5d51c08fb51e7692d3a24d1f
 2021-01-16 11:54:08 +01:00
SpiritCroc 4564c36fac Automatic SchildiChat string correction 
Change-Id: I09bcc6fec991cc5d7a965eada1a6673bfd6e10bc
 2021-01-16 11:21:51 +01:00
SpiritCroc c87627bb5e Automatic upstream merge postprocessing 
Change-Id: I0da2864255e9d91599bc42ffccf7c9d345f5edc1
 2021-01-16 11:21:50 +01:00
SpiritCroc 500a62e0a5 Automatic color correction 
Change-Id: I8155fded8bf096693b0cca1f6de5794c0b1247a4
 2021-01-16 11:21:49 +01:00
SpiritCroc 6f39304469 post_merge.sh: Fix missing quote 
Change-Id: I8c007bd99a7be1f7e0d2ea1cad678f093f82eadd
 2021-01-16 11:21:39 +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