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

2312 Commits

Author SHA1 Message Date
SpiritCroc bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
Benoit Marty f98844db02 Privacy 2020-09-08 10:04:27 +02:00
Valere c895f87e26 Prevent reply to poll local echo (relation to echo not supported yet) 2020-09-08 09:51:35 +02:00
Valere eb5088c699 Fix / sending poll event appears forever 2020-09-08 09:32:37 +02:00
Benoit Marty de8e325193
Merge branch 'develop' into feature/image_compression 2020-09-07 15:21:15 +02:00
Benoit Marty c42920d9aa Emoji SAS: Step 3: Make the code compile (#1909) 2020-09-07 14:28:43 +02:00
Benoit Marty fb5c1bb163 Emoji SAS: Step 2: Run import_sas_strings.py (#1909) 2020-09-07 14:21:10 +02:00
Benoit Marty 4f695a6d8f Emoji SAS: Step 1: Remove legacy strings (#1909) 2020-09-07 14:19:55 +02:00
Benoit Marty bc389d371d Move string def to app module instead of SDK (#1994) 2020-09-07 13:38:12 +02:00
Benoit Marty 74e2ffc4c4 Format string files 2020-09-07 13:24:33 +02:00
Weblate edf7761d49 Merge branch 'origin/develop' into Weblate. 2020-09-07 08:57:45 +00:00
LinAGKar a590bc96cd Translated using Weblate (Swedish) 
Currently translated at 100.0% (235 of 235 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sv/
 2020-09-07 08:57:34 +00:00
LinAGKar 58f5baa5f6 Added translation using Weblate (Swedish) 2020-09-06 06:49:13 +00:00
SpiritCroc 2995375586 Hide redactions from the overview except for "show all events" setting 
Change-Id: Ia2745f3d89277514b7137d1a1604b1cb031c321d
 2020-09-05 17:22:09 +02:00
Benoit Marty 89fa2ece43 Fix compilation issue (I'm tired) 2020-09-04 15:46:16 +02:00
Benoit Marty 0bd7e40a22 Rework: split long method, extract thumbnail management 2020-09-04 12:33:10 +02:00
Benoit Marty ad984b26fb Move variable declaration 2020-09-04 12:22:38 +02:00
Benoit Marty 3a659a9f3b Ensure temporary files are deleted even in case of Exception 2020-09-04 12:03:20 +02:00
Benoit Marty 0217e79324 Ensure input stream is closed 2020-09-04 11:08:44 +02:00
Benoit Marty 544bff9f4f For only with Files now 2020-09-04 11:07:06 +02:00
Benoit Marty b31178683c typo 2020-09-04 09:37:49 +02:00
Benoit Marty 38631eb70e Format 2020-09-04 09:37:10 +02:00
Benoit Marty 6246fd98c3 Cleanup 2020-09-04 09:36:18 +02:00
Benoit Marty 71aa315f2a Cleanup 2020-09-04 09:36:18 +02:00
Benoit Marty af6a94d08e Support for image compression on Android 10 2020-09-04 09:36:18 +02:00
Valere e0c5377968
Merge branch 'develop' into feature/enhance_big_files 2020-09-03 17:09:40 +02:00
Valere 7c638798c7 Code review 2020-09-03 14:53:13 +02:00
Benoit Marty 05ec5bde93
Merge pull request #2020 from vector-im/feature/add_email 
Add email and phone numbers
 2020-09-03 14:33:09 +02:00
Valere 8340d5e71f Fix tests 2020-09-03 09:38:40 +02:00
Benoit Marty be3157b6f5 Do not strip new lines. Many tests are not passing, we should work more on it... 2020-09-03 09:24:44 +02:00
Benoit Marty ae9afcc393 Add test to cover line break 2020-09-03 09:16:37 +02:00
Benoit Marty e73480c0ef Riot -> Element 2020-09-03 09:06:12 +02:00
Benoit Marty 8c801ae078 API change: encrypted files are now decrypted internally, no need to expose decryptStream() anymore 2020-09-02 19:01:26 +02:00
Valere 40f7dc4824 Merge remote-tracking branch 'origin/feature/enhance_big_files' into feature/enhance_big_files 2020-09-02 16:42:54 +02:00
Valere 3b8c61a87e FIx / interceptors and stream closed 2020-09-02 16:06:48 +02:00
Benoit Marty 93cb6bd26e Avoid null type 2020-09-02 12:37:06 +02:00
Benoit Marty 7c33bf2742 Remove Done TODO 2020-09-02 12:31:22 +02:00
Benoit Marty e5e67fbcbb Internal class and Copyright 2020-09-02 12:29:53 +02:00
Benoit Marty 95219c7934 typo 2020-09-02 12:29:39 +02:00
Benoit Marty 53744982f0 Update Javadoc 2020-09-02 12:29:18 +02:00
Benoit Marty 6d24aa75d0 Format file (no other change) 2020-09-02 12:25:50 +02:00
Benoit Marty 76c79f9f75 Move Base64 methods to a dedicated file 2020-09-02 12:06:21 +02:00
Benoit Marty 28081aa7d2 Cleanup: rename parameters, make some fields private, add Javadoc, fix copy paste error 2020-09-02 12:03:03 +02:00
Benoit Marty d0532bb9a9 Revert some change from #2002 2020-09-02 09:06:34 +02:00
Benoit Marty 9389cfe7a3 Add comment for history 2020-09-02 09:04:16 +02:00
Benoit Marty 484fd61706 Make MarkdownParserTest tests pass again 2020-09-02 09:04:16 +02:00
Benoit Marty 6c943571fc Remove useless TextContentRenderer 2020-09-01 22:22:27 +02:00
Leon Schmidt 29123ac726
Bugfix/markdown parsing (#2002) 
Removed replacing of newlines in already parsed HTML documents

Signed-off-by: Leon Schmidt <mail@leon.wtf>

Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2020-09-01 22:02:16 +02:00
Benoit Marty bdde638967
Merge pull request #2028 from vector-im/feature/relax_is_discovery 
Relax IS dicovery
 2020-09-01 15:39:28 +02:00
Benoit Marty c6bd6c17fc Auto review 2020-09-01 14:55:12 +02:00