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

8491 Commits

Author SHA1 Message Date
Damir Jelić 324cdc4db1 Merge remote-tracking branch 'upstream/develop' into rust 2021-04-20 14:44:02 +02:00
Damir Jelić 326641a7e5 crypto: Document the requestRoomKey method 2021-04-20 14:40:58 +02:00
Damir Jelić 711e607fca crypto: Improve the docs a bit 2021-04-20 14:34:54 +02:00
Damir Jelić 389273d56a crypto: Rename the share_group_session method 2021-04-20 14:34:32 +02:00
Damir Jelić 09c0ca10e5 crypto: Enable the sending of outgoing to-device requests 2021-04-20 14:33:43 +02:00
Damir Jelić ed902fc42a crypto: Improve the startup log line 2021-04-20 14:33:01 +02:00
Damir Jelić c5173dde71 crypto: Update the rust-sdk branch we're using 2021-04-20 14:32:43 +02:00
Damir Jelić 8bfb7a6e0c crypto: Connect the room key requesting to the rust side 2021-04-20 13:29:52 +02:00
Damir Jelić 0db07011b1 crypto: Return our own device from the store as well 
The Kotlin side doesn't differentiate between our own device and other
devices of our own user while the Rust side does, create and return our
own device when it's requested from the store using trusted data.
 2021-04-19 19:25:56 +02:00
Damir Jelić 91d28658fc crypto: Correctly decode the byte array when importing keys 2021-04-19 18:04:11 +02:00
Benoit Marty 19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
Benoit Marty 9fc00fe6ff App crashes on "troubleshoot notifications" button (#3187) 2021-04-16 14:33:00 +02:00
Benoit Marty c08868bc3c Protect call to suspend fun 2021-04-16 13:22:16 +02:00
Benoit Marty 18cef243a1 Merge branch 'hotfix/1.1.4_fixes' 2021-04-15 11:10:24 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
Benoit Marty e4375522ff Fix crash when playing video (#3179) 2021-04-14 22:35:30 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
Benoit Marty 3034d1d831
Merge pull request #3176 from vector-im/feature/bma/login_fixes 
Small fixes on the current sign in sign up flow
 2021-04-14 20:13:12 +02:00
Benoit Marty 057295c155 Cleanup 2021-04-14 20:12:57 +02:00
Benoit Marty e612a7e51d
Merge pull request #3170 from vector-im/feature/ons/fix_send_state_ui 
Fix send state image color on dark theme
 2021-04-14 13:59:58 +02:00
Benoit Marty 877e0ca5c6 compact code 2021-04-14 12:48:33 +02:00
Damir Jelić 0afdcb35f1 crypto: Clean up some log lines 2021-04-14 12:46:29 +02:00
Benoit Marty 89c2662e09 Fix social login button rendering on old OS 2021-04-14 12:44:48 +02:00
Benoit Marty 699b1429b7 Simplify `LoginFlowResult` model 2021-04-14 12:42:47 +02:00
Damir Jelić 2805772d0a crypto: Notify the rest of the code about received room keys 2021-04-14 12:16:46 +02:00
Damir Jelić 3ba29b4ea9 crypto: Prepare outgoing to-device requests to be sent out 2021-04-14 12:16:09 +02:00
Damir Jelić 5b761ef7d1 crypto: Document the rust Device struct 2021-04-14 12:15:47 +02:00
Damir Jelić aebfef8fa9 crypto: Remove a unused method 2021-04-14 12:15:30 +02:00
Damir Jelić 7d67c79d29 crypto: Use the key import progress listener on the rust side 2021-04-14 12:14:52 +02:00
Onuray Sahin ce7e00a499 Fix send state image color on dark theme. 2021-04-13 11:48:12 +03:00
Damir Jelić 543a638e87 crypto: Forward some more errors from the rust side to the kotlin side 2021-04-12 15:03:28 +02:00
Damir Jelić 0d708bc35a rust: Update our deps 2021-04-12 15:02:47 +02:00
Benoit Marty 288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources 
Store description update
 2021-04-12 10:47:18 +02:00
Benoit Marty ef648ce7ec
Merge pull request #3152 from vector-im/gradlew-update-7.0 
Update Gradle Wrapper from 6.8.3 to 7.0
 2021-04-12 10:46:33 +02:00
Benoit Marty 5ca71a10ec Changelog 2021-04-12 10:46:03 +02:00
Benoit Marty d2c74f6fcd
Merge pull request #3104 from Dominaezzz/suspend_functions_1 
Convert RoomService to suspend functions
 2021-04-11 21:13:15 +02:00
Benoit Marty 984342a6dd Upgrade com.likethesalad.android:string-reference to 1.2.2 
Compatible with gradle7, see https://github.com/LikeTheSalad/android-string-reference/issues/11
 2021-04-11 21:07:08 +02:00
Dominic Fischer 35667db29c
Lint 2021-04-11 11:35:28 +01:00
Dominic Fischer 759528f19a Missed another spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-11 10:54:17 +01:00
Dominic Fischer 7ee87a0d4b Merge branch 'develop' into suspend_functions_1 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-04-10 16:50:30 +01:00
Dominic Fischer 66db67e857 Missed a spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-10 16:43:16 +01:00
Benoit Marty a9ef58912f http -> https 
Fix the followinf error, since gradle 7: `Using insecure protocols with repositories, without explicit opt-in, is unsupported. Switch Maven repository 'maven2(http://dl.bintray.com/piasy/maven)' to redirect to a secure protocol (like HTTPS) or allow insecure protocols. See https://docs.gradle.org/7.0/dsl/org.gradle.api.artifacts.repositories.UrlArtifactRepository.html#org.gradle.api.artifacts.repositories.UrlArtifactRepository:allowInsecureProtocol for more details.`
 2021-04-10 08:45:27 +02:00
gradle-update-robot e404589544 Update Gradle Wrapper from 6.8.3 to 7.0. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-04-10 01:06:51 +00:00
Benoit Marty a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Damir Jelić e9e3d129ba crypto: Send out some of our requests in parallel 2021-04-09 19:10:25 +02:00
Benoit Marty 38b49916e2 Small cleanup 2021-04-09 17:05:09 +02:00
Benoit Marty 37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty 6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00