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

2324 Commits

Author SHA1 Message Date
SpiritCroc 43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
 2020-09-27 13:55:40 +02:00
Benoit Marty 8edecf5937 Allow using an outdated homeserver, at user's risk (#1972) 
Just warn the user using a non blocking popup
 2020-09-23 16:25:01 +02:00
Benoit Marty 91fe308113 Import SAS strings 2020-09-22 15:39:56 +02:00
Benoit Marty 78a76a8038 Remove `↵` from string resource 2020-09-22 15:38:37 +02:00
Weblate d6ba653c21 Merge branch 'origin/develop' into Weblate. 2020-09-22 12:55:48 +00:00
Benoit Marty d868ef0168 Create parent class for all MatrixWorker 2020-09-22 12:06:01 +02:00
SpiritCroc 4ed7529179 Hide redactions by default again 
Change-Id: I7b50a2c9aadb55f19f9b7fe49fa6cc3ac169231f
 2020-09-22 10:12:36 +02:00
SpiritCroc 2fa4518600 Revert "Revert "Setting for unread badge / room summary event visibility"" 
This reverts commit 1ff602db3b.

Change-Id: I161a6dcbbee2b2dc517912f6fb1f6b2ec772df0b

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
 2020-09-22 10:05:36 +02:00
SpiritCroc 9425640277 Revert "Avoid db upgrade: add back deprecated fields concerning unread kind" 
This reverts commit 2812dc0a3e.
 2020-09-22 09:55:52 +02:00
Benoit Marty 4d9bd57336 Fix compilation issue after merge 2020-09-21 21:20:06 +02:00
Benoit Marty 30ab6d5ee7
Merge pull request #2147 from vector-im/feature/quick_fix 
Safe call to awaitCallback
 2020-09-21 21:18:36 +02:00
ganfra 4d558c5f95
Merge branch 'develop' into feature/fix_filtering_redacted 2020-09-21 20:25:49 +02:00
ganfra a29ca2ae09 Clean after Benoit's review 2020-09-21 20:25:16 +02:00
Benoit Marty d1fed08764 Rename `tryThis` to `tryOrNull` 2020-09-21 18:26:35 +02:00
Marinus Enzinger 822c47d15f Fix widget creation permission check 
Signed-off-by: Marinus Enzinger <marinus@enzingerm.de>
 2020-09-21 17:35:44 +02:00
ganfra 8279191339 Fix filtering of redacted events 2020-09-21 14:57:58 +02:00
ganfra 4d7b0e3e68 Merge branch 'develop' into feature/fix_sending_too_long 2020-09-21 10:17:52 +02:00
Benoit Marty 69a4312613
Merge branch 'develop' into feature/fix_regression_verif_dm 2020-09-21 09:52:58 +02:00
LinAGKar 8d2c0dcb48 Translated using Weblate (Swedish) 
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/sv/
 2020-09-21 05:43:08 +00:00
ganfra d4682e504c Clean after Benoit's review 2020-09-18 18:34:40 +02:00
ganfra 2717cca267 Room sending: fix again loss of number type 2020-09-18 18:33:49 +02:00
Valere 28d37f0106 Fix / Verification in DM not working 
CheckNumberType crashing on timestamp number
 2020-09-18 18:03:09 +02:00
Benoit Marty 30b51449ce Manual import of Megolm keys does back up the imported keys 2020-09-18 15:28:06 +02:00
ganfra 72f8c8ef72 Clean and update CHANGES 2020-09-18 12:25:29 +02:00
ganfra b227dc3e5c Sending: remove events from Worker params by fetching in db instead 2020-09-17 18:37:33 +02:00
ganfra 144d0e56cc Realm transaction, use semaphore as suggested by Dominaezzz 2020-09-17 18:31:47 +02:00
SpiritCroc 2812dc0a3e Avoid db upgrade: add back deprecated fields concerning unread kind 
Change-Id: I5fb946b58e581098f1f52c9730cc43435ff926a8
 2020-09-17 12:47:28 +02:00
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