filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.5'

Browse Source
This commit is contained in:
Benoit Marty 2020-08-21 17:02:49 +02:00
commit 19f9c94d60
2483 changed files with 24958 additions and 16275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,34 @@
---
name: Bug report
about: Create a report to help us improve Element
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Smartphone (please complete the following information):**
- Device: [e.g. Samsung S6]
- OS: [e.g. Android 6.0]
**Additional context**
- App version and store [e.g. 1.0.0 - F-Droid]
- Homeserver: [e.g. matrix.org]
Add any other context about the problem here.

20
.github/ISSUE_TEMPLATE/feature_request.md vendored Normal file
View File

@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: type:suggestion
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

4
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -2,9 +2,9 @@
<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riotX-android/blob/develop/CONTRIBUTING.md) before submitting your pull request --> <!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riotX-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
- [ ] Changes has been tested on an Android device or Android emulator with API 16 - [ ] Changes has been tested on an Android device or Android emulator with API 21
- [ ] UI change has been tested on both light and dark themes - [ ] UI change has been tested on both light and dark themes
- [ ] Pull request is based on the develop branch - [ ] Pull request is based on the develop branch
- [ ] Pull request updates [CHANGES.md](https://github.com/vector-im/riotX-android/blob/develop/CHANGES.md) - [ ] Pull request updates [CHANGES.md](https://github.com/vector-im/element-android/blob/develop/CHANGES.md)
- [ ] Pull request includes screenshots or videos if containing UI changes - [ ] Pull request includes screenshots or videos if containing UI changes
- [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off) - [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off)

10
.github/workflows/gradle-wrapper-validation.yml vendored Normal file
View File

@ -0,0 +1,10 @@
name: "Validate Gradle Wrapper"
on: [push, pull_request]
jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1

11
.idea/codeStyles/Project.xml generated
View File

@ -4,7 +4,16 @@
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS"> <option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value> <value>
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" /> <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value> </value>
</option> </option>
<option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" /> <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />

1
.idea/dictionaries/bmarty.xml generated
View File

@ -14,6 +14,7 @@
<w>gplay</w> <w>gplay</w>
<w>hmac</w> <w>hmac</w>
<w>homeserver</w> <w>homeserver</w>
<w>jitsi</w>
<w>ktlint</w> <w>ktlint</w>
<w>linkified</w> <w>linkified</w>
<w>linkify</w> <w>linkify</w>

49
CHANGES.md
View File

@ -1,3 +1,52 @@
Changes in Element 1.0.5 (2020-08-21)
===================================================
Features ✨:
- Protect access to the app by a pin code (#1700)
- Conference with Jitsi support (#43)
Improvements 🙌:
- Share button in rooms gives room ID link without via parameters (#1927)
- Give user the possibility to prevent accidental call (#1869)
- Display device information (name, id and key) in Cryptography setting screen (#1784)
- Ensure users do not accidentally ignore other users (#1890)
- Better handling DM creation when invitees cannot be inviting due to denied federation
- Support new config.json format and config.domain.json files (#1682)
- Increase Font size on Calling screen (#1643)
- Make the user's Avatar live in the general settings
Bugfix 🐛:
- Fix incorrect date format for some Asian languages (#1928)
- Fix invisible toolbar (Status.im theme) (#1746)
- Fix relative date time formatting (#822)
- Fix crash reported by RageShake
- Fix refreshing of sessions list when another session is logged out
- Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver (#1960)
- Failed to build unique file (#1954)
- Highlighted Event when opening a permalink from another room (#1033)
- A Kick appears has "someone has made no change" (#1959)
- Avoid NetworkOnMainThreadException when setting a user avatar
- Renew turnserver credentials when ttl runs out
Translations 🗣:
- Add PlayStore description resources in the Triple-T format, to let Weblate handle them
SDK API changes ⚠️:
- Rename package `im.vector.matrix.android` to `org.matrix.android.sdk`
- Rename package `im.vector.matrix.rx` to `org.matrix.android.sdk.rx`
Build 🧱:
- Fix RtlHardcoded issues (use `Start` and `End` instead of `Left` and `Right` layout attributes)
Other changes:
- Use `Context#getSystemService` extension function provided by `core-ktx` (#1702)
- Hide Flair settings, this is not implemented yet.
- Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer`
- Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker`
- Rename package `im.vector.riotx` to `im.vector.app`
- Remove old code that was used on devices with api level <21
- Add Official Gradle Wrapper Validation Action
Changes in Element 1.0.4 (2020-08-03) Changes in Element 1.0.4 (2020-08-03)
=================================================== ===================================================

2
CONTRIBUTING.md
View File

@ -40,7 +40,7 @@ For now, the Matrix SDK and the Element application are in the same project. So
## I want to help translating Element ## I want to help translating Element
If you want to fix an issue with an English string, please submit a PR. If you want to fix an issue with an English string, please submit a PR.
If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/riot-android/). If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/element-android/).
## I want to submit a PR to fix an issue ## I want to submit a PR to fix an issue

2
README.md
View File

@ -1,5 +1,5 @@
[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop) [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
[![Weblate](https://translate.riot.im/widgets/riot-android/-/svg-badge.svg)](https://translate.riot.im/engage/riot-android/?utm_source=widget) [![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget)
[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org) [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx) [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx)

2
attachment-viewer/src/main/AndroidManifest.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="im.vector.riotx.attachmentviewer" /> <manifest package="im.vector.lib.attachmentviewer" />

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
sealed class AttachmentEvents { sealed class AttachmentEvents {
data class VideoEvent(val isPlaying: Boolean, val progress: Int, val duration: Int) : AttachmentEvents() data class VideoEvent(val isPlaying: Boolean, val progress: Int, val duration: Int) : AttachmentEvents()

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.content.Context import android.content.Context
import android.view.View import android.view.View

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.view.View import android.view.View
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.graphics.drawable.Animatable import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
sealed class SwipeDirection { sealed class SwipeDirection {
object NotDetected : SwipeDirection() object NotDetected : SwipeDirection()

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.content.Context import android.content.Context
import android.view.MotionEvent import android.view.MotionEvent

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.animation.Animator import android.animation.Animator
import android.animation.AnimatorListenerAdapter import android.animation.AnimatorListenerAdapter

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.widget.ImageView import android.widget.ImageView

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView

2
attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt → attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.attachmentviewer package im.vector.lib.attachmentviewer
import android.view.View import android.view.View
import android.widget.ProgressBar import android.widget.ProgressBar

8
build.gradle
View File

@ -41,6 +41,8 @@ allprojects {
includeGroupByRegex 'com\\.github\\.BillCarsonFr' includeGroupByRegex 'com\\.github\\.BillCarsonFr'
// PhotoView // PhotoView
includeGroupByRegex 'com\\.github\\.chrisbanes' includeGroupByRegex 'com\\.github\\.chrisbanes'
// PFLockScreen-Android
includeGroupByRegex 'com\\.github\\.vector-im'
} }
} }
maven { maven {
@ -50,6 +52,12 @@ allprojects {
} }
} }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
// Jitsi repo
maven {
url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
// Note: to test Jitsi release you can use a local file like this:
// url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-2.9.3"
}
google() google()
jcenter() jcenter()
} }

82
docs/jitsi.md Normal file
View File

@ -0,0 +1,82 @@
# Jitsi in Element Android
Native Jitsi support has been added to Element Android by the PR [#1914](https://github.com/vector-im/element-android/pull/1914). The description of the PR contains some documentation about the behaviour in each possible room configuration.
Also, ensure to have a look on [the documentation from Element Web](https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md)
The official documentation about how to integrate the Jitsi SDK in an Android app is available here: https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk.
# Native Jitsi SDK
The Jitsi SDK is built by ourselves with the flag LIBRE_BUILD, to be able to be integrated on the F-Droid version of Element Android.
The generated maven repository is then host in the project https://github.com/vector-im/jitsi_libre_maven
## How to build the Jitsi Meet SDK
### Jitsi version
Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`.
Currently we are building the version with the tag `android-sdk-2.9.3`.
### Run the build script
At the root of the Element Android, run the following script:
```shell script
./tools/jitsi/build_jisti_libs.sh
```
It will build the Jitsi Meet Android library and put every generated files in the folder `/tmp/jitsi`
### Link with the new generated library
- Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line:
```groovy
url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
```
You can uncomment and update the line starting with `// url "file://...` and comment the line starting with `url`, to test the library using the locally generated Maven repository.
- Update the dependency of the WebRTC library in the file `./matrix-sdk-android/build.gradle`. Currently we have this line:
```groovy
implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
```
- Update the dependency of the Jitsi Meet library in the file `./vector/build.gradle`. Currently we have this line:
```groovy
implementation('org.jitsi.react:jitsi-meet-sdk:2.9.3') { transitive = true }
```
- Perform a gradle sync and build the project
- Perform test
### Sanity tests
In order to validate that the upgrade of the Jitsi and WebRTC dependency does not break anything, the following sanity tests have to be performed, using two devices:
- Make 1-1 audio call (so using WebRTC)
- Make 1-1 video call (so using WebRTC)
- Create and join a conference call with audio only (so using Jitsi library). Leave the conference. Join it again.
- Create and join a conference call with audio and video (so using Jitsi library) Leave the conference. Join it again.
### Export the build library
If all the tests are passed, you can export the generated Jitsi library to our Maven repository.
- Clone the project https://github.com/vector-im/jitsi_libre_maven.
- Create a new folder with the version name.
- Copy every generated files form `/tmp/jitsi` to the folder you have just created.
- Commit and push the change on https://github.com/vector-im/jitsi_libre_maven.
- Update the file `./build.gradle` to use the previously created Maven repository. Currently we have this line:
```groovy
url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
```
- Build the project and perform the sanity tests again.
- Update the file `/CANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.

2
matrix-sdk-android-rx/src/main/AndroidManifest.xml
View File

@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.matrix.rx" /> package="org.matrix.android.sdk.rx" />

3
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.Observer import androidx.lifecycle.Observer

5
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
import im.vector.matrix.android.api.util.Optional import org.matrix.android.sdk.api.util.Optional
import io.reactivex.Observable import io.reactivex.Observable
fun <T : Any> Observable<Optional<T>>.unwrap(): Observable<T> { fun <T : Any> Observable<Optional<T>>.unwrap(): Observable<T> {

7
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxCallbackBuilders.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,10 +15,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
import im.vector.matrix.android.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCallback
import im.vector.matrix.android.api.util.Cancelable import org.matrix.android.sdk.api.util.Cancelable
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single

35
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,24 +15,24 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
import android.net.Uri import android.net.Uri
import im.vector.matrix.android.api.query.QueryStringValue import org.matrix.android.sdk.api.query.QueryStringValue
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.api.session.identity.ThreePid import org.matrix.android.sdk.api.session.identity.ThreePid
import im.vector.matrix.android.api.session.room.Room import org.matrix.android.sdk.api.session.room.Room
import im.vector.matrix.android.api.session.room.members.RoomMemberQueryParams import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
import im.vector.matrix.android.api.session.room.model.ReadReceipt import org.matrix.android.sdk.api.session.room.model.ReadReceipt
import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import im.vector.matrix.android.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.notification.RoomNotificationState import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
import im.vector.matrix.android.api.session.room.send.UserDraft import org.matrix.android.sdk.api.session.room.send.UserDraft
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.util.Optional import org.matrix.android.sdk.api.util.Optional
import im.vector.matrix.android.api.util.toOptional import org.matrix.android.sdk.api.util.toOptional
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Single import io.reactivex.Single

59
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,35 +15,35 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
import androidx.paging.PagedList import androidx.paging.PagedList
import im.vector.matrix.android.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
import im.vector.matrix.android.api.query.QueryStringValue import org.matrix.android.sdk.api.query.QueryStringValue
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
import im.vector.matrix.android.api.session.group.GroupSummaryQueryParams import org.matrix.android.sdk.api.session.group.GroupSummaryQueryParams
import im.vector.matrix.android.api.session.group.model.GroupSummary import org.matrix.android.sdk.api.session.group.model.GroupSummary
import im.vector.matrix.android.api.session.identity.ThreePid import org.matrix.android.sdk.api.session.identity.ThreePid
import im.vector.matrix.android.api.session.pushers.Pusher import org.matrix.android.sdk.api.session.pushers.Pusher
import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
import im.vector.matrix.android.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
import im.vector.matrix.android.api.session.sync.SyncState import org.matrix.android.sdk.api.session.sync.SyncState
import im.vector.matrix.android.api.session.user.model.User import org.matrix.android.sdk.api.session.user.model.User
import im.vector.matrix.android.api.session.widgets.model.Widget import org.matrix.android.sdk.api.session.widgets.model.Widget
import im.vector.matrix.android.api.util.JsonDict import org.matrix.android.sdk.api.util.JsonDict
import im.vector.matrix.android.api.util.Optional import org.matrix.android.sdk.api.util.Optional
import im.vector.matrix.android.api.util.toOptional import org.matrix.android.sdk.api.util.toOptional
import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.functions.Function3 import io.reactivex.functions.Function3
@ -70,7 +71,7 @@ class RxSession(private val session: Session) {
} }
} }
fun liveMyDeviceInfo(): Observable<List<DeviceInfo>> { fun liveMyDevicesInfo(): Observable<List<DeviceInfo>> {
return session.cryptoService().getLiveMyDevicesInfo().asObservable() return session.cryptoService().getLiveMyDevicesInfo().asObservable()
.startWithCallable { .startWithCallable {
session.cryptoService().getMyDevicesInfo() session.cryptoService().getMyDevicesInfo()

3
matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/SecretsSynchronisationInfo.kt → matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.rx package org.matrix.android.sdk.rx
data class SecretsSynchronisationInfo( data class SecretsSynchronisationInfo(
val isBackupSetup: Boolean, val isBackupSetup: Boolean,

15
matrix-sdk-android/build.gradle
View File

@ -132,8 +132,13 @@ dependencies {
implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.8.1"))
implementation 'com.squareup.okhttp3:okhttp'
implementation 'com.squareup.okhttp3:logging-interceptor'
implementation 'com.squareup.okhttp3:okhttp-urlconnection'
implementation "com.squareup.moshi:moshi-adapters:$moshi_version" implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
@ -174,8 +179,10 @@ dependencies {
implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.23' implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.23'
// Web RTC // Web RTC
// TODO meant for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/ // org.webrtc:google-webrtc is for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
implementation 'org.webrtc:google-webrtc:1.0.+' // implementation 'org.webrtc:google-webrtc:1.0.+'
// Use the same WebRTC library than the one used by Jitsi library
implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0' debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
releaseImplementation 'com.airbnb.okreplay:noop:1.5.0' releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'

1
matrix-sdk-android/lint.xml
View File

@ -29,5 +29,6 @@
<issue id="SetTextI18n" severity="error" /> <issue id="SetTextI18n" severity="error" />
<issue id="ViewConstructor" severity="error" /> <issue id="ViewConstructor" severity="error" />
<issue id="UseValueOf" severity="error" /> <issue id="UseValueOf" severity="error" />
<issue id="ObsoleteSdkInt" severity="error" />
</lint> </lint>

6
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android package org.matrix.android.sdk
import android.content.Context import android.content.Context
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import im.vector.matrix.android.test.shared.createTimberTestRule import org.matrix.android.sdk.test.shared.createTimberTestRule
import org.junit.Rule import org.junit.Rule
import java.io.File import java.io.File

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/LiveDataTestObserver.java → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android; package org.matrix.android.sdk;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/MainThreadExecutor.java → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android; package org.matrix.android.sdk;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android package org.matrix.android.sdk
import okreplay.OkReplayConfig import okreplay.OkReplayConfig
import okreplay.PermissionRule import okreplay.PermissionRule

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android package org.matrix.android.sdk
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import java.util.concurrent.Executors import java.util.concurrent.Executors

12
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/AccountCreationTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.account package org.matrix.android.sdk.account
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith

12
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/ChangePasswordTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.account package org.matrix.android.sdk.account
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.failure.isInvalidPassword import org.matrix.android.sdk.api.failure.isInvalidPassword
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import org.amshove.kluent.shouldBeTrue import org.amshove.kluent.shouldBeTrue
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test

20
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/DeactivateAccountTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.account package org.matrix.android.sdk.account
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.auth.data.LoginFlowResult import org.matrix.android.sdk.api.auth.data.LoginFlowResult
import im.vector.matrix.android.api.auth.registration.RegistrationResult import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import im.vector.matrix.android.api.failure.Failure import org.matrix.android.sdk.api.failure.Failure
import im.vector.matrix.android.api.failure.MatrixError import org.matrix.android.sdk.api.failure.MatrixError
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.common.TestMatrixCallback import org.matrix.android.sdk.common.TestMatrixCallback
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test

24
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/api/Matrix.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
View File

@ -14,21 +14,22 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api package org.matrix.android.sdk.api
import android.content.Context import android.content.Context
import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner
import androidx.work.Configuration import androidx.work.Configuration
import androidx.work.WorkManager import androidx.work.WorkManager
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.BuildConfig import org.matrix.android.sdk.BuildConfig
import im.vector.matrix.android.api.auth.AuthenticationService import org.matrix.android.sdk.api.auth.AuthenticationService
import im.vector.matrix.android.common.DaggerTestMatrixComponent import org.matrix.android.sdk.common.DaggerTestMatrixComponent
import im.vector.matrix.android.internal.SessionManager import org.matrix.android.sdk.api.legacy.LegacySessionImporter
import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.SessionManager
import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
import im.vector.matrix.android.internal.network.UserAgentHolder import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
import im.vector.matrix.android.internal.util.BackgroundDetectionObserver import org.matrix.android.sdk.internal.network.UserAgentHolder
import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
import org.matrix.olm.OlmManager import org.matrix.olm.OlmManager
import java.io.InputStream import java.io.InputStream
import java.util.concurrent.Executors import java.util.concurrent.Executors
@ -41,6 +42,7 @@ import javax.inject.Inject
*/ */
class Matrix private constructor(context: Context, matrixConfiguration: MatrixConfiguration) { class Matrix private constructor(context: Context, matrixConfiguration: MatrixConfiguration) {
@Inject internal lateinit var legacySessionImporter: LegacySessionImporter
@Inject internal lateinit var authenticationService: AuthenticationService @Inject internal lateinit var authenticationService: AuthenticationService
@Inject internal lateinit var userAgentHolder: UserAgentHolder @Inject internal lateinit var userAgentHolder: UserAgentHolder
@Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver @Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
@ -62,6 +64,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
return authenticationService return authenticationService
} }
fun legacySessionImporter(): LegacySessionImporter {
return legacySessionImporter
}
companion object { companion object {
private lateinit var instance: Matrix private lateinit var instance: Matrix

34
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
View File

@ -15,27 +15,27 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import im.vector.matrix.android.api.Matrix import org.matrix.android.sdk.api.Matrix
import im.vector.matrix.android.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCallback
import im.vector.matrix.android.api.MatrixConfiguration import org.matrix.android.sdk.api.MatrixConfiguration
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
import im.vector.matrix.android.api.auth.data.LoginFlowResult import org.matrix.android.sdk.api.auth.data.LoginFlowResult
import im.vector.matrix.android.api.auth.registration.RegistrationResult import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.Room import org.matrix.android.sdk.api.session.room.Room
import im.vector.matrix.android.api.session.room.model.message.MessageContent import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import im.vector.matrix.android.api.session.room.send.SendState import org.matrix.android.sdk.api.session.room.send.SendState
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.api.session.sync.SyncState import org.matrix.android.sdk.api.session.sync.SyncState
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestData.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
data class CryptoTestData(val firstSession: Session, data class CryptoTestData(val firstSession: Session,
val roomId: String, val roomId: String,

44
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
View File

@ -14,32 +14,32 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import android.os.SystemClock import android.os.SystemClock
import android.util.Log import android.util.Log
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.OutgoingSasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toContent import org.matrix.android.sdk.api.session.events.model.toContent
import im.vector.matrix.android.api.session.room.Room import org.matrix.android.sdk.api.session.room.Room
import im.vector.matrix.android.api.session.room.model.Membership import org.matrix.android.sdk.api.session.room.model.Membership
import im.vector.matrix.android.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupAuthData import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupAuthData
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/MockOkHttpInterceptor.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import im.vector.matrix.android.internal.session.TestInterceptor import org.matrix.android.sdk.internal.session.TestInterceptor
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.Protocol import okhttp3.Protocol
import okhttp3.Request import okhttp3.Request

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/SessionTestParams.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
View File

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
data class SessionTestParams @JvmOverloads constructor(val withInitialSync: Boolean = false) data class SessionTestParams @JvmOverloads constructor(val withInitialSync: Boolean = false)

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestAssertUtil.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import android.os.Debug import android.os.Debug

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixCallback.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import im.vector.matrix.android.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCallback
import org.junit.Assert.fail import org.junit.Assert.fail
import timber.log.Timber import timber.log.Timber
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch

14
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixComponent.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import android.content.Context import android.content.Context
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import im.vector.matrix.android.api.MatrixConfiguration import org.matrix.android.sdk.api.MatrixConfiguration
import im.vector.matrix.android.internal.auth.AuthModule import org.matrix.android.sdk.internal.auth.AuthModule
import im.vector.matrix.android.internal.di.MatrixComponent import org.matrix.android.sdk.internal.di.MatrixComponent
import im.vector.matrix.android.internal.di.MatrixModule import org.matrix.android.sdk.internal.di.MatrixModule
import im.vector.matrix.android.internal.di.MatrixScope import org.matrix.android.sdk.internal.di.MatrixScope
import im.vector.matrix.android.internal.di.NetworkModule import org.matrix.android.sdk.internal.di.NetworkModule
@Component(modules = [TestModule::class, MatrixModule::class, NetworkModule::class, AuthModule::class, TestNetworkModule::class]) @Component(modules = [TestModule::class, MatrixModule::class, NetworkModule::class, AuthModule::class, TestNetworkModule::class])
@MatrixScope @MatrixScope

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestModule.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import im.vector.matrix.android.internal.di.MatrixComponent import org.matrix.android.sdk.internal.di.MatrixComponent
@Module @Module
internal abstract class TestModule { internal abstract class TestModule {

6
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestNetworkModule.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.common package org.matrix.android.sdk.common
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import im.vector.matrix.android.internal.session.MockHttpInterceptor import org.matrix.android.sdk.internal.session.MockHttpInterceptor
import im.vector.matrix.android.internal.session.TestInterceptor import org.matrix.android.sdk.internal.session.TestInterceptor
@Module @Module
internal object TestNetworkModule { internal object TestNetworkModule {

8
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto package org.matrix.android.sdk.internal.crypto
import android.os.MemoryFile import android.os.MemoryFile
import android.util.Base64 import android.util.Base64
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileKey import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull

14
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto package org.matrix.android.sdk.internal.crypto
import im.vector.matrix.android.api.auth.data.Credentials import org.matrix.android.sdk.api.auth.data.Credentials
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
import im.vector.matrix.android.internal.crypto.store.db.mapper.CrossSigningKeysMapper import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
import im.vector.matrix.android.internal.di.MoshiProvider import org.matrix.android.sdk.internal.di.MoshiProvider
import io.realm.RealmConfiguration import io.realm.RealmConfiguration
import kotlin.random.Random import kotlin.random.Random

8
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto package org.matrix.android.sdk.internal.crypto
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
import io.realm.Realm import io.realm.Realm
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotEquals

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ExportEncryptionTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto package org.matrix.android.sdk.internal.crypto
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals

34
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/UnwedgingTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
View File

@ -14,25 +14,25 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto package org.matrix.android.sdk.internal.crypto
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.extensions.tryThis import org.matrix.android.sdk.api.extensions.tryThis
import im.vector.matrix.android.api.session.crypto.MXCryptoError import org.matrix.android.sdk.api.session.crypto.MXCryptoError
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe
import org.junit.Assert import org.junit.Assert
import org.junit.Before import org.junit.Before

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/ExtensionsKtTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.crosssigning package org.matrix.android.sdk.internal.crypto.crosssigning
import org.amshove.kluent.shouldBeNull import org.amshove.kluent.shouldBeNull
import org.amshove.kluent.shouldBeTrue import org.amshove.kluent.shouldBeTrue

18
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/XSigningTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
View File

@ -1,14 +1,14 @@
package im.vector.matrix.android.internal.crypto.crosssigning package org.matrix.android.sdk.internal.crypto.crosssigning
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull

48
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
View File

@ -14,33 +14,33 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.gossiping package org.matrix.android.sdk.internal.crypto.gossiping
import android.util.Log import android.util.Log
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
import im.vector.matrix.android.api.session.crypto.verification.VerificationService import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.internal.crypto.GossipingRequestState import org.matrix.android.sdk.internal.crypto.GossipingRequestState
import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestState import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestState
import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertEquals
import junit.framework.TestCase.assertNotNull import junit.framework.TestCase.assertNotNull
import junit.framework.TestCase.assertTrue import junit.framework.TestCase.assertTrue

28
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/WithHeldTests.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
View File

@ -14,23 +14,23 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.gossiping package org.matrix.android.sdk.internal.crypto.gossiping
import android.util.Log import android.util.Log
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.NoOpMatrixCallback import org.matrix.android.sdk.api.NoOpMatrixCallback
import im.vector.matrix.android.api.extensions.tryThis import org.matrix.android.sdk.api.extensions.tryThis
import im.vector.matrix.android.api.session.crypto.MXCryptoError import org.matrix.android.sdk.api.session.crypto.MXCryptoError
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.MockOkHttpInterceptor import org.matrix.android.sdk.common.MockOkHttpInterceptor
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
import org.junit.Assert import org.junit.Assert
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test

8
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPasswordTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.listeners.ProgressListener import org.matrix.android.sdk.api.listeners.ProgressListener
import im.vector.matrix.android.common.assertByteArrayNotEqual import org.matrix.android.sdk.common.assertByteArrayNotEqual
import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue

10
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupScenarioData.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestData import org.matrix.android.sdk.common.CryptoTestData
import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2 import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
/** /**
* Data class to store result of [KeysBackupTestHelper.createKeysBackupScenarioWithPassword] * Data class to store result of [KeysBackupTestHelper.createKeysBackupScenarioWithPassword]

34
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
View File

@ -14,25 +14,25 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.listeners.ProgressListener import org.matrix.android.sdk.api.listeners.ProgressListener
import im.vector.matrix.android.api.listeners.StepProgressListener import org.matrix.android.sdk.api.listeners.StepProgressListener
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.common.TestMatrixCallback import org.matrix.android.sdk.common.TestMatrixCallback
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestConstants.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
object KeysBackupTestConstants { object KeysBackupTestConstants {
val defaultSessionParams = SessionTestParams(withInitialSync = false) val defaultSessionParams = SessionTestParams(withInitialSync = false)

26
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestHelper.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import im.vector.matrix.android.api.listeners.ProgressListener import org.matrix.android.sdk.api.listeners.ProgressListener
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.assertDictEquals import org.matrix.android.sdk.common.assertDictEquals
import im.vector.matrix.android.common.assertListEquals import org.matrix.android.sdk.common.assertListEquals
import im.vector.matrix.android.internal.crypto.MegolmSessionData import org.matrix.android.sdk.internal.crypto.MegolmSessionData
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
import org.junit.Assert import org.junit.Assert
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
data class PrepareKeysBackupDataResult(val megolmBackupCreationInfo: MegolmBackupCreationInfo, data class PrepareKeysBackupDataResult(val megolmBackupCreationInfo: MegolmBackupCreationInfo,
val version: String) val version: String)

8
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/StateObserver.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.keysbackup package org.matrix.android.sdk.internal.crypto.keysbackup
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull import org.junit.Assert.assertNull
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch

38
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ssss/QuadSTests.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
View File

@ -14,28 +14,28 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.ssss package org.matrix.android.sdk.internal.crypto.ssss
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCallback
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.securestorage.EncryptedSecretContent import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
import im.vector.matrix.android.api.session.securestorage.KeySigner import org.matrix.android.sdk.api.session.securestorage.KeySigner
import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
import im.vector.matrix.android.api.session.securestorage.SecretStorageKeyContent import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
import im.vector.matrix.android.api.util.Optional import org.matrix.android.sdk.api.util.Optional
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.SessionTestParams import org.matrix.android.sdk.common.SessionTestParams
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.common.TestMatrixCallback import org.matrix.android.sdk.common.TestMatrixCallback
import im.vector.matrix.android.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2 import org.matrix.android.sdk.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
import im.vector.matrix.android.internal.crypto.secrets.DefaultSharedSecretStorageService import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

42
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/SASTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
View File

@ -14,30 +14,30 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.verification package org.matrix.android.sdk.internal.crypto.verification
import android.util.Log import android.util.Log
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.session.crypto.verification.CancelCode import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.OutgoingSasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.SasMode import org.matrix.android.sdk.api.session.crypto.verification.SasMode
import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
import im.vector.matrix.android.api.session.crypto.verification.VerificationService import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationCancel import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationCancel
import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationStart import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
import im.vector.matrix.android.internal.crypto.model.rest.toValue import org.matrix.android.sdk.internal.crypto.model.rest.toValue
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull

2
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/HexParser.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
fun hexToByteArray(hex: String): ByteArray { fun hexToByteArray(hex: String): ByteArray {
// Remove all spaces // Remove all spaces

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.amshove.kluent.shouldBeNull import org.amshove.kluent.shouldBeNull
import org.amshove.kluent.shouldEqual import org.amshove.kluent.shouldEqual
import org.amshove.kluent.shouldEqualTo import org.amshove.kluent.shouldEqualTo

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecretTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe
import org.amshove.kluent.shouldNotBeEqualTo import org.amshove.kluent.shouldNotBeEqualTo
import org.junit.FixMethodOrder import org.junit.FixMethodOrder

18
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
import im.vector.matrix.android.api.session.crypto.verification.VerificationService import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.TestConstants import org.matrix.android.sdk.common.TestConstants
import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/session/room/send/MarkdownParserTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.session.room.send package org.matrix.android.sdk.internal.session.room.send
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.commonmark.parser.Parser import org.commonmark.parser.Parser
import org.commonmark.renderer.html.HtmlRenderer import org.commonmark.renderer.html.HtmlRenderer
import org.commonmark.renderer.text.TextContentRenderer import org.commonmark.renderer.text.TextContentRenderer

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.util package org.matrix.android.sdk.internal.util
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith

26
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,21 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.api.session.room.send.SendState import org.matrix.android.sdk.api.session.room.send.SendState
import im.vector.matrix.android.internal.database.helper.addTimelineEvent import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
import im.vector.matrix.android.internal.database.helper.merge import org.matrix.android.sdk.internal.database.helper.merge
import im.vector.matrix.android.internal.database.mapper.toEntity import org.matrix.android.sdk.internal.database.mapper.toEntity
import im.vector.matrix.android.internal.database.model.ChunkEntity import org.matrix.android.sdk.internal.database.model.ChunkEntity
import im.vector.matrix.android.internal.database.model.SessionRealmModule import org.matrix.android.sdk.internal.database.model.SessionRealmModule
import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeMessageEvent import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent
import io.realm.Realm import io.realm.Realm
import io.realm.RealmConfiguration import io.realm.RealmConfiguration
import io.realm.kotlin.createObject import io.realm.kotlin.createObject

10
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.internal.session.room.timeline.GetContextOfEventTask import org.matrix.android.sdk.internal.session.room.timeline.GetContextOfEventTask
import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEventPersistor
import kotlin.random.Random import kotlin.random.Random
internal class FakeGetContextOfEventTask constructor(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : GetContextOfEventTask { internal class FakeGetContextOfEventTask constructor(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : GetContextOfEventTask {

8
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.internal.session.room.timeline.PaginationTask import org.matrix.android.sdk.internal.session.room.timeline.PaginationTask
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEventPersistor
import javax.inject.Inject import javax.inject.Inject
import kotlin.random.Random import kotlin.random.Random

6
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEvent import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEvent
internal data class FakeTokenChunkEvent(override val start: String?, internal data class FakeTokenChunkEvent(override val start: String?,
override val end: String?, override val end: String?,

20
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.api.session.events.model.Content import org.matrix.android.sdk.api.session.events.model.Content
import im.vector.matrix.android.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toContent import org.matrix.android.sdk.api.session.events.model.toContent
import im.vector.matrix.android.api.session.room.model.Membership import org.matrix.android.sdk.api.session.room.model.Membership
import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import im.vector.matrix.android.api.session.room.model.message.MessageTextContent import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
import im.vector.matrix.android.api.session.room.model.message.MessageType import org.matrix.android.sdk.api.session.room.model.message.MessageType
import kotlin.random.Random import kotlin.random.Random
object RoomDataHelper { object RoomDataHelper {

22
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.message.MessageContent import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.checkSendOrder import org.matrix.android.sdk.common.checkSendOrder
import org.amshove.kluent.shouldBeFalse import org.amshove.kluent.shouldBeFalse
import org.amshove.kluent.shouldBeTrue import org.amshove.kluent.shouldBeTrue
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue

22
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineForwardPaginationTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.message.MessageContent import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.checkSendOrder import org.matrix.android.sdk.common.checkSendOrder
import org.amshove.kluent.shouldBeFalse import org.amshove.kluent.shouldBeFalse
import org.amshove.kluent.shouldBeTrue import org.amshove.kluent.shouldBeTrue
import org.junit.FixMethodOrder import org.junit.FixMethodOrder

22
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelinePreviousLastForwardTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import im.vector.matrix.android.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
import im.vector.matrix.android.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel import org.matrix.android.sdk.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.message.MessageContent import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import im.vector.matrix.android.api.session.room.timeline.Timeline import org.matrix.android.sdk.api.session.room.timeline.Timeline
import im.vector.matrix.android.api.session.room.timeline.TimelineSettings import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
import im.vector.matrix.android.common.CommonTestHelper import org.matrix.android.sdk.common.CommonTestHelper
import im.vector.matrix.android.common.CryptoTestHelper import org.matrix.android.sdk.common.CryptoTestHelper
import im.vector.matrix.android.common.checkSendOrder import org.matrix.android.sdk.common.checkSendOrder
import org.amshove.kluent.shouldBeFalse import org.amshove.kluent.shouldBeFalse
import org.amshove.kluent.shouldBeTrue import org.amshove.kluent.shouldBeTrue
import org.junit.FixMethodOrder import org.junit.FixMethodOrder

6
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt → matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.session.room.timeline package org.matrix.android.sdk.session.room.timeline
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
internal class TimelineTest : InstrumentedTest { internal class TimelineTest : InstrumentedTest {

30
matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/database/RealmDebugTools.kt → matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
View File

@ -14,22 +14,22 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.database package org.matrix.android.sdk.internal.database
import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntity import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntity
import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMetadataEntity import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntity
import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntity import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntity
import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
import im.vector.matrix.android.internal.crypto.store.db.model.GossipingEventEntity import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntity
import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntity import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntity
import im.vector.matrix.android.internal.crypto.store.db.model.KeyInfoEntity import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntity
import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
import im.vector.matrix.android.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntity import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntity import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntity
import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntity import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
import im.vector.matrix.android.internal.crypto.store.db.model.TrustLevelEntity import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntity
import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
import io.realm.Realm import io.realm.Realm
import io.realm.RealmConfiguration import io.realm.RealmConfiguration
import io.realm.kotlin.where import io.realm.kotlin.where

4
matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt → matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.network.interceptors package org.matrix.android.sdk.internal.network.interceptors
import im.vector.matrix.android.internal.di.MatrixScope import org.matrix.android.sdk.internal.di.MatrixScope
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.Response import okhttp3.Response
import okio.Buffer import okio.Buffer

4
matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt → matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.internal.network.interceptors package org.matrix.android.sdk.internal.network.interceptors
import androidx.annotation.NonNull import androidx.annotation.NonNull
import im.vector.matrix.android.BuildConfig import org.matrix.android.sdk.BuildConfig
import okhttp3.logging.HttpLoggingInterceptor import okhttp3.logging.HttpLoggingInterceptor
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONException import org.json.JSONException

4
matrix-sdk-android/src/main/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.matrix.android"> package="org.matrix.android.sdk">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
@ -13,7 +13,7 @@
read access permission read access permission
--> -->
<provider <provider
android:name="im.vector.matrix.android.api.session.file.MatrixSDKFileProvider" android:name=".api.session.file.MatrixSDKFileProvider"
android:authorities="${applicationId}.mx-sdk.fileprovider" android:authorities="${applicationId}.mx-sdk.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">

28
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/RiotConfig.kt
View File

@ -1,28 +0,0 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.matrix.android.internal.auth.data
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RiotConfig(
// There are plenty of other elements in the file config.json of a RiotWeb client, but for the moment only one is interesting
// Ex: "brand", "branding", etc.
@Json(name = "default_hs_url")
val defaultHomeServerUrl: String?
)

138
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt
View File

@ -1,138 +0,0 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.matrix.android.internal.session
import dagger.BindsInstance
import dagger.Component
import im.vector.matrix.android.api.auth.data.SessionParams
import im.vector.matrix.android.api.session.Session
import im.vector.matrix.android.internal.crypto.CancelGossipRequestWorker
import im.vector.matrix.android.internal.crypto.CryptoModule
import im.vector.matrix.android.internal.crypto.SendGossipRequestWorker
import im.vector.matrix.android.internal.crypto.SendGossipWorker
import im.vector.matrix.android.internal.crypto.verification.SendVerificationMessageWorker
import im.vector.matrix.android.internal.di.MatrixComponent
import im.vector.matrix.android.internal.di.SessionAssistedInjectModule
import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
import im.vector.matrix.android.internal.session.account.AccountModule
import im.vector.matrix.android.internal.session.cache.CacheModule
import im.vector.matrix.android.internal.session.call.CallModule
import im.vector.matrix.android.internal.session.content.ContentModule
import im.vector.matrix.android.internal.session.content.UploadContentWorker
import im.vector.matrix.android.internal.session.filter.FilterModule
import im.vector.matrix.android.internal.session.group.GetGroupDataWorker
import im.vector.matrix.android.internal.session.group.GroupModule
import im.vector.matrix.android.internal.session.homeserver.HomeServerCapabilitiesModule
import im.vector.matrix.android.internal.session.identity.IdentityModule
import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManagerModule
import im.vector.matrix.android.internal.session.openid.OpenIdModule
import im.vector.matrix.android.internal.session.profile.ProfileModule
import im.vector.matrix.android.internal.session.pushers.AddHttpPusherWorker
import im.vector.matrix.android.internal.session.pushers.PushersModule
import im.vector.matrix.android.internal.session.room.RoomModule
import im.vector.matrix.android.internal.session.room.relation.SendRelationWorker
import im.vector.matrix.android.internal.session.room.send.EncryptEventWorker
import im.vector.matrix.android.internal.session.room.send.MultipleEventSendingDispatcherWorker
import im.vector.matrix.android.internal.session.room.send.RedactEventWorker
import im.vector.matrix.android.internal.session.room.send.SendEventWorker
import im.vector.matrix.android.internal.session.signout.SignOutModule
import im.vector.matrix.android.internal.session.sync.SyncModule
import im.vector.matrix.android.internal.session.sync.SyncTask
import im.vector.matrix.android.internal.session.sync.SyncTokenStore
import im.vector.matrix.android.internal.session.sync.job.SyncWorker
import im.vector.matrix.android.internal.session.terms.TermsModule
import im.vector.matrix.android.internal.session.user.UserModule
import im.vector.matrix.android.internal.session.user.accountdata.AccountDataModule
import im.vector.matrix.android.internal.session.widgets.WidgetModule
import im.vector.matrix.android.internal.task.TaskExecutor
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
@Component(dependencies = [MatrixComponent::class],
modules = [
SessionModule::class,
RoomModule::class,
SyncModule::class,
HomeServerCapabilitiesModule::class,
SignOutModule::class,
GroupModule::class,
UserModule::class,
FilterModule::class,
GroupModule::class,
ContentModule::class,
CacheModule::class,
CryptoModule::class,
PushersModule::class,
OpenIdModule::class,
WidgetModule::class,
IntegrationManagerModule::class,
IdentityModule::class,
TermsModule::class,
AccountDataModule::class,
ProfileModule::class,
SessionAssistedInjectModule::class,
AccountModule::class,
CallModule::class
]
)
@SessionScope
internal interface SessionComponent {
fun coroutineDispatchers(): MatrixCoroutineDispatchers
fun session(): Session
fun syncTask(): SyncTask
fun syncTokenStore(): SyncTokenStore
fun networkConnectivityChecker(): NetworkConnectivityChecker
fun taskExecutor(): TaskExecutor
fun inject(worker: SendEventWorker)
fun inject(worker: SendRelationWorker)
fun inject(worker: EncryptEventWorker)
fun inject(worker: MultipleEventSendingDispatcherWorker)
fun inject(worker: RedactEventWorker)
fun inject(worker: GetGroupDataWorker)
fun inject(worker: UploadContentWorker)
fun inject(worker: SyncWorker)
fun inject(worker: AddHttpPusherWorker)
fun inject(worker: SendVerificationMessageWorker)
fun inject(worker: SendGossipRequestWorker)
fun inject(worker: CancelGossipRequestWorker)
fun inject(worker: SendGossipWorker)
@Component.Factory
interface Factory {
fun create(
matrixComponent: MatrixComponent,
@BindsInstance sessionParams: SessionParams): SessionComponent
}
}

21
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,22 +15,22 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api package org.matrix.android.sdk.api
import android.content.Context import android.content.Context
import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner
import androidx.work.Configuration import androidx.work.Configuration
import androidx.work.WorkManager import androidx.work.WorkManager
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.BuildConfig import org.matrix.android.sdk.BuildConfig
import im.vector.matrix.android.api.auth.AuthenticationService import org.matrix.android.sdk.api.auth.AuthenticationService
import im.vector.matrix.android.api.legacy.LegacySessionImporter import org.matrix.android.sdk.api.legacy.LegacySessionImporter
import im.vector.matrix.android.internal.SessionManager import org.matrix.android.sdk.internal.SessionManager
import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
import im.vector.matrix.android.internal.di.DaggerMatrixComponent import org.matrix.android.sdk.internal.di.DaggerMatrixComponent
import im.vector.matrix.android.internal.network.UserAgentHolder import org.matrix.android.sdk.internal.network.UserAgentHolder
import im.vector.matrix.android.internal.util.BackgroundDetectionObserver import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
import org.matrix.olm.OlmManager import org.matrix.olm.OlmManager
import java.io.InputStream import java.io.InputStream
import java.util.concurrent.Executors import java.util.concurrent.Executors

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api package org.matrix.android.sdk.api
/** /**
* Generic callback interface for asynchronously. * Generic callback interface for asynchronously.

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixConfiguration.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api package org.matrix.android.sdk.api
import im.vector.matrix.android.api.crypto.MXCryptoConfig import org.matrix.android.sdk.api.crypto.MXCryptoConfig
import java.net.Proxy import java.net.Proxy
data class MatrixConfiguration( data class MatrixConfiguration(

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api package org.matrix.android.sdk.api
/** /**
* This class contains pattern to match the different Matrix ids * This class contains pattern to match the different Matrix ids

21
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/AuthenticationService.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,17 +15,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api.auth package org.matrix.android.sdk.api.auth
import im.vector.matrix.android.api.MatrixCallback import org.matrix.android.sdk.api.MatrixCallback
import im.vector.matrix.android.api.auth.data.Credentials import org.matrix.android.sdk.api.auth.data.Credentials
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
import im.vector.matrix.android.api.auth.data.LoginFlowResult import org.matrix.android.sdk.api.auth.data.LoginFlowResult
import im.vector.matrix.android.api.auth.login.LoginWizard import org.matrix.android.sdk.api.auth.login.LoginWizard
import im.vector.matrix.android.api.auth.registration.RegistrationWizard import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
import im.vector.matrix.android.api.auth.wellknown.WellknownResult import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
import im.vector.matrix.android.api.session.Session import org.matrix.android.sdk.api.session.Session
import im.vector.matrix.android.api.util.Cancelable import org.matrix.android.sdk.api.util.Cancelable
/** /**
* This interface defines methods to authenticate or to create an account to a matrix server. * This interface defines methods to authenticate or to create an account to a matrix server.

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Constants.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020 New Vector Ltd * Copyright (c) 2020 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api.auth package org.matrix.android.sdk.api.auth
/** /**
* Path to use when the client does not supported any or all login flows * Path to use when the client does not supported any or all login flows

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2019 New Vector Ltd * Copyright 2019 New Vector Ltd
* Copyright 2020 The Matrix.org Foundation C.I.C.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,11 +15,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.matrix.android.api.auth.data package org.matrix.android.sdk.api.auth.data
import com.squareup.moshi.Json import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import im.vector.matrix.android.internal.util.md5 import org.matrix.android.sdk.internal.util.md5
/** /**
* This data class hold credentials user data. * This data class hold credentials user data.

Some files were not shown because too many files have changed in this diff Show More