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

1792 Commits

Author SHA1 Message Date
Benoit Marty 870c4bf765 Check that content is not null 2020-06-03 09:32:20 +02:00
Benoit Marty 9a592e9c7e Create IsUselessResolver object 2020-06-03 01:13:02 +02:00
Benoit Marty 3f1e5b9b1e Hide "X made no changes" event by default in timeline (#1430) 2020-06-02 15:54:01 +02:00
Benoit Marty ca855da8ae Fix issue reported during review by Onuray 2020-06-02 13:15:03 +02:00
Benoit Marty 3bd2b24b10 Use "you" instead of display name when the current user has sent the event. 2020-06-02 13:15:03 +02:00
Benoit Marty 81c1717384 Format strings 2020-05-27 18:49:34 +02:00
Benoit Marty 0fd0500d30
Merge pull request #1414 from RiotTranslateBot/weblate-riot-android-riotx-application 
Update from Weblate
 2020-05-27 17:50:06 +02:00
Weblate e39b177b5b Merge branch 'origin/develop' into Weblate. 2020-05-27 13:04:35 +00:00
yuuki-san c94856cdf8 Translated using Weblate (Slovak) 
Currently translated at 95.7% (156 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/sk/
 2020-05-27 13:04:26 +00:00
Benoit Marty 6f804cab4d Avoid duplicated events in DB (one with localId and one with eventId from homeserver, once synced) 2020-05-27 11:27:54 +02:00
Benoit Marty cf3dbb378e Get uploaded files for e2e rooms, from local DB 2020-05-26 22:06:51 +02:00
Benoit Marty 0509e76f18 var -> val 2020-05-25 23:54:53 +02:00
Benoit Marty e379ccf086 Extract MatrixConfiguration to its own file, for a better visibility 2020-05-25 23:53:36 +02:00
Benoit Marty 7ae52d676d Use directly java.net.proxy class 2020-05-25 23:50:10 +02:00
Benoit Marty 3d33018ffa
Merge pull request #1147 from unclejay80/http_proxy_init 
added network proxy configuration
 2020-05-25 23:43:11 +02:00
Benoit Marty 860595520b
Merge pull request #1401 from vector-im/feature/cleanup 
Small PR with code cleanup
 2020-05-25 17:30:31 +02:00
Benoit Marty f0f3e8ddb9 Uploads: auto-review 2020-05-25 17:05:17 +02:00
Benoit Marty 2adafbeb03 Uploads: use SenderInfo in TimelineEvent 2020-05-25 17:02:57 +02:00
Benoit Marty f3a5fb7fe3 Uploads: rework: provide information about the sender 2020-05-25 16:54:08 +02:00
Benoit Marty 88cba74cac Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
Benoit Marty e9ca876444 Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
Benoit Marty 8a9498bae4 Uploads: add the service and the task 2020-05-25 16:54:08 +02:00
Weblate d2598480c8 var -> val 2020-05-25 16:54:08 +02:00
Benoit Marty 6e57b06673 Ensure Filter model match the spec and add Javadoc 2020-05-25 16:54:08 +02:00
Benoit Marty e117fec74f Kotlin: use orEmpty() for Maps 2020-05-25 14:07:25 +02:00
Benoit Marty 6e01b75b2f Dagger: use generic name for parameters 2020-05-25 14:04:36 +02:00
Benoit Marty 691e7fe616 Kotlin: use orEmpty() 2020-05-25 14:04:36 +02:00
MamasLT e31693b4b7 Translated using Weblate (Lithuanian) 
Currently translated at 2.5% (4 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/lt/
 2020-05-25 00:29:10 +00:00
MamasLT 45e5fff622 Added translation using Weblate (Lithuanian) 2020-05-23 23:44:45 +00:00
Osoitz 5267ba240a Translated using Weblate (Basque) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/eu/
 2020-05-23 14:29:00 +00:00
Benoit Marty 330a33a0e8 Render formatted_body for m.notice and m.emote (Fixes #1196) 2020-05-21 01:47:17 +02:00
Benoit Marty b75b299847 Create MessageContentWithFormattedBody interface 2020-05-21 01:05:47 +02:00
Benoit Marty 7c59bcc928 Only "org.matrix.custom.html" is supported 2020-05-21 00:41:36 +02:00
Benoit Marty 628439aa65 Mardown: sending "**text in bold** was sending extra paragraph and extra new line 2020-05-21 00:25:59 +02:00
Benoit Marty ca37895619
Merge pull request #1374 from vector-im/feature/sas_v2 
support new key agreement method for SAS
 2020-05-20 18:32:01 +02:00
Kim Brose 91d396fbca Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Riot Android/RiotX Matrix SDK
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-matrix-sdk/de/
 2020-05-20 15:29:32 +00:00
ganfra e1c6542e03
Merge branch 'develop' into feature/forward_pagination 2020-05-19 15:25:33 +02:00
ganfra 01484978bd Fix lint 2020-05-19 15:24:36 +02:00
ganfra cad14c93d0 Timeline: fix tests and add message order check 2020-05-19 14:39:42 +02:00
Valere f2fa57224b Update matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt 
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
 2020-05-19 09:55:45 +02:00
Valere e0977dd97b Add new key agreement protocol 2020-05-19 09:55:45 +02:00
Benoit Marty 243b0a7d82 ktlint 2020-05-18 17:23:33 +02:00
Benoit Marty e67e472025 Integrate Valere's remarks - step 2: Stop using (or at least reduce usage of) GlobalScope 2020-05-18 17:23:33 +02:00
Benoit Marty a6541481bf Integrate Valere's remarks - step 1 2020-05-18 17:23:33 +02:00
Benoit Marty 789bcc8d77 Identity: Bugfix: do not fail when trying to disconnect the current identity server, if there is no token available 2020-05-18 17:23:33 +02:00
Benoit Marty 2914117a8e Move some classes 2020-05-18 17:23:33 +02:00
Benoit Marty 8049962a99 Create a Wellknown module, because both AuthModule and HomeServerCapability module need it 2020-05-18 17:23:33 +02:00
Benoit Marty 225b1c380e Identity: retrieve the default identity server url 2020-05-18 17:23:33 +02:00
Benoit Marty 60d80ea0ba Fix compilation issue after rebase 2020-05-18 17:23:33 +02:00
Benoit Marty c8211098f3 Identity: The store has to be migrated properly because it contains user's data 2020-05-18 17:23:33 +02:00