Archives
/
tijder_SmsMatrix
mirror of https://github.com/tijder/SmsMatrix
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fancypantalons-master'

Browse Source
pull/60/head
Gerben Droogers 5 years ago
parent a94966e018 780d78bae5
commit 63d1bd9f80
6 changed files with 136 additions and 41 deletions
Show Stats Download Patch File Download Diff File

36
app/build.gradle
Unescape View File

@ -1,12 +1,15 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'realm-android'
android { android {
compileSdkVersion 26 compileSdkVersion 27
buildToolsVersion '28.0.3' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
applicationId "eu.droogers.smsmatrix" applicationId "eu.droogers.smsmatrix"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 26 targetSdkVersion 27
versionCode 11 versionCode 11
versionName "0.0.11" versionName "0.0.11"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -23,23 +26,32 @@ android {
dir 'libs' dir 'libs'
} }
} }
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
} }
dependencies { dependencies {
implementation 'com.android.support:appcompat-v7:26.0.0' implementation 'com.android.support:appcompat-v7:27.1.1'
compile fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
compile 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile(name: 'matrix-sdk', ext: 'aar') implementation(name: 'matrix-sdk', ext: 'aar')
compile(name: 'olm-sdk', ext: 'aar') implementation(name: 'olm-sdk', ext: 'aar')
compile 'com.squareup.retrofit:retrofit:1.6.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
compile 'com.google.code.gson:gson:2.3' implementation 'com.squareup.retrofit2:retrofit:2.4.0'
compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0' implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
compile 'com.squareup.okhttp:okhttp:2.2.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.facebook.stetho:stetho:1.5.0'
implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
} }

BIN
app/libs/matrix-sdk.aar
View File

Binary file not shown.

BIN
app/libs/olm-sdk.aar
View File

Binary file not shown.

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

@ -6,6 +6,7 @@ import org.matrix.androidsdk.data.MyUser;
import org.matrix.androidsdk.data.RoomState; import org.matrix.androidsdk.data.RoomState;
import org.matrix.androidsdk.listeners.IMXEventListener; import org.matrix.androidsdk.listeners.IMXEventListener;
import org.matrix.androidsdk.rest.model.Event; import org.matrix.androidsdk.rest.model.Event;
import org.matrix.androidsdk.rest.model.MatrixError;
import org.matrix.androidsdk.rest.model.User; import org.matrix.androidsdk.rest.model.User;
import org.matrix.androidsdk.rest.model.bingrules.BingRule; import org.matrix.androidsdk.rest.model.bingrules.BingRule;
@ -69,7 +70,7 @@ public class EventListener implements IMXEventListener {
} }
@Override @Override
public void onEventEncrypted(Event event) { public void onEventSentStateUpdated(Event event) {
} }
@ -83,11 +84,6 @@ public class EventListener implements IMXEventListener {
} }
@Override
public void onFailedSendingEvent(Event event) {
}
@Override @Override
public void onBingRulesUpdate() { public void onBingRulesUpdate() {
@ -100,6 +96,11 @@ public class EventListener implements IMXEventListener {
mx.getUnreadEvents(); mx.getUnreadEvents();
} }
@Override
public void onSyncError(MatrixError matrixError) {
}
@Override @Override
public void onCryptoSyncComplete() { public void onCryptoSyncComplete() {
@ -121,12 +122,12 @@ public class EventListener implements IMXEventListener {
} }
@Override @Override
public void onRoomInitialSyncComplete(String s) { public void onRoomInternalUpdate(String s) {
} }
@Override @Override
public void onRoomInternalUpdate(String s) { public void onNotificationCountUpdate(String s) {
} }
@ -135,6 +136,11 @@ public class EventListener implements IMXEventListener {
} }
@Override
public void onRoomKick(String s) {
}
@Override @Override
public void onReceiptEvent(String s, List<String> list) { public void onReceiptEvent(String s, List<String> list) {
@ -154,4 +160,44 @@ public class EventListener implements IMXEventListener {
public void onToDeviceEvent(Event event) { public void onToDeviceEvent(Event event) {
} }
@Override
public void onNewGroupInvitation(String s) {
}
@Override
public void onJoinGroup(String s) {
}
@Override
public void onLeaveGroup(String s) {
}
@Override
public void onGroupProfileUpdate(String s) {
}
@Override
public void onGroupRoomsListUpdate(String s) {
}
@Override
public void onGroupUsersListUpdate(String s) {
}
@Override
public void onGroupInvitedUsersListUpdate(String s) {
}
@Override
public void onAccountDataUpdated() {
}
} }

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

@ -27,9 +27,10 @@ import org.matrix.androidsdk.listeners.IMXEventListener;
import org.matrix.androidsdk.listeners.MXMediaUploadListener; import org.matrix.androidsdk.listeners.MXMediaUploadListener;
import org.matrix.androidsdk.rest.callback.SimpleApiCallback; import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
import org.matrix.androidsdk.rest.client.LoginRestClient; 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.Event;
import org.matrix.androidsdk.rest.model.MatrixError; import org.matrix.androidsdk.rest.model.MatrixError;
import org.matrix.androidsdk.rest.model.Message; import org.matrix.androidsdk.rest.model.message.Message;
import org.matrix.androidsdk.rest.model.login.Credentials; import org.matrix.androidsdk.rest.model.login.Credentials;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -71,7 +72,10 @@ public class Matrix {
public Matrix(final Context context, String url, String botUsername, String botPassword, String username, String device, String syncDelay, String syncTimeout) { public Matrix(final Context context, String url, String botUsername, String botPassword, String username, String device, String syncDelay, String syncTimeout) {
this.context = context; this.context = context;
hsConfig = new HomeServerConnectionConfig(Uri.parse(url));
HomeServerConnectionConfig.Builder builder = new HomeServerConnectionConfig.Builder();
hsConfig = builder.withHomeServerUri(Uri.parse(url)).build();
realUserid = username; realUserid = username;
deviceName = device; deviceName = device;
@ -84,11 +88,10 @@ public class Matrix {
} }
private void login(String username, String password) { private void login(String username, String password) {
new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, new SimpleApiCallback<Credentials>() { new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, deviceName, new SimpleApiCallback<Credentials>() {
@Override @Override
public void onSuccess(Credentials credentials) { public void onSuccess(Credentials credentials) {
super.onSuccess(credentials);
onLogin(credentials); onLogin(credentials);
} }
@ -119,7 +122,7 @@ public class Matrix {
if (false) { if (false) {
store = new MXFileStore(hsConfig, context); store = new MXFileStore(hsConfig, false, context);
} else { } else {
store = new MXMemoryStore(hsConfig.getCredentials(), context); store = new MXMemoryStore(hsConfig.getCredentials(), context);
} }
@ -128,7 +131,9 @@ public class Matrix {
// NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver(); // NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver();
session = new MXSession(hsConfig, dh, context); MXSession.Builder builder = new MXSession.Builder(hsConfig, dh, context);
session = builder.build();
session.setSyncDelay(syncDelay * 1000); session.setSyncDelay(syncDelay * 1000);
session.setSyncTimeout(syncTimeout * 60 * 1000); session.setSyncTimeout(syncTimeout * 60 * 1000);
Log.e(TAG, "onLogin:" + session.getSyncTimeout()); Log.e(TAG, "onLogin:" + session.getSyncTimeout());
@ -136,7 +141,6 @@ public class Matrix {
if (store.isReady()) { if (store.isReady()) {
session.getDataHandler().checkPermanentStorageData();
session.startEventStream(store.getEventStreamToken()); session.startEventStream(store.getEventStreamToken());
session.getDataHandler().addListener(evLis); session.getDataHandler().addListener(evLis);
} else { } else {
@ -148,7 +152,6 @@ public class Matrix {
@Override @Override
public void onStoreReady(String s) { public void onStoreReady(String s) {
session.getDataHandler().checkPermanentStorageData();
session.startEventStream(store.getEventStreamToken()); session.startEventStream(store.getEventStreamToken());
session.getDataHandler().addListener(evLis); session.getDataHandler().addListener(evLis);
} }
@ -177,11 +180,16 @@ public class Matrix {
if (room == null) { if (room == null) {
if (!type.equals("m.notice")) { if (!type.equals("m.notice")) {
Log.e(TAG, "sendMessage: not found" ); Log.e(TAG, "sendMessage: not found" );
session.createRoomDirectMessage(realUserid, new SimpleApiCallback<String>() { session.createDirectMessageRoom(realUserid, new SimpleApiCallback<String>() {
@Override @Override
public void onSuccess(String info) { public void onSuccess(String info) {
super.onSuccess(info); session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>() {
session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>()); @Override
public void onSuccess(Void aVoid) {
}
});
changeDisplayname(info, getContactName(phoneNumber, context)); changeDisplayname(info, getContactName(phoneNumber, context));
Room room = store.getRoom(info); Room room = store.getRoom(info);
SendMesageToRoom(room, body, type); SendMesageToRoom(room, body, type);
@ -207,7 +215,7 @@ public class Matrix {
) { ) {
String uploadID = String.valueOf(transaction); String uploadID = String.valueOf(transaction);
transaction++; transaction++;
session.getMediasCache().uploadContent( session.getMediaCache().uploadContent(
new ByteArrayInputStream(body), new ByteArrayInputStream(body),
fileName, fileName,
contentType, contentType,
@ -229,7 +237,12 @@ public class Matrix {
room.getRoomId(), room.getRoomId(),
"m.room.message", "m.room.message",
json, json,
new SimpleApiCallback<Event>() new SimpleApiCallback<CreatedEvent>() {
@Override
public void onSuccess(CreatedEvent createdEvent) {
}
}
); );
transaction++; transaction++;
} }
@ -241,17 +254,22 @@ public class Matrix {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("displayname", displayname); params.put("displayname", displayname);
params.put("membership", "join"); params.put("membership", "join");
session.getRoomsApiClient().sendStateEvent(roomId, "m.room.member", session.getMyUserId(), params, new SimpleApiCallback<Void>()); session.getRoomsApiClient().sendStateEvent(roomId, "m.room.member", session.getMyUserId(), params, new SimpleApiCallback<Void>() {
@Override
public void onSuccess(Void aVoid) {
}
});
} }
public void SendMesageToRoom(Room room, String body, String type) { public void SendMesageToRoom(Room room, String body, String type) {
Message msg = new Message(); Message msg = new Message();
msg.body = body; msg.body = body;
msg.msgtype = type; msg.msgtype = type;
session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback<Event>() { session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback<CreatedEvent>() {
@Override @Override
public void onSuccess(Event event) { public void onSuccess(CreatedEvent createdEvent) {
Log.i(TAG, "sendMessage success"); Log.e(TAG, "sendMessage success");
} }
@Override @Override
public void onMatrixError(MatrixError e) { public void onMatrixError(MatrixError e) {
@ -283,7 +301,7 @@ public class Matrix {
} }
public void sendEvent(Event event) { public void sendEvent(Event event) {
if (event.sender.equals(realUserid)) { if ((event.sender != null) && (event.sender.equals(realUserid))) {
Room room = store.getRoom(event.roomId); Room room = store.getRoom(event.roomId);
SmsManager smsManager = SmsManager.getDefault(); SmsManager smsManager = SmsManager.getDefault();
JsonObject json = event.getContent().getAsJsonObject(); JsonObject json = event.getContent().getAsJsonObject();
@ -298,16 +316,31 @@ public class Matrix {
} }
} else if (event.type.equals("m.room.member")) { } else if (event.type.equals("m.room.member")) {
if (json.get("membership").getAsString().equals("leave")) { if (json.get("membership").getAsString().equals("leave")) {
room.leave(new SimpleApiCallback<Void>()); room.leave(new SimpleApiCallback<Void>() {
@Override
public void onSuccess(Void aVoid) {
}
});
} else if (json.get("membership").getAsString().equals("invite")) { } else if (json.get("membership").getAsString().equals("invite")) {
room.join(new SimpleApiCallback<Void>()); room.join(new SimpleApiCallback<Void>() {
@Override
public void onSuccess(Void aVoid) {
}
});
} }
} else { } else {
Log.e(TAG, "sendEvent: Event type not supported "); Log.e(TAG, "sendEvent: Event type not supported ");
} }
room.markAllAsRead(new SimpleApiCallback<Void>()); room.markAllAsRead(new SimpleApiCallback<Void>() {
@Override
public void onSuccess(Void aVoid) {
}
});
} }
} }

4
build.gradle
Unescape View File

@ -1,12 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.3.10'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.realm:realm-gradle-plugin:5.8.0"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

Write Preview
Loading…
Cancel
Save