mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
10567 commits 7 branches 124 tags 230 MiB
Commit graph

10567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1 
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
 2021-07-05 14:38:07 +02:00
dependabot[bot]
8639582671
Bump espresso_version from 3.3.0 to 3.4.0 
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 12:38:04 +00:00
Benoit Marty
fa370861e8
Merge pull request #3597 from vector-im/dependabot/gradle/com.android.tools.build-gradle-4.2.2 
Bump gradle from 4.2.1 to 4.2.2
 2021-07-05 14:37:58 +02:00
Benoit Marty
5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 
Bump core-ktx from 1.5.0 to 1.6.0
 2021-07-05 14:37:48 +02:00
Benoit Marty
242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0 
Bump mockk-android from 1.11.0 to 1.12.0
 2021-07-05 14:37:33 +02:00
Benoit Marty
ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0 
Bump mockk from 1.11.0 to 1.12.0
 2021-07-05 14:37:20 +02:00
Benoit Marty
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty
80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0 
Bump orchestrator from 1.3.0 to 1.4.0
 2021-07-05 14:37:07 +02:00
Benoit Marty
c443cffca5
Merge pull request #3627 from vector-im/gradlew-update-7.1.1 
Update Gradle Wrapper from 7.1 to 7.1.1
 2021-07-05 14:36:04 +02:00
Benoit Marty
72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
SpiritCroc
f8084dc2e2 [TMP] Automatic upstream merge preparation 
Change-Id: If4581aa8e4f43b4963a3ed44313f7dd1d00d7581
 2021-07-05 10:32:08 +02:00
SpiritCroc
a4ba5998e1 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I145b127da93a119944cdd13879644787c875a52e
 2021-07-05 10:32:08 +02:00
Benoit Marty
2da0379505 Merge branch 'release/1.1.12' into main 2021-07-05 09:57:57 +02:00
Benoit Marty
cf5ab304df Merge branch 'release/1.1.12' into develop 2021-07-05 09:57:56 +02:00
Benoit Marty
9673b3b15b Release: fastlane 2021-07-05 09:56:27 +02:00
Benoit Marty
09e362ec6b Release: towncrier 2021-07-05 09:55:22 +02:00
Benoit Marty
76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
SpiritCroc
24a61ee0ff Display-name coloring setting 
Based on whether a chat is
- DM
- Room
- Public room

allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)

The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.

Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
 2021-07-04 17:01:27 +02:00
SpiritCroc
a0adb8c9bd Update README 
Change-Id: If26d9ac0adea3202e2322801fb7a45f75f680ac5
 2021-07-04 14:35:42 +02:00
SpiritCroc
1eee4f3dca Delete empty video.txt fastlane files 
These show up as untranslated on weblate

Change-Id: I13860a93b5b2d2dc8bae1b9b7322a517809ae99d
 2021-07-04 12:42:03 +02:00
SpiritCroc
eb051f1b29 Small update to the store description 
Upstream now can follow system dark/light theme as well, but we have
more settings!

Change-Id: If4a18e48302ddfeeabbb4e96795a611809c3dba0
 2021-07-04 12:15:04 +02:00
SpiritCroc
1ba30d4bdb Increment version 
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
 2021-07-04 11:52:31 +02:00
lvre
eb4f36319f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-03 20:00:21 +00:00
lvre
886ce7ce3b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2021-07-03 20:00:06 +00:00
Benoit Marty
2d860eaa2a
Merge pull request #3622 from vector-im/feature/bma/crash_realm 
CryptoStore migration has to be object to avoid crash
 2021-07-03 20:08:57 +02:00
SpiritCroc
ba6fd96623 Fix some corner case where a wrong display name would show 
Scenario: Scroll to a message in dual side bubble layout that:
- Is an image, i.e. has a time footer overlay
- Was sent by the user
- Was sent in a group chat, i.e. other messages show sender display
  names

This scenario could lead to the non-bubble name view not being cleared
nor hidden correctly.

Change-Id: I033d3070612d219dea9f2181c5029e17460c3ee6
 2021-07-03 15:34:34 +02:00
gradle-update-robot
4ad5deac38 Update Gradle Wrapper from 7.1 to 7.1.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-07-03 00:09:56 +00:00
dependabot[bot]
9ff1e20f07
Bump material from 1.3.0 to 1.4.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 23:07:53 +00:00
David Baker
78c87870ae changelog 2021-07-02 20:22:14 +01:00
David Baker
fe4c4832bd Use different copy for self verification 
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
 2021-07-02 18:38:57 +01:00
SpiritCroc
fe1fc098c8 Disable "long click on room" "help" 
Change-Id: I851092f89131b531e5e0e94e405bb2769f84dbb0
 2021-07-02 18:35:15 +02:00
SpiritCroc
1c32fcad35 Profile screen theme tweaks 
Change-Id: I0dfeea8284ae597b03c6e9fd8c1f2f1e4f45332f
 2021-07-02 18:33:42 +02:00
Benoit Marty
2513be744c CryptoStore migration has to be object to avoid crash 
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
 2021-07-02 17:29:44 +02:00
Benoit Marty
2a0230633d
Merge pull request #3620 from vector-im/feature/bma/fix_wl 
Fix compilation issue
 2021-07-02 17:29:04 +02:00
Benoit Marty
2c7b947d27 Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 15:32:01 +02:00
SpiritCroc
4b472f041b Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: If195307eec194931f2ec1980dbf23d0b45d18a32
 2021-07-02 15:23:09 +02:00
SpiritCroc
b808d8b464 Avoid chat position jumps during message loading 
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
  that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message

With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.

Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
 2021-07-02 15:19:20 +02:00
Benoit Marty
f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty
1eea734a4c Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 12:53:00 +02:00
Benoit Marty
dc50246ec4
Merge pull request #3618 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-07-02 10:25:45 +02:00
Weblate
64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty
b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility 
Fix some issues with timeline cache invalidation and visibility.
 2021-07-02 09:40:37 +02:00
Benoit Marty
d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
Benoit Marty
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild 
Fix / dm flattenParents always growing
 2021-07-02 09:35:51 +02:00
lvre
1906fbdeaa Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-02 01:04:01 +00:00
dependabot[bot]
9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-01 23:07:36 +00:00
Valere
adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty
ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Benoit Marty
47ef0d90fc Open upgraded room when upgrading from the room profile 2021-07-01 14:31:27 +02:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00