mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 20:06:51 +03:00
Merge branch 'develop' into dependabot/gradle/kotlin_version-1.5.0
This commit is contained in:
Benoit Marty
GitHub
commit
36f397be48
12 changed files with 119 additions and 67 deletions
46
.travis.yml
46
.travis.yml
|
|
@ -1,4 +1,4 @@
|
|||
# FTR: Configuration on https://travis-ci.org/vector-im/riotX-android/settings
|
||||
# FTR: Configuration on https://travis-ci.org/github/vector-im/element-android/settings
|
||||
#
|
||||
# - Build only if .travis.yml is present -> On
|
||||
# - Limit concurrent jobs -> Off
|
||||
|
|
@ -8,53 +8,11 @@
|
|||
# - Auto cancel branch builds -> On
|
||||
# - Auto cancel pull request builds -> On
|
||||
|
||||
language: android
|
||||
jdk: oraclejdk8
|
||||
sudo: false
|
||||
|
||||
notifications:
|
||||
email: false
|
||||
|
||||
android:
|
||||
components:
|
||||
# Uncomment the lines below if you want to
|
||||
# use the latest revision of Android SDK Tools
|
||||
- tools
|
||||
- platform-tools
|
||||
|
||||
# The BuildTools version used by your project
|
||||
- build-tools-29.0.3
|
||||
|
||||
# The SDK version used to compile your project
|
||||
- android-29
|
||||
|
||||
before_cache:
|
||||
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
||||
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.gradle/caches/
|
||||
- $HOME/.gradle/wrapper/
|
||||
- $HOME/.android/build-cache
|
||||
|
||||
# Build with the development SDK
|
||||
before_script:
|
||||
# Not necessary for the moment
|
||||
# - /bin/sh ./set_debug_env.sh
|
||||
|
||||
# Just build the project for now
|
||||
# Just run a simple script here
|
||||
script:
|
||||
# Build app (assembleGplayRelease assembleFdroidRelease)
|
||||
# Build Android test (assembleAndroidTest) (disabled for now)
|
||||
# Code quality (lintGplayRelease lintFdroidRelease)
|
||||
# Split into two steps because if a task contain Fdroid, PlayService will be disabled
|
||||
# Done by Buildkite now: - ./gradlew clean assembleGplayRelease lintGplayRelease --stacktrace
|
||||
# Done by Buildkite now: - ./gradlew clean assembleFdroidRelease lintFdroidRelease --stacktrace
|
||||
# Run unitary test (Disable for now, see https://travis-ci.org/vector-im/riot-android/builds/502504370)
|
||||
# - ./gradlew testGplayReleaseUnitTest --stacktrace
|
||||
# Other code quality check
|
||||
# Done by Buildkite now: - ./tools/check/check_code_quality.sh
|
||||
- ./tools/travis/check_pr.sh
|
||||
# Check that indonesians file are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
|
||||
# Done by Buildkite now: - diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Improvements 🙌:
|
|||
-
|
||||
|
||||
Bugfix 🐛:
|
||||
-
|
||||
- Fix a problem with database migration on nightly builds (#3335)
|
||||
|
||||
Translations 🗣:
|
||||
-
|
||||
|
|
@ -19,12 +19,13 @@ SDK API changes ⚠️:
|
|||
Build 🧱:
|
||||
- Compile with Kotlin 1.5.
|
||||
- Upgrade some dependencies: gradle wrapper, third party lib, etc.
|
||||
- Sign APK with build tools 30.0.3
|
||||
|
||||
Test:
|
||||
-
|
||||
|
||||
Other changes:
|
||||
-
|
||||
- Add documentation on LoginWizard and RegistrationWizard (#3303)
|
||||
|
||||
Changes in Element 1.1.7 (2021-05-12)
|
||||
===================================================
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildscript {
|
|||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "io.realm:realm-gradle-plugin:10.4.0"
|
||||
classpath "io.realm:realm-gradle-plugin:10.5.0"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ dependencies {
|
|||
implementation 'com.otaliastudios:transcoder:0.10.3'
|
||||
|
||||
// Phone number https://github.com/google/libphonenumber
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.23'
|
||||
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
testImplementation 'org.robolectric:robolectric:4.5.1'
|
||||
|
|
|
|||
|
|
@ -51,11 +51,15 @@ interface AuthenticationService {
|
|||
|
||||
/**
|
||||
* Return a LoginWizard, to login to the homeserver. The login flow has to be retrieved first.
|
||||
*
|
||||
* See [LoginWizard] for more details
|
||||
*/
|
||||
fun getLoginWizard(): LoginWizard
|
||||
|
||||
/**
|
||||
* Return a RegistrationWizard, to create an matrix account on the homeserver. The login flow has to be retrieved first.
|
||||
*
|
||||
* See [RegistrationWizard] for more details.
|
||||
*/
|
||||
fun getRegistrationWizard(): RegistrationWizard
|
||||
|
||||
|
|
|
|||
|
|
@ -17,34 +17,46 @@
|
|||
package org.matrix.android.sdk.api.auth.login
|
||||
|
||||
import org.matrix.android.sdk.api.session.Session
|
||||
import org.matrix.android.sdk.api.util.Cancelable
|
||||
|
||||
/**
|
||||
* Set of methods to be able to login to an existing account on a homeserver.
|
||||
*
|
||||
* More documentation can be found in the file https://github.com/vector-im/element-android/blob/main/docs/signin.md
|
||||
*/
|
||||
interface LoginWizard {
|
||||
|
||||
/**
|
||||
* @param login the login field
|
||||
* @param password the password field
|
||||
* Login to the homeserver.
|
||||
*
|
||||
* @param login the login field. Can be a user name, or a msisdn (email or phone number) associated to the account
|
||||
* @param password the password of the account
|
||||
* @param deviceName the initial device name
|
||||
* @param callback the matrix callback on which you'll receive the result of authentication.
|
||||
* @return a [Cancelable]
|
||||
* @return a [Session] if the login is successful
|
||||
*/
|
||||
suspend fun login(login: String,
|
||||
password: String,
|
||||
deviceName: String): Session
|
||||
|
||||
/**
|
||||
* Exchange a login token to an access token
|
||||
* Exchange a login token to an access token.
|
||||
*
|
||||
* @param loginToken login token, obtain when login has happen in a WebView, using SSO
|
||||
* @return a [Session] if the login is successful
|
||||
*/
|
||||
suspend fun loginWithToken(loginToken: String): Session
|
||||
|
||||
/**
|
||||
* Reset user password
|
||||
* Ask the homeserver to reset the user password. The password will not be reset until
|
||||
* [resetPasswordMailConfirmed] is successfully called.
|
||||
*
|
||||
* @param email an email previously associated to the account the user wants the password to be reset.
|
||||
* @param newPassword the desired new password
|
||||
*/
|
||||
suspend fun resetPassword(email: String,
|
||||
newPassword: String)
|
||||
|
||||
/**
|
||||
* Confirm the new password, once the user has checked their email
|
||||
* When this method succeed, tha account password will be effectively modified.
|
||||
*/
|
||||
suspend fun resetPasswordMailConfirmed()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,32 +16,98 @@
|
|||
|
||||
package org.matrix.android.sdk.api.auth.registration
|
||||
|
||||
/**
|
||||
* Set of methods to be able to create an account on a homeserver.
|
||||
*
|
||||
* Common scenario to register an account successfully:
|
||||
* - Call [getRegistrationFlow] to check that you application supports all the mandatory registration stages
|
||||
* - Call [createAccount] to start the account creation
|
||||
* - Fulfill all mandatory stages using the methods [performReCaptcha] [acceptTerms] [dummy], etc.
|
||||
*
|
||||
* More documentation can be found in the file https://github.com/vector-im/element-android/blob/main/docs/signup.md
|
||||
* and https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
|
||||
*/
|
||||
interface RegistrationWizard {
|
||||
|
||||
/**
|
||||
* Call this method to get the possible registration flow of the current homeserver.
|
||||
* It can be useful to ensure that your application implementation supports all the stages
|
||||
* required to create an account. If it is not the case, you will have to use the web fallback
|
||||
* to let the user create an account with your application.
|
||||
* See [org.matrix.android.sdk.api.auth.AuthenticationService.getFallbackUrl]
|
||||
*/
|
||||
suspend fun getRegistrationFlow(): RegistrationResult
|
||||
|
||||
/**
|
||||
* Can be call to check is the desired userName is available for registration on the current homeserver.
|
||||
* It may also fails if the desired userName is not correctly formatted or does not follow any restriction on
|
||||
* the homeserver. Ex: userName with only digits may be rejected.
|
||||
* @param userName the desired username. Ex: "alice"
|
||||
*/
|
||||
suspend fun registrationAvailable(userName: String): RegistrationAvailability
|
||||
|
||||
/**
|
||||
* This is the first method to call in order to create an account and start the registration process.
|
||||
*
|
||||
* @param userName the desired username. Ex: "alice"
|
||||
* @param password the desired password
|
||||
* @param initialDeviceDisplayName the device display name
|
||||
*/
|
||||
suspend fun createAccount(userName: String?,
|
||||
password: String?,
|
||||
initialDeviceDisplayName: String?): RegistrationResult
|
||||
|
||||
/**
|
||||
* Perform the "m.login.recaptcha" stage.
|
||||
*
|
||||
* @param response the response from ReCaptcha
|
||||
*/
|
||||
suspend fun performReCaptcha(response: String): RegistrationResult
|
||||
|
||||
/**
|
||||
* Perform the "m.login.terms" stage.
|
||||
*/
|
||||
suspend fun acceptTerms(): RegistrationResult
|
||||
|
||||
/**
|
||||
* Perform the "m.login.dummy" stage.
|
||||
*/
|
||||
suspend fun dummy(): RegistrationResult
|
||||
|
||||
/**
|
||||
* Perform the "m.login.email.identity" or "m.login.msisdn" stage.
|
||||
*
|
||||
* @param threePid the threePid to add to the account. If this is an email, the homeserver will send an email
|
||||
* to validate it. For a msisdn a SMS will be sent.
|
||||
*/
|
||||
suspend fun addThreePid(threePid: RegisterThreePid): RegistrationResult
|
||||
|
||||
/**
|
||||
* Ask the homeserver to send again the current threePid (email or msisdn).
|
||||
*/
|
||||
suspend fun sendAgainThreePid(): RegistrationResult
|
||||
|
||||
/**
|
||||
* Send the code received by SMS to validate a msisdn.
|
||||
* If the code is correct, the registration request will be executed to validate the msisdn.
|
||||
*/
|
||||
suspend fun handleValidateThreePid(code: String): RegistrationResult
|
||||
|
||||
/**
|
||||
* Useful to poll the homeserver when waiting for the email to be validated by the user.
|
||||
* Once the email is validated, this method will return successfully.
|
||||
* @param delayMillis the SDK can wait before sending the request
|
||||
*/
|
||||
suspend fun checkIfEmailHasBeenValidated(delayMillis: Long): RegistrationResult
|
||||
|
||||
suspend fun registrationAvailable(userName: String): RegistrationAvailability
|
||||
|
||||
/**
|
||||
* This is the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
|
||||
* restored even if the app has been killed during the registration
|
||||
*/
|
||||
val currentThreePid: String?
|
||||
|
||||
// True when login and password has been sent with success to the homeserver
|
||||
/**
|
||||
* True when login and password have been sent with success to the homeserver, i.e. [createAccount] has been
|
||||
* called successfully.
|
||||
*/
|
||||
val isRegistrationStarted: Boolean
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ interface Room :
|
|||
* @param beforeLimit how many events before the result are returned.
|
||||
* @param afterLimit how many events after the result are returned.
|
||||
* @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
|
||||
* @param callback Callback to get the search result
|
||||
* @return The search result
|
||||
*/
|
||||
suspend fun search(searchTerm: String,
|
||||
nextBatch: String?,
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ import javax.inject.Inject
|
|||
class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
|
||||
|
||||
companion object {
|
||||
const val SESSION_STORE_SCHEMA_VERSION = 12L
|
||||
const val SESSION_STORE_SCHEMA_VERSION = 13L
|
||||
}
|
||||
|
||||
override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
|
||||
|
|
@ -62,6 +62,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
|
|||
if (oldVersion <= 9) migrateTo10(realm)
|
||||
if (oldVersion <= 10) migrateTo11(realm)
|
||||
if (oldVersion <= 11) migrateTo12(realm)
|
||||
if (oldVersion <= 12) migrateTo13(realm)
|
||||
}
|
||||
|
||||
private fun migrateTo1(realm: DynamicRealm) {
|
||||
|
|
@ -274,4 +275,14 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
|
|||
?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
|
||||
?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
|
||||
}
|
||||
|
||||
private fun migrateTo13(realm: DynamicRealm) {
|
||||
Timber.d("Step 12 -> 13")
|
||||
|
||||
// Fix issue with the nightly build. Eventually play again the migration which has been included in migrateTo12()
|
||||
realm.schema.get("SpaceChildSummaryEntity")
|
||||
?.takeIf { !it.hasField(SpaceChildSummaryEntityFields.SUGGESTED) }
|
||||
?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
|
||||
?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ PARAM_KEYSTORE_PATH=$1
|
|||
PARAM_APK=$2
|
||||
|
||||
# Other params
|
||||
BUILD_TOOLS_VERSION="29.0.3"
|
||||
BUILD_TOOLS_VERSION="30.0.3"
|
||||
MIN_SDK_VERSION=21
|
||||
|
||||
echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ PARAM_KS_PASS=$3
|
|||
PARAM_KEY_PASS=$4
|
||||
|
||||
# Other params
|
||||
BUILD_TOOLS_VERSION="29.0.3"
|
||||
BUILD_TOOLS_VERSION="30.0.3"
|
||||
MIN_SDK_VERSION=21
|
||||
|
||||
echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ dependencies {
|
|||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation "androidx.sharetarget:sharetarget:1.1.0"
|
||||
implementation 'androidx.core:core-ktx:1.3.2'
|
||||
implementation "androidx.media:media:1.3.0"
|
||||
implementation "androidx.media:media:1.3.1"
|
||||
|
||||
implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
|
||||
implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"
|
||||
|
|
@ -343,7 +343,7 @@ dependencies {
|
|||
implementation 'com.facebook.stetho:stetho:1.6.0'
|
||||
|
||||
// Phone number https://github.com/google/libphonenumber
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.23'
|
||||
|
||||
// rx
|
||||
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ fun selectTxtFileToWrite(
|
|||
* @param sourceFile the file source path
|
||||
* @param dstDirPath the dst path
|
||||
* @param outputFilename optional the output filename
|
||||
* @param callback the asynchronous callback
|
||||
* @return the created file
|
||||
*/
|
||||
@Suppress("DEPRECATION")
|
||||
fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?): File? {
|
||||
|
|
|
|||
Loading…
Reference in a new issue