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

6360 Commits

Author SHA1 Message Date
Dominic Fischer 60ce351a27 Convert RoomPushRuleService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-13 00:10:53 +00:00
Benoit Marty 413a55623e Handle events of type "m.room.server_acl" (#890) 2020-11-13 00:39:16 +01:00
Benoit Marty 812b1f7baa
Merge pull request #2364 from Dominaezzz/fix_draft_sharesheet 
Fix draft share sheet
 2020-11-11 13:08:45 +01:00
Michael Telatynski bbbaa60ddd
Merge branch 'develop' into fix_draft_sharesheet 2020-11-10 11:34:29 +00:00
Benoit Marty dc17e5c3fa Update CHANGES.md after merge of #2354 2020-11-10 10:39:34 +01:00
Benoit Marty 0150d3961b
Merge pull request #2354 from Dominaezzz/suspend_functions 
Convert `AccountService` to suspend functions
 2020-11-10 10:36:44 +01:00
Benoit Marty ae3e1f3a9f
Merge pull request #2368 from vector-im/feature/bma/fix_discard 
Feature/bma/fix discard
 2020-11-10 09:11:55 +01:00
Benoit Marty 13ddc28d05 Fix issue with callback.onSuccess() called multiple times 2020-11-09 23:07:53 +01:00
Benoit Marty cedeea13e6 Fix discard change dialog displayed by mistake when avatar has been updated 2020-11-09 23:00:19 +01:00
Dominic Fischer be3bc175bf Update CHANGES.md 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-09 18:23:45 +00:00
Dominic Fischer 6207aab19d Remove cancellation handling 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-09 17:20:23 +00:00
Dominic Fischer dee6f35888 Fix draft bug 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-08 14:57:15 +00:00
Dominic Fischer 62ca9a2a84 Fix misleading identifier 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-08 14:37:02 +00:00
Dominic Fischer 0da4ff7b02 Run ktlint 2020-11-06 19:20:23 +00:00
Dominic Fischer 983e02888c Remove incorrect comment 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 19:17:45 +00:00
Dominic Fischer 35768ff7e8 Convert `AccountService` to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 16:49:51 +00:00
Benoit Marty 0753ba3495
Merge pull request #2342 from vector-im/feature/ons/open_existing_dm 
Navigate to an existing DM instead of creating a new one.
 2020-11-06 11:29:20 +01:00
Benoit Marty 12d8bd1743 Cleanup after rebase - avoid computing twice the existing roomId 2020-11-05 17:34:10 +01:00
Onuray Sahin 458b4259fe Change menu action title for existing rooms. 2020-11-05 17:02:13 +01:00
Onuray Sahin e7714da8e8 Navigate to an existing DM instead of creating a new one. 2020-11-05 17:02:13 +01:00
Benoit Marty b4f9d40767
Merge pull request #2344 from vector-im/feature/bma/sync_h 
Small fixes
 2020-11-05 16:58:46 +01:00
Benoit Marty a0e074043b
Merge pull request #2339 from vector-im/feature/realm_10 
Realm 10: upgrade lib
 2020-11-05 16:57:24 +01:00
Benoit Marty 9068168378
Merge branch 'develop' into feature/realm_10 2020-11-05 16:14:19 +01:00
Benoit Marty de39a17247 Fix issue on setting avatar on a room. 
We deleted the just added avatar because `withState {}` is asynchronous
 2020-11-05 16:09:04 +01:00
Benoit Marty 5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
Benoit Marty c9e0aff839 DRY 2020-11-05 15:42:44 +01:00
Benoit Marty 61ed436c44 Move some method to the companion 2020-11-05 15:41:52 +01:00
Benoit Marty b7a1f96294 Append to file but before the extension 2020-11-05 15:40:12 +01:00
Benoit Marty 15ad351579 Some fixes from Valere about verification 2020-11-05 15:33:28 +01:00
Benoit Marty 6cb4645514 Add a key to the category, to be able to hide it 2020-11-05 15:28:13 +01:00
Benoit Marty 45edf6025e SAS Strings for Italian 2020-11-04 16:01:33 +01:00
Benoit Marty 17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
Benoit Marty 9ebda42d34 Merge branch 'release/1.0.10' into develop 2020-11-04 15:58:44 +01:00
Benoit Marty 619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Benoit Marty 49beae431f
Merge pull request #2343 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-11-04 15:14:28 +01:00
Weblate f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
LinAGKar b879be2b02 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-11-04 13:43:37 +00:00
Hivaa 52e699e125 Translated using Weblate (Persian) 
Currently translated at 98.4% (1899 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-04 13:43:36 +00:00
Benoit Marty 8a86b2c940
Merge pull request #2341 from vector-im/feature/bma/multi_home 
Two elements in the task switcher (#2299)
 2020-11-04 14:34:33 +01:00
Benoit Marty b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
Benoit Marty 6cd50cfaf1
Merge pull request #2336 from vector-im/feature/ons/fix_markdown_formatter 
Markdown body should be pure text, see #739, #1506.
 2020-11-04 13:50:46 +01:00
Onuray Sahin 9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
ganfra 9f3f5d8053 Realm 10: upgrade lib and make it works on our current code. 2020-11-03 16:53:30 +01:00
Onuray Sahin f24b593349 Update MarkdownParserTest. 2020-11-03 15:56:51 +03:00
Benoit Marty 0db1095373
Merge pull request #2334 from vector-im/feature/bca/crypto_db_clean 
Feature/bca/crypto db clean
 2020-11-03 10:31:53 +01:00
Benoit Marty 997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
Benoit Marty a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00