Archives/tijder_SmsMatrix
1
0
Fork 0
mirror of https://github.com/tijder/SmsMatrix.git synced 2026-03-02 03:40:08 +00:00
Code Issues Projects Releases Wiki Activity

Update to latest matrix-android-sdk (#60)

Browse Source 
* Make it build

* Add olm sdk

* Make it work

* Update other dependencies
This commit is contained in:
Tulir Asokan
2019-10-12 23:21:09 +03:00
committed by tijder
parent 37ba680d0f
commit 380553bc60
12 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java
View File

@@ -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;

11
app/src/main/java/eu/droogers/smsmatrix/EventListener.java
View File

@@ -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) {
}
}

5
app/src/main/java/eu/droogers/smsmatrix/MainActivity.java
View File

@@ -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;

4
app/src/main/java/eu/droogers/smsmatrix/Matrix.java
View File

@@ -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;