commit 3bf00e3ed3fc502cfd02b335f82d4cf6f91904ed Author: Gerben Droogers Date: Tue Oct 10 23:26:41 2017 +0200 First commit diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..2e9f574 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,43 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + buildToolsVersion "26.0.1" + defaultConfig { + applicationId "eu.droogers.smsmatrix" + minSdkVersion 23 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + repositories { + flatDir { + dir 'libs' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support.constraint:constraint-layout:1.0.2' + testCompile 'junit:junit:4.12' + + compile(name: 'matrix-sdk', ext: 'aar') + compile(name: 'olm-sdk', ext: 'aar') + + compile 'com.squareup.retrofit:retrofit:1.6.1' + compile 'com.google.code.gson:gson:2.3' + compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0' + compile 'com.squareup.okhttp:okhttp:2.2.0' +} diff --git a/app/libs/matrix-sdk.aar b/app/libs/matrix-sdk.aar new file mode 100644 index 0000000..19eccfe Binary files /dev/null and b/app/libs/matrix-sdk.aar differ diff --git a/app/libs/olm-sdk.aar b/app/libs/olm-sdk.aar new file mode 100644 index 0000000..78f1599 Binary files /dev/null and b/app/libs/olm-sdk.aar differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..3814a85 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/gerben/Android/Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java new file mode 100644 index 0000000..c3704ae --- /dev/null +++ b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package eu.droogers.smsmatrix; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("eu.droogers.smsmatrix", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5eee63f --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..1a3ffbf Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/ic_launcher_round-web.png b/app/src/main/ic_launcher_round-web.png new file mode 100644 index 0000000..1a3ffbf Binary files /dev/null and b/app/src/main/ic_launcher_round-web.png differ diff --git a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java new file mode 100644 index 0000000..164bb10 --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java @@ -0,0 +1,157 @@ +package eu.droogers.smsmatrix; + +import android.util.Log; + +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.User; +import org.matrix.androidsdk.rest.model.bingrules.BingRule; + +import java.util.List; + +/** + * Created by gerben on 8-10-17. + */ + +public class EventListener implements IMXEventListener { + private static final String TAG = "EventListener"; + private boolean loaded = false; + private Matrix mx; + + public EventListener (Matrix mx) { + this.mx = mx; + } + + @Override + public void onStoreReady() { + + } + + @Override + public void onPresenceUpdate(Event event, User user) { + + } + + @Override + public void onAccountInfoUpdate(MyUser myUser) { + + } + + @Override + public void onIgnoredUsersListUpdate() { + + } + + @Override + public void onDirectMessageChatRoomsListUpdate() { + + } + + @Override + public void onLiveEvent(Event event, RoomState roomState) { + if (loaded == true) { +// mx.getUnreadEvents(); + mx.sendEvent(event); + } + Log.e(TAG, "onLiveEvent: " + event + " " + event.getSender() + " : " + event.getContent()); + } + + @Override + public void onLiveEventsChunkProcessed(String s, String s1) { + + } + + @Override + public void onBingEvent(Event event, RoomState roomState, BingRule bingRule) { + + } + + @Override + public void onEventEncrypted(Event event) { + + } + + @Override + public void onEventDecrypted(Event event) { + + } + + @Override + public void onEventSent(Event event, String s) { + + } + + @Override + public void onFailedSendingEvent(Event event) { + + } + + @Override + public void onBingRulesUpdate() { + + } + + @Override + public void onInitialSyncComplete(String s) { + loaded = true; + mx.onEventStreamLoaded(); + mx.getUnreadEvents(); + } + + @Override + public void onCryptoSyncComplete() { + + } + + @Override + public void onNewRoom(String s) { + + } + + @Override + public void onJoinRoom(String s) { + + } + + @Override + public void onRoomFlush(String s) { + + } + + @Override + public void onRoomInitialSyncComplete(String s) { + + } + + @Override + public void onRoomInternalUpdate(String s) { + + } + + @Override + public void onLeaveRoom(String s) { + + } + + @Override + public void onReceiptEvent(String s, List list) { + + } + + @Override + public void onRoomTagEvent(String s) { + + } + + @Override + public void onReadMarkerEvent(String s) { + + } + + @Override + public void onToDeviceEvent(Event event) { + + } +} diff --git a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java new file mode 100644 index 0000000..e38cadf --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java @@ -0,0 +1,66 @@ +package eu.droogers.smsmatrix; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + +import static android.content.ContentValues.TAG; + +public class MainActivity extends Activity { + static Matrix mx; + private SharedPreferences sp; + private EditText botUsername; + private EditText botPassword; + private EditText username; + private EditText device; + private EditText hsUrl; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + sp = getSharedPreferences("settings", Context.MODE_PRIVATE); + botUsername = (EditText) findViewById(R.id.editText_botUsername); + botPassword = (EditText) findViewById(R.id.editText_botpassword); + username = (EditText) findViewById(R.id.editText_username); + device = (EditText) findViewById(R.id.editText_device); + hsUrl = (EditText) findViewById(R.id.editText_hsUrl); + + botUsername.setText(sp.getString("botUsername", "")); + botPassword.setText(sp.getString("botPassword", "")); + username.setText(sp.getString("username", "")); + device.setText(sp.getString("device", "")); + hsUrl.setText(sp.getString("hsUrl", "")); + + + Button saveButton = (Button) findViewById(R.id.button_save); + saveButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sp.edit(); + editor.putString("botUsername", botUsername.getText().toString()); + editor.putString("botPassword", botPassword.getText().toString()); + editor.putString("username", username.getText().toString()); + editor.putString("device", device.getText().toString()); + editor.putString("hsUrl", hsUrl.getText().toString()); + editor.apply(); + + Log.e(TAG, "onClick: " + botUsername.getText().toString() ); + startService(); + } + }); + startService(); + } + + private void startService() { + Intent intent = new Intent(this, MatrixService.class); + startService(intent); + } +} diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java new file mode 100644 index 0000000..21e8357 --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java @@ -0,0 +1,216 @@ +package eu.droogers.smsmatrix; + +import android.content.Context; +import android.net.Uri; +import android.telephony.SmsManager; +import android.util.Log; + +import com.google.gson.JsonElement; + +import org.matrix.androidsdk.HomeServerConnectionConfig; +import org.matrix.androidsdk.MXDataHandler; +import org.matrix.androidsdk.MXSession; +import org.matrix.androidsdk.data.Room; +import org.matrix.androidsdk.data.store.IMXStore; +import org.matrix.androidsdk.data.store.IMXStoreListener; +import org.matrix.androidsdk.data.store.MXFileStore; +import org.matrix.androidsdk.data.store.MXMemoryStore; +import org.matrix.androidsdk.listeners.IMXEventListener; +import org.matrix.androidsdk.rest.callback.SimpleApiCallback; +import org.matrix.androidsdk.rest.client.LoginRestClient; +import org.matrix.androidsdk.rest.model.Event; +import org.matrix.androidsdk.rest.model.Message; +import org.matrix.androidsdk.rest.model.login.Credentials; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static android.content.ContentValues.TAG; + +/** + * Created by gerben on 6-10-17. + */ + +public class Matrix { + HomeServerConnectionConfig hsConfig; + Context context; + MXSession session; + int transaction; + private String tag = "Matrix"; + private List notSendMesages = new ArrayList<>(); + MXDataHandler dh; + private IMXEventListener evLis; + IMXStore store; + String deviceName; + + private String realUserid; + + public Matrix (final Context context, String url, String botUsername, String botPassword, String username, String device) { + this.context = context; + hsConfig = new HomeServerConnectionConfig(Uri.parse(url)); + + realUserid = username; + deviceName = device; + + login(botUsername, botPassword); + } + + private void login(String username, String password) { + new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, new SimpleApiCallback() { + + @Override + public void onSuccess(Credentials credentials) { + super.onSuccess(credentials); + onLogin(credentials); + } + }); + } + + private void onLogin(Credentials credentials) { + hsConfig.setCredentials(credentials); + startEventStream(); + } + + public void startEventStream() { + evLis = new EventListener(this); + + + if (false) { + store = new MXFileStore(hsConfig, context); + } else { + store = new MXMemoryStore(hsConfig.getCredentials(), context); + } + + dh = new MXDataHandler(store, hsConfig.getCredentials()); + +// NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver(); + + session = new MXSession(hsConfig, dh, context); + session.setSyncDelay(12000); + session.setSyncTimeout(30*60*1000); + Log.e(TAG, "onLogin:" + session.getSyncTimeout()); + + + + if (store.isReady()) { + session.getDataHandler().checkPermanentStorageData(); + session.startEventStream(store.getEventStreamToken()); + session.getDataHandler().addListener(evLis); + } else { + store.addMXStoreListener(new IMXStoreListener() { + @Override + public void postProcess(String s) { + + } + + @Override + public void onStoreReady(String s) { + session.getDataHandler().checkPermanentStorageData(); + session.startEventStream(store.getEventStreamToken()); + session.getDataHandler().addListener(evLis); + } + + @Override + public void onStoreCorrupted(String s, String s1) { + Log.e(TAG, "onStoreCorrupted: " + s ); + } + + @Override + public void onStoreOOM(String s, String s1) { + + } + + @Override + public void onReadReceiptsLoaded(String s) { + + } + }); + } + } + + public void sendMessage(final String phoneNumber, final String body) { + if (session != null && session.isAlive()) { + Room room = getRoomByPhonenumber(phoneNumber); + if (room == null) { + Log.e(TAG, "sendMessage: not found" ); + session.createRoomDirectMessage(realUserid, new SimpleApiCallback() { + @Override + public void onSuccess(String info) { + super.onSuccess(info); + session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback()); + SendMesageToRoom(store.getRoom(info), body); + } + }); + } else { + SendMesageToRoom(room, body); + } + } else { + Log.e(tag, "Error with sending message"); + notSendMesages.add(new NotSendMesage(phoneNumber, body)); + } + } + + public void SendMesageToRoom(Room room, String body) { + Message msg = new Message(); + msg.body = body; + msg.msgtype = "m.mesage"; + session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback()); + transaction++; + } + + public void getUnreadEvents() { + List types = new ArrayList<>(); + types.add("m.room.message"); + + Collection rooms = store.getRooms(); + for (Room room : rooms) { + List roomsDirect = store.unreadEvents(room.getRoomId(), types); + for (Event event : roomsDirect) { + sendEvent(event); + } + } + } + + public void sendEvent(Event event) { + if (event.sender.equals(realUserid)) { + Room room = store.getRoom(event.roomId); + JsonElement json = event.getContent(); + String body = json.getAsJsonObject().get("body").getAsString(); + SmsManager smsManager = SmsManager.getDefault(); + smsManager.sendTextMessage(room.getTopic(), null, body, null, null); + room.markAllAsRead(new SimpleApiCallback()); + } + } + + + public void onEventStreamLoaded() { + sendMessageList(notSendMesages); + notSendMesages.clear(); + } + + public void sendMessageList(List messages) { + for (NotSendMesage ms : messages) { + sendMessage(ms.getPhone(), ms.getBody()); + } + } + + public Room getRoomByPhonenumber (String number) { + Collection rooms = store.getRooms(); + Log.e(TAG, "getRoomByPhonenumber: " + number ); + Log.e(TAG, "getRoomByPhonenumber: " + rooms.size() ); + for (Room room : rooms) { + Log.e(TAG, "getRoomByPhonenumber: " + room.getTopic() ); + if (room.getTopic() != null && room.getTopic().equals(number)) { + return room; + } + } + return null; + } + + public void destroy() { + session.stopEventStream(); + dh.removeListener(evLis); + store.close(); + } +} diff --git a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java new file mode 100644 index 0000000..d9b20d0 --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java @@ -0,0 +1,66 @@ +package eu.droogers.smsmatrix; + +import android.app.Service; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.IBinder; +import android.util.Log; +import android.widget.Toast; + +/** + * Created by gerben on 7-10-17. + */ + +public class MatrixService extends Service { + private Matrix mx; + private final String TAG = "MatrixService"; + private String botUsername; + private String botPassword; + private String username; + private String device; + private String hsUrl; + + @Override + public void onCreate() { + super.onCreate(); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + SharedPreferences sp = getSharedPreferences("settings", Context.MODE_PRIVATE); + botUsername = sp.getString("botUsername", ""); + botPassword = sp.getString("botPassword", ""); + username = sp.getString("username", ""); + device = sp.getString("device", ""); + hsUrl = sp.getString("hsUrl", ""); + + if (mx == null && !botUsername.isEmpty() && !botPassword.isEmpty() && !username.isEmpty() && !device.isEmpty() && !hsUrl.isEmpty()) { + mx = new Matrix(getApplication(), hsUrl, botUsername, botPassword, username, device); + Log.e(TAG, "onStartCommand222: " + hsUrl ); + Toast.makeText(this, "service starting:", Toast.LENGTH_SHORT).show(); + } + + Log.e(TAG, "onStartCommand: Service"); + + String phone = intent.getStringExtra("SendSms_phone"); + String body = intent.getStringExtra("SendSms_body"); + if (phone != null) { + mx.sendMessage(phone, body); + } + return START_NOT_STICKY; + + } + + @Override + public void onDestroy() { + mx.destroy(); + super.onDestroy(); + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } +} diff --git a/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java b/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java new file mode 100644 index 0000000..d11d746 --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java @@ -0,0 +1,23 @@ +package eu.droogers.smsmatrix; + +/** + * Created by gerben on 9-10-17. + */ + +class NotSendMesage { + private String phone; + private String body; + + public NotSendMesage(String phone, String body) { + this.phone = phone; + this.body = body; + } + + public String getPhone() { + return phone; + } + + public String getBody() { + return body; + } +} diff --git a/app/src/main/java/eu/droogers/smsmatrix/SmsListener.java b/app/src/main/java/eu/droogers/smsmatrix/SmsListener.java new file mode 100644 index 0000000..150e37a --- /dev/null +++ b/app/src/main/java/eu/droogers/smsmatrix/SmsListener.java @@ -0,0 +1,49 @@ +package eu.droogers.smsmatrix; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.telephony.SmsMessage; +import android.util.Log; + +/** + * Created by gerben on 6-10-17. + */ + +public class SmsListener extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")){ + Bundle bundle = intent.getExtras(); //---get the SMS message passed in--- + SmsMessage[] msgs = null; + String msg_from; + if (bundle != null){ + //---retrieve the SMS message received--- + try{ + Object[] pdus = (Object[]) bundle.get("pdus"); + msgs = new SmsMessage[pdus.length]; + for(int i=0; i + + + + + + + + + + + + + + + + + + + + + + + +