Commit Graph

2367 Commits

Author SHA1 Message Date
Benoit Marty 11fb2bcdfa ktlint... 2020-09-09 13:34:57 +02:00
Benoit Marty 8cb7260375 Small changes (PR review) 2020-09-09 12:10:46 +02:00
ganfra 979c0832cf Use realmSessionProvider in localEchoRepository 2020-09-09 11:52:05 +02:00
ganfra f1d902b9ad Enable strict mode and remove some stuff from the main thread 2020-09-09 11:45:47 +02:00
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
Benoit Marty 8aada10f0d Show M_WEAK_PASSWORD error in the password field 2020-09-03 15:21:21 +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
Benoit Marty ddb858380e Code quality 2020-08-31 21:46:55 +02:00
Benoit Marty bf5c1e9d8f Add phone numbers to account 2020-08-31 20:53:37 +02:00
Benoit Marty 931eeac548 Add MSISDN (WIP) 2020-08-31 18:07:25 +02:00
Benoit Marty 9c05efa15d Fix migration issue. Also do not delete Realm file in case of migration issue when debugging. 2020-08-31 16:46:56 +02:00
Benoit Marty bd12c89a3c Move the DB version number to the Migration class, I think it has more sense. Also increase the value. 2020-08-31 16:29:34 +02:00
Valere bf4f869524 rebase fix 2020-08-31 16:25:40 +02:00
Valere dd09c4a72d post rebase fix 2020-08-31 16:21:27 +02:00
Valere 4e7790966f Always use temp file before sending 2020-08-31 16:21:27 +02:00
Valere bfcbb9ff4f Rebase post matrix sdk package renaming 2020-08-31 16:21:27 +02:00
Valere a888e1e80e Support cancel sending and resend event with attachments
Avoid auto retry for medium and big files
2020-08-31 16:20:12 +02:00
Valere 11c8da3717 Improve upload/dl mem for big files + report ecryption progress 2020-08-31 16:20:12 +02:00
Benoit Marty e309b30203 Implement: Adding MSISDN (WIP) 2020-08-31 16:16:18 +02:00
Valere aedcf3006a Relax IS dicovery
fixes #2027
2020-08-31 12:08:37 +02:00
ziriSut 0ad637fa16 Translated using Weblate (Kabyle)
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/kab/
2020-08-30 07:42:56 +00:00
Benoit Marty 1af45ede62 Add some guard, and allow to cancel adding 3pid 2020-08-28 17:55:38 +02:00
Benoit Marty 175a5ab824 List phone numbers and emails added to the Matrix account, and add Email to account (#44) 2020-08-28 16:45:09 +02:00
Benoit Marty ee9c73fde1 Sonar: rename variables and parameter to follow naming convention 2020-08-28 08:58:57 +02:00
Marcelo Filho 22771a84f1 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2020-08-27 22:42:34 +00:00
Benoit Marty d3f50ee6c3 Fix a crash that would occur if it was not dead code 2020-08-27 22:46:30 +02:00
Benoit Marty ef4f930ba2 Don't pause the sync thread if there is an active or pending call.
But pause the sync thread when there is no active call and the app is the background.
Authors: Onuray, I just rebased and squashed all the commit
2020-08-27 18:20:06 +02:00
Benoit Marty 0f1e348ac4
Merge pull request #2010 from vector-im/feature/fix_send_room_v6
Feature/fix send room v6
2020-08-27 18:14:58 +02:00
Benoit Marty 67bde947f9
Merge pull request #2009 from vector-im/feature/joining_room
Feature/joining room
2020-08-27 18:11:42 +02:00
ganfra 28a1cf6982 Join room: clean up after benoit's remarks 2020-08-27 11:44:21 +02:00
ganfra 9c1c9f96e1 Room v6: finish cleaning up 2020-08-27 10:34:40 +02:00
Marcelo Filho 90e580245a Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2020-08-26 20:42:44 +00:00
ganfra dc4135b506 Remove unnecessary code now we have an other way to keep number types 2020-08-26 19:21:41 +02:00
ganfra cefdbe1d08 Add CheckNumberType in json to fix sending in room v6 2020-08-26 19:21:14 +02:00
Benoit Marty 013f51f0c4
Merge branch 'develop' into feature/mention_display_name 2020-08-26 17:35:16 +02:00
Benoit Marty 7ef08579ef
Merge branch 'develop' into feature/switch_language 2020-08-26 17:34:17 +02:00
ganfra b39a86edbd
Merge branch 'develop' into feature/joining_room 2020-08-26 17:06:31 +02:00
ganfra b986bfd509 Permalink: handle via parameters 2020-08-26 16:37:48 +02:00
Benoit Marty 6376ba2516 Improve wording (visible in debug screen) 2020-08-25 17:48:12 +02:00
Benoit Marty 5e0fc3e17f Rename class 2020-08-25 17:34:43 +02:00
Benoit Marty 1a068ee191 Add more tests 2020-08-25 17:34:02 +02:00
Benoit Marty 8226f60fad Refactor test to avoid duplicated code 2020-08-25 17:31:51 +02:00
Benoit Marty 2e618999d9 Words containing my name should not trigger notifications (Fixes #1781)
It adds a specific behavior for rule with id RuleIds.RULE_ID_CONTAIN_USER_NAME
2020-08-25 17:26:54 +02:00
Benoit Marty bf7a096a18 Refactor: Remove duplicated declaration for Actions 2020-08-25 17:01:55 +02:00
Benoit Marty 0d9885a1e0 Refactor: Remove duplicated declaration for RuleIds 2020-08-25 16:53:12 +02:00
Benoit Marty aca8fd7f3d Refactor: Kotlin style 2020-08-25 16:18:44 +02:00
Benoit Marty f5ea4fb6ac Refactor: Extract method to dedicated files 2020-08-25 16:15:42 +02:00
Benoit Marty 7b5c74f81c Refactor: Condition is now an interface 2020-08-25 16:14:14 +02:00
Benoit Marty 558e11a364 Refactor: move Kind to its own file 2020-08-25 16:01:34 +02:00
Weblate 3d5b3c65de Merge branch 'origin/develop' into Weblate. 2020-08-25 11:15:37 +00:00
ziriSut 51893fff09 Translated using Weblate (Kabyle)
Currently translated at 99.1% (233 of 235 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00
Kahina Messaoudi 25d8ba2699 Translated using Weblate (Kabyle)
Currently translated at 99.1% (233 of 235 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00