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

2340 Commits

Author SHA1 Message Date
SpiritCroc 2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
SpiritCroc f217ece630 Revert "Exclude state-events from room summaries and unread indicators" 
This reverts commit 72d2b1c9f1.

Change-Id: I412f846cd82d953fa25d761ca5804b5a216e2dff
 2020-09-17 11:53:56 +02:00
SpiritCroc 1ff602db3b Revert "Setting for unread badge / room summary event visibility" 
This reverts commit b1d96ebba9.

Change-Id: I567628cbf4bbdc059d3c73991bf3053f702730af

Conflicts:
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values/strings_sc.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-09-17 11:51:44 +02:00
SpiritCroc 9a61361e3e Revert "Hide redactions from the overview except for "show all events" setting" 
This reverts commit 2995375586.
 2020-09-17 11:47:43 +02:00
Benoit Marty 43f34f6330 Fix issue on test compilation 2020-09-16 20:40:05 +02:00
Benoit Marty 762fd02eb7 Format strings.xml 2020-09-16 19:35:27 +02:00
Benoit Marty 825592e443
Merge pull request #2118 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-09-16 19:28:17 +02:00
Benoit Marty 4c6234796d
Merge pull request #2111 from vector-im/feature/bma_raw_service 
Raw service
 2020-09-16 17:55:42 +02:00
Weblate d6dd2a02b5 Merge branch 'origin/develop' into Weblate. 2020-09-16 15:55:23 +00:00
Benoit Marty b97aed0723 Ganfra's review 2020-09-16 17:00:14 +02:00
Benoit Marty 1614707943 Ganfra's review 2020-09-16 16:58:27 +02:00
Benoit Marty 82bf0dcae9 Create a RawService SDK side, to avoid that the SDK manage client needs 2020-09-16 16:17:10 +02:00
ganfra a7ae66e0de Clean files and update CHANGES 2020-09-16 15:48:09 +02:00
ganfra abb9a0839a Room summary : change displayable events types 2020-09-15 18:13:09 +02:00
Valere 5e39d3c6fb output stream not closed 2020-09-15 10:03:49 +02:00
discapacidad5 dd4391941e Translated using Weblate (Spanish) 
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/es/
 2020-09-14 23:43:30 +00:00
Safa Alfulaij b088c23ea2 Translated using Weblate (Arabic) 
Currently translated at 66.1% (111 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/ar/
 2020-09-14 23:42:59 +00:00
Benoit Marty 61b91f4015
Merge pull request #2080 from vector-im/feature/polling_work 
Feature/polling work
 2020-09-11 15:39:49 +02:00
yuuki-san 2148411307 Translated using Weblate (Slovak) 
Currently translated at 97.6% (164 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sk/
 2020-09-11 11:43:03 +00:00
Benoit Marty 7efc58cb42 Avoid duplication of code and fix issue on OnApplicationUpgradeOrRebootReceiver: background starts even if notification are disabled 2020-09-11 11:13:30 +02:00
Benoit Marty 6f1875c13a
Merge pull request #2089 from vector-im/feature/dendrite_test 
Show M_WEAK_PASSWORD error in the password field
 2020-09-10 18:10:45 +02:00
Valere 3ff475af7a Avoid scheduling alarm until network is back 2020-09-10 17:10:47 +02:00
Valere 971b425e17 F-Droid background sync modes 2020-09-10 17:10:47 +02:00
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