diff --git a/app/build.gradle b/app/build.gradle index 7d19f30..945e9e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,15 +4,15 @@ apply plugin: 'kotlin-kapt' apply plugin: 'realm-android' android { - compileSdkVersion 27 + compileSdkVersion 29 buildToolsVersion '28.0.3' defaultConfig { applicationId "eu.droogers.smsmatrix" minSdkVersion 23 - targetSdkVersion 27 + targetSdkVersion 29 versionCode 12 versionName "0.0.12" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -34,24 +34,27 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.preference:preference:1.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - testCompile 'junit:junit:4.12' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' implementation(name: 'matrix-sdk', ext: 'aar') + implementation(name: 'matrix-sdk-core', ext: 'aar') + implementation(name: 'matrix-sdk-crypto', ext: 'aar') implementation(name: 'olm-sdk', ext: 'aar') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.squareup.retrofit2:retrofit:2.4.0' - implementation 'com.squareup.retrofit2:converter-gson:2.4.0' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' + implementation 'com.squareup.retrofit2:retrofit:2.6.0' + implementation 'com.squareup.retrofit2:converter-gson:2.6.0' + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.squareup.okhttp3:okhttp:3.12.3' + implementation 'com.squareup.okhttp3:logging-interceptor:3.12.3' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0' } diff --git a/app/libs/matrix-sdk-core.aar b/app/libs/matrix-sdk-core.aar new file mode 100644 index 0000000..ec3cf3a Binary files /dev/null and b/app/libs/matrix-sdk-core.aar differ diff --git a/app/libs/matrix-sdk-crypto.aar b/app/libs/matrix-sdk-crypto.aar new file mode 100644 index 0000000..8ef9235 Binary files /dev/null and b/app/libs/matrix-sdk-crypto.aar differ diff --git a/app/libs/matrix-sdk.aar b/app/libs/matrix-sdk.aar index 11a1bfc..17b9fab 100644 Binary files a/app/libs/matrix-sdk.aar and b/app/libs/matrix-sdk.aar differ diff --git a/app/libs/olm-sdk.aar b/app/libs/olm-sdk.aar index 552650a..c42c81b 100644 Binary files a/app/libs/olm-sdk.aar and b/app/libs/olm-sdk.aar differ diff --git a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java index c3704ae..3288948 100644 --- a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package eu.droogers.smsmatrix; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java index 665e217..f06a2f6 100644 --- a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java +++ b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java @@ -6,9 +6,10 @@ import org.matrix.androidsdk.data.MyUser; import org.matrix.androidsdk.data.RoomState; import org.matrix.androidsdk.listeners.IMXEventListener; import org.matrix.androidsdk.rest.model.Event; -import org.matrix.androidsdk.rest.model.MatrixError; +import org.matrix.androidsdk.core.model.MatrixError; import org.matrix.androidsdk.rest.model.User; import org.matrix.androidsdk.rest.model.bingrules.BingRule; +import org.matrix.androidsdk.rest.model.sync.AccountDataElement; import java.util.List; @@ -52,7 +53,7 @@ public class EventListener implements IMXEventListener { @Override public void onLiveEvent(Event event, RoomState roomState) { - if (loaded == true) { + if (loaded) { // mx.getUnreadEvents(); mx.sendEvent(event); } @@ -75,12 +76,12 @@ public class EventListener implements IMXEventListener { } @Override - public void onEventDecrypted(Event event) { + public void onEventSent(Event event, String s) { } @Override - public void onEventSent(Event event, String s) { + public void onEventDecrypted(String s, String s1) { } @@ -197,7 +198,7 @@ public class EventListener implements IMXEventListener { } @Override - public void onAccountDataUpdated() { + public void onAccountDataUpdated(AccountDataElement accountDataElement) { } } diff --git a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java index 8c2334e..de21cfd 100644 --- a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java +++ b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java @@ -1,6 +1,5 @@ package eu.droogers.smsmatrix; -import android.Manifest; import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -12,8 +11,8 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import static android.Manifest.permission.READ_CONTACTS; import static android.Manifest.permission.READ_EXTERNAL_STORAGE; diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java index 4e42bb1..be74969 100644 --- a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java +++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java @@ -25,11 +25,11 @@ import org.matrix.androidsdk.data.store.MXFileStore; import org.matrix.androidsdk.data.store.MXMemoryStore; import org.matrix.androidsdk.listeners.IMXEventListener; import org.matrix.androidsdk.listeners.MXMediaUploadListener; -import org.matrix.androidsdk.rest.callback.SimpleApiCallback; +import org.matrix.androidsdk.core.callback.SimpleApiCallback; +import org.matrix.androidsdk.core.model.MatrixError; import org.matrix.androidsdk.rest.client.LoginRestClient; import org.matrix.androidsdk.rest.model.CreatedEvent; import org.matrix.androidsdk.rest.model.Event; -import org.matrix.androidsdk.rest.model.MatrixError; import org.matrix.androidsdk.rest.model.message.Message; import org.matrix.androidsdk.rest.model.login.Credentials; diff --git a/build.gradle b/build.gradle index 7627606..d4969fa 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:5.8.0" diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7b8a20..7b74055 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jan 27 22:19:41 CET 2019 +#Fri Oct 11 22:28:14 EEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip