diff --git a/app/build.gradle b/app/build.gradle
index 4236d52..5271c70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 35
     defaultConfig {
         applicationId "eu.droogers.smsmatrix"
+        namespace "eu.droogers.smsmatrix"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 35
         versionCode 16
         versionName "0.0.16"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -21,36 +21,30 @@ android {
         }
     }
 
-    repositories {
-        flatDir {
-            dir 'libs'
-        }
-    }
-
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility 21
+        targetCompatibility 21
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    testImplementation 'junit:junit:4.13.2'
 
     /************* Matrix SDK management **************/
     implementation 'com.github.Bubu:matrix-android-sdk:v0.9.30-no-webrtc'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     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.google.code.gson:gson:2.11.0'
     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'
diff --git a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java
deleted file mode 100644
index 3288948..0000000
--- a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.content.Context;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.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 <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@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/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.kt b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..39be027
--- /dev/null
+++ b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package eu.droogers.smsmatrix
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    @Throws(Exception::class)
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+
+        Assert.assertEquals("eu.droogers.smsmatrix", appContext.packageName)
+    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b04e089..596f5fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,12 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="eu.droogers.smsmatrix">
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <application
         tools:replace="allowBackup,label"
@@ -18,7 +24,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -26,7 +33,9 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="eu.droogers.smsmatrix.ReceiverListener">
+        <receiver android:name="eu.droogers.smsmatrix.ReceiverListener"
+            android:exported="true"
+            android:permission="android.permission.BROADCAST_SMS">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
             </intent-filter>
@@ -38,7 +47,11 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="eu.droogers.smsmatrix.MatrixService" />
+        <service
+            android:name="eu.droogers.smsmatrix.MatrixService"
+            android:foregroundServiceType="specialUse"
+            android:exported="false"
+            />
 
     </application>
 
diff --git a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
deleted file mode 100644
index f06a2f6..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
+++ /dev/null
@@ -1,204 +0,0 @@
-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.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;
-
-/**
- * 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) {
-//            mx.getUnreadEvents();
-            mx.sendEvent(event);
-        }
-        Log.e(TAG, "onLiveEvent: " + event);
-    }
-
-    @Override
-    public void onLiveEventsChunkProcessed(String s, String s1) {
-
-    }
-
-    @Override
-    public void onBingEvent(Event event, RoomState roomState, BingRule bingRule) {
-
-    }
-
-    @Override
-    public void onEventSentStateUpdated(Event event) {
-
-    }
-
-    @Override
-    public void onEventSent(Event event, String s) {
-
-    }
-
-    @Override
-    public void onEventDecrypted(String s, String s1) {
-
-    }
-
-    @Override
-    public void onBingRulesUpdate() {
-
-    }
-
-    @Override
-    public void onInitialSyncComplete(String s) {
-        loaded = true;
-        mx.onEventStreamLoaded();
-        mx.getUnreadEvents();
-    }
-
-    @Override
-    public void onSyncError(MatrixError matrixError) {
-
-    }
-
-    @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 onRoomInternalUpdate(String s) {
-
-    }
-
-    @Override
-    public void onNotificationCountUpdate(String s) {
-
-    }
-
-    @Override
-    public void onLeaveRoom(String s) {
-
-    }
-
-    @Override
-    public void onRoomKick(String s) {
-
-    }
-
-    @Override
-    public void onReceiptEvent(String s, List<String> list) {
-
-    }
-
-    @Override
-    public void onRoomTagEvent(String s) {
-
-    }
-
-    @Override
-    public void onReadMarkerEvent(String s) {
-
-    }
-
-    @Override
-    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(AccountDataElement accountDataElement) {
-
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/EventListener.kt b/app/src/main/java/eu/droogers/smsmatrix/EventListener.kt
new file mode 100644
index 0000000..66b25d0
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/EventListener.kt
@@ -0,0 +1,132 @@
+package eu.droogers.smsmatrix
+
+import android.util.Log
+import org.matrix.androidsdk.core.model.MatrixError
+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 org.matrix.androidsdk.rest.model.sync.AccountDataElement
+
+/**
+ * Created by gerben on 8-10-17.
+ */
+class EventListener(private val mx: Matrix) : IMXEventListener {
+    private var loaded = false
+
+    override fun onStoreReady() {
+    }
+
+    override fun onPresenceUpdate(event: Event, user: User) {
+    }
+
+    override fun onAccountInfoUpdate(myUser: MyUser) {
+    }
+
+    override fun onIgnoredUsersListUpdate() {
+    }
+
+    override fun onDirectMessageChatRoomsListUpdate() {
+    }
+
+    override fun onLiveEvent(event: Event, roomState: RoomState) {
+        if (loaded) {
+//            mx.getUnreadEvents();
+            mx.sendEvent(event)
+        }
+        Log.e(TAG, "onLiveEvent: $event")
+    }
+
+    override fun onLiveEventsChunkProcessed(s: String, s1: String) {
+    }
+
+    override fun onBingEvent(event: Event, roomState: RoomState, bingRule: BingRule) {
+    }
+
+    override fun onEventSentStateUpdated(event: Event) {
+    }
+
+    override fun onEventSent(event: Event, s: String) {
+    }
+
+    override fun onEventDecrypted(s: String, s1: String) {
+    }
+
+    override fun onBingRulesUpdate() {
+    }
+
+    override fun onInitialSyncComplete(s: String) {
+        loaded = true
+        mx.onEventStreamLoaded()
+        mx.getUnreadEvents()
+    }
+
+    override fun onSyncError(matrixError: MatrixError) {
+    }
+
+    override fun onCryptoSyncComplete() {
+    }
+
+    override fun onNewRoom(s: String) {
+    }
+
+    override fun onJoinRoom(s: String) {
+    }
+
+    override fun onRoomFlush(s: String) {
+    }
+
+    override fun onRoomInternalUpdate(s: String) {
+    }
+
+    override fun onNotificationCountUpdate(s: String) {
+    }
+
+    override fun onLeaveRoom(s: String) {
+    }
+
+    override fun onRoomKick(s: String) {
+    }
+
+    override fun onReceiptEvent(s: String, list: List<String>) {
+    }
+
+    override fun onRoomTagEvent(s: String) {
+    }
+
+    override fun onReadMarkerEvent(s: String) {
+    }
+
+    override fun onToDeviceEvent(event: Event) {
+    }
+
+    override fun onNewGroupInvitation(s: String) {
+    }
+
+    override fun onJoinGroup(s: String) {
+    }
+
+    override fun onLeaveGroup(s: String) {
+    }
+
+    override fun onGroupProfileUpdate(s: String) {
+    }
+
+    override fun onGroupRoomsListUpdate(s: String) {
+    }
+
+    override fun onGroupUsersListUpdate(s: String) {
+    }
+
+    override fun onGroupInvitedUsersListUpdate(s: String) {
+    }
+
+    override fun onAccountDataUpdated(accountDataElement: AccountDataElement) {
+    }
+
+    companion object {
+        private const val TAG = "EventListener"
+    }
+}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.java b/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.java
deleted file mode 100644
index 76c9764..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.provider.Telephony;
-import android.util.Log;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class MMSMonitor {
-    private MatrixService mainActivity;
-    private ContentResolver contentResolver = null;
-    private Context mainContext;
-    private Handler mmshandler = null;
-    private ContentObserver mmsObserver = null;
-    public boolean monitorStatus = false;
-    private int mmsCount = 0;
-    private static final String TAG = "MMSMonitor";
-
-    public MMSMonitor(final MatrixService mainActivity, final Context mainContext) {
-        this.mainActivity = mainActivity;
-        contentResolver = mainActivity.getContentResolver();
-        this.mainContext = mainContext;
-        mmshandler = new MMSHandler();
-        mmsObserver = new MMSObserver(mmshandler);
-        Log.i(TAG, "***** Start MMS Monitor *****");
-    }
-
-
-    public void startMMSMonitoring() {
-        try {
-            monitorStatus = false;
-            if (!monitorStatus) {
-                contentResolver.registerContentObserver(
-                    Uri.parse("content://mms"),
-                    true,
-                    mmsObserver
-                );
-
-                // Save the count of MMS messages on start-up.
-                Uri uriMMSURI = Uri.parse("content://mms-sms");
-                Cursor mmsCur = mainActivity.getContentResolver().query(
-                    uriMMSURI,
-                    null,
-                    Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
-                    null,
-                    Telephony.Mms._ID
-                );
-                if (mmsCur != null && mmsCur.getCount() > 0) {
-                    mmsCount = mmsCur.getCount();
-                    Log.d(TAG, "Init MMSCount = " + mmsCount);
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.getMessage());
-        }
-    }
-
-
-    public void stopMMSMonitoring() {
-        try {
-            monitorStatus = false;
-            if (!monitorStatus){
-                contentResolver.unregisterContentObserver(mmsObserver);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.getMessage());
-        }
-    }
-
-
-    class MMSHandler extends Handler {
-        public void handleMessage(final Message msg) {
-            //Log.i(TAG, "Handler");
-        }
-    }
-
-
-    class MMSObserver extends ContentObserver {
-        private Handler mms_handle = null;
-        public MMSObserver(final Handler mmshandle) {
-            super(mmshandle);
-            mms_handle = mmshandle;
-        }
-
-        public void onChange(final boolean bSelfChange) {
-            super.onChange(bSelfChange);
-            Log.i(TAG, "Onchange");
-
-            try {
-                monitorStatus = true;
-
-                // Send message to Activity.
-                Message msg = new Message();
-                mms_handle.sendMessage(msg);
-
-                // Get the MMS count.
-                Uri uriMMSURI = Uri.parse("content://mms/");
-                Cursor mmsCur = mainActivity.getContentResolver().query(
-                    uriMMSURI,
-                    null,
-                    Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
-                    null,
-                    Telephony.Mms._ID
-                );
-
-                int currMMSCount = 0;
-                if (mmsCur != null && mmsCur.getCount() > 0) {
-                    currMMSCount = mmsCur.getCount();
-                }
-
-                // Proceed if there is a new message.
-                if (currMMSCount > mmsCount) {
-                    mmsCount = currMMSCount;
-                    mmsCur.moveToLast();
-
-                    // Get the message id and subject.
-                    String subject = mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms.SUBJECT));
-                    int id = Integer.parseInt(mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms._ID)));
-                    Log.d(TAG, "_id = " + id);
-                    Log.d(TAG, "Subject = " + subject);
-
-                    byte[] mediaData = null;
-                    String message = "";
-                    String address = "";
-                    String fileName = "";
-                    String fileType = "";
-                    String messageType = "";
-
-                    // Get parts.
-                    Uri uriMMSPart = Uri.parse("content://mms/part");
-                    Cursor curPart = mainActivity.getContentResolver().query(
-                        uriMMSPart,
-                        null,
-                        Telephony.Mms.Part.MSG_ID + " = " + id,
-                        null,
-                        Telephony.Mms.Part._ID
-                    );
-                    Log.d(TAG, "Parts records length = " + curPart.getCount());
-                    curPart.moveToLast();
-                    do {
-                        String contentType = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.CONTENT_TYPE));
-                        String partId = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part._ID));
-                        fileName = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.NAME));
-                        Log.d(TAG, "partId = " + partId);
-                        Log.d(TAG, "Part mime type = " + contentType);
-
-                        if (contentType.equalsIgnoreCase("text/plain"))
-                        {
-                            // Get the message.
-
-                            Log.i(TAG,"==== Get the message start ====");
-                            messageType = Matrix.MESSAGE_TYPE_TEXT;
-                            byte[] messageData = readMMSPart(partId);
-                            if (messageData != null && messageData.length > 0) {
-                                message = new String(messageData);
-                            }
-
-                            if (message.isEmpty()) {
-                                Cursor curPart1 = mainActivity.getContentResolver().query(
-                                    uriMMSPart,
-                                    null,
-                                    Telephony.Mms.Part.MSG_ID + " = " + id + " and "+ Telephony.Mms.Part._ID + " = " + partId,
-                                    null,
-                                    Telephony.Mms.Part._ID
-                                );
-                                for (int i = 0; i < curPart1.getColumnCount(); i++)
-                                {
-                                    Log.d(TAG,"Column Name : " + curPart1.getColumnName(i));
-                                }
-                                curPart1.moveToLast();
-                                message = curPart1.getString(13);
-                            }
-                            Log.d(TAG,"Txt Message = " + message);
-                        } else if (isImageType(contentType) || isVideoType(contentType)) {
-                            // Get the media.
-
-                            if (isImageType(contentType)) {
-                                messageType = Matrix.MESSAGE_TYPE_IMAGE;
-                            } else if (isVideoType(contentType)) {
-                                messageType = Matrix.MESSAGE_TYPE_VIDEO;
-                            }
-                            Log.i(TAG, "==== Get the media start ====");
-                            fileType = contentType;
-                            mediaData = readMMSPart(partId);
-                            Log.i(TAG, "Media data length == " + mediaData.length);
-                        }
-                    } while (curPart.moveToPrevious());
-
-
-
-                    // Get the sender's address.
-                    Uri uriMMSAddr = Uri.parse("content://mms/" + id + "/addr");
-                    Cursor addrCur = mainActivity.getContentResolver().query(
-                        uriMMSAddr,
-                        null,
-                        Telephony.Mms.Addr.TYPE + " = 137",     // PduHeaders.FROM
-                        null,
-                        Telephony.Mms.Addr._ID
-                    );
-                    if (addrCur != null) {
-                        addrCur.moveToLast();
-                        do{
-                            Log.d(TAG, "addrCur records length = " + addrCur.getCount());
-                            if (addrCur.getCount() > 0) {
-                                address = addrCur.getString(addrCur.getColumnIndex(Telephony.Mms.Addr.ADDRESS));
-                            }
-                            Log.d(TAG, "address = " + address);
-
-                            if (!message.isEmpty()) {
-                                Utilities.sendMatrix(mainActivity, message, address, messageType);
-                            }
-                            if (mediaData != null) {
-                                Utilities.sendMatrix(
-                                    mainActivity,
-                                    mediaData,
-                                    address,
-                                    messageType,
-                                    fileName,
-                                    fileType
-                                );
-                            }
-                        } while (addrCur.moveToPrevious());
-                    }
-                }
-
-            } catch (Exception e) {
-                Log.e(TAG, e.getMessage());
-            }
-        }
-    }
-
-
-    private byte[] readMMSPart(String partId) {
-        byte[] partData = null;
-        Uri partURI = Uri.parse("content://mms/part/" + partId);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        InputStream is = null;
-
-        try {
-
-            Log.i(TAG,"Entered into readMMSPart try.");
-            ContentResolver mContentResolver = mainActivity.getContentResolver();
-            is = mContentResolver.openInputStream(partURI);
-
-            byte[] buffer = new byte[256];
-            int len = is.read(buffer);
-            while (len >= 0) {
-                baos.write(buffer, 0, len);
-                len = is.read(buffer);
-            }
-            partData = baos.toByteArray();
-            //Log.i(TAG, "Text Msg  :: " + new String(partData));
-
-        } catch (IOException e) {
-            Log.e(TAG, "Exception == Failed to load part data");
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    Log.e(TAG, "Exception :: Failed to close stream");
-                }
-            }
-        }
-        return partData;
-    }
-
-
-    private boolean isImageType(String mime) {
-        boolean result = false;
-        if (mime.equalsIgnoreCase("image/jpg")
-            || mime.equalsIgnoreCase("image/jpeg")
-            || mime.equalsIgnoreCase("image/png")
-            || mime.equalsIgnoreCase("image/gif")
-            || mime.equalsIgnoreCase("image/bmp")) {
-            result = true;
-        }
-        return result;
-    }
-
-
-    private boolean isVideoType(String mime) {
-        boolean result = false;
-        if (mime.equalsIgnoreCase("video/3gpp")
-            || mime.equalsIgnoreCase("video/3gpp2")
-            || mime.equalsIgnoreCase("video/avi")
-            || mime.equalsIgnoreCase("video/mp4")
-            || mime.equalsIgnoreCase("video/mpeg")
-            || mime.equalsIgnoreCase("video/webm")) {
-            result = true;
-        }
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.kt b/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.kt
new file mode 100644
index 0000000..5d1668e
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.kt
@@ -0,0 +1,288 @@
+package eu.droogers.smsmatrix
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Handler
+import android.os.Message
+import android.provider.Telephony
+import android.util.Log
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.util.Objects
+
+class MMSMonitor(private val mainActivity: MatrixService, mainContext: Context?) {
+    private val contentResolver: ContentResolver = mainActivity.contentResolver
+    private val mmsObserver: ContentObserver
+    var monitorStatus: Boolean = false
+    private var mmsCount = 0
+
+    init {
+        val mmshandler: Handler = MMSHandler()
+        mmsObserver = MMSObserver(mmshandler)
+        Log.i(TAG, "***** Start MMS Monitor *****")
+    }
+
+
+    fun startMMSMonitoring() {
+        try {
+            monitorStatus = false
+            contentResolver.registerContentObserver(
+                Uri.parse("content://mms"),
+                true,
+                mmsObserver
+            )
+
+            // Save the count of MMS messages on start-up.
+            val uriMMSURI = Uri.parse("content://mms-sms")
+            val mmsCur = mainActivity.contentResolver.query(
+                uriMMSURI,
+                null,
+                Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
+                null,
+                Telephony.Mms._ID
+            )
+            if (mmsCur != null && mmsCur.count > 0) {
+                mmsCount = mmsCur.count
+                Log.d(TAG, "Init MMSCount = $mmsCount")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, Objects.requireNonNull(e.message))
+        }
+    }
+
+
+    fun stopMMSMonitoring() {
+        try {
+            monitorStatus = false
+            contentResolver.unregisterContentObserver(mmsObserver)
+        } catch (e: Exception) {
+            Log.e(TAG, Objects.requireNonNull(e.message))
+        }
+    }
+
+
+    internal class MMSHandler : Handler() {
+        override fun handleMessage(msg: Message) {
+            //Log.i(TAG, "Handler");
+        }
+    }
+
+
+    internal inner class MMSObserver(private val mms_handle: Handler) : ContentObserver(
+        mms_handle
+    ) {
+        override fun onChange(bSelfChange: Boolean) {
+            super.onChange(bSelfChange)
+            Log.i(TAG, "Onchange")
+
+            try {
+                monitorStatus = true
+
+                // Send message to Activity.
+                val msg = Message()
+                mms_handle.sendMessage(msg)
+
+                // Get the MMS count.
+                val uriMMSURI = Uri.parse("content://mms/")
+                val mmsCur = mainActivity.contentResolver.query(
+                    uriMMSURI,
+                    null,
+                    Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
+                    null,
+                    Telephony.Mms._ID
+                )
+
+                var currMMSCount = 0
+                if (mmsCur != null && mmsCur.count > 0) {
+                    currMMSCount = mmsCur.count
+                }
+
+                // Proceed if there is a new message.
+                if (currMMSCount > mmsCount) {
+                    mmsCount = currMMSCount
+                    checkNotNull(mmsCur)
+                    mmsCur.moveToLast()
+
+                    // Get the message id and subject.
+                    val subject = mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms.SUBJECT))
+                    val id = mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms._ID)).toInt()
+                    Log.d(TAG, "_id = $id")
+                    Log.d(TAG, "Subject = $subject")
+
+                    var mediaData: ByteArray? = null
+                    var message = ""
+                    var address = ""
+                    var fileName: String
+                    var fileType = ""
+                    var messageType = ""
+
+                    // Get parts.
+                    val uriMMSPart = Uri.parse("content://mms/part")
+                    val curPart = checkNotNull(
+                        mainActivity.contentResolver.query(
+                            uriMMSPart,
+                            null,
+                            Telephony.Mms.Part.MSG_ID + " = " + id,
+                            null,
+                            Telephony.Mms.Part._ID
+                        )
+                    )
+                    Log.d(TAG, "Parts records length = " + curPart.count)
+                    curPart.moveToLast()
+                    do {
+                        val contentType =
+                            curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.CONTENT_TYPE))
+                        val partId =
+                            curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part._ID))
+                        fileName =
+                            curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.NAME))
+                        Log.d(TAG, "partId = $partId")
+                        Log.d(
+                            TAG,
+                            "Part mime type = $contentType"
+                        )
+
+                        if (contentType.equals("text/plain", ignoreCase = true)) {
+                            // Get the message.
+
+                            Log.i(TAG, "==== Get the message start ====")
+                            messageType = Matrix.MESSAGE_TYPE_TEXT
+                            val messageData = readMMSPart(partId)
+                            if (messageData != null && messageData.size > 0) {
+                                message = String(messageData)
+                            }
+
+                            if (message.isEmpty()) {
+                                val curPart1 = mainActivity.contentResolver.query(
+                                    uriMMSPart,
+                                    null,
+                                    Telephony.Mms.Part.MSG_ID + " = " + id + " and " + Telephony.Mms.Part._ID + " = " + partId,
+                                    null,
+                                    Telephony.Mms.Part._ID
+                                )
+                                for (i in 0..<Objects.requireNonNull(curPart1).columnCount) {
+                                    Log.d(TAG, "Column Name : " + curPart1!!.getColumnName(i))
+                                }
+                                curPart1!!.moveToLast()
+                                message = curPart1.getString(13)
+                            }
+                            Log.d(TAG, "Txt Message = $message")
+                        } else if (isImageType(contentType) || isVideoType(contentType)) {
+                            // Get the media.
+
+                            if (isImageType(contentType)) {
+                                messageType = Matrix.MESSAGE_TYPE_IMAGE
+                            } else if (isVideoType(contentType)) {
+                                messageType = Matrix.MESSAGE_TYPE_VIDEO
+                            }
+                            Log.i(TAG, "==== Get the media start ====")
+                            fileType = contentType
+                            mediaData = readMMSPart(partId)
+                            Log.i(TAG, "Media data length == " + mediaData!!.size)
+                        }
+                    } while (curPart.moveToPrevious())
+
+
+                    // Get the sender's address.
+                    val uriMMSAddr = Uri.parse("content://mms/$id/addr")
+                    val addrCur = mainActivity.contentResolver.query(
+                        uriMMSAddr,
+                        null,
+                        Telephony.Mms.Addr.TYPE + " = 137",  // PduHeaders.FROM
+                        null,
+                        Telephony.Mms.Addr._ID
+                    )
+                    if (addrCur != null) {
+                        addrCur.moveToLast()
+                        do {
+                            Log.d(TAG, "addrCur records length = " + addrCur.count)
+                            if (addrCur.count > 0) {
+                                address =
+                                    addrCur.getString(addrCur.getColumnIndex(Telephony.Mms.Addr.ADDRESS))
+                            }
+                            Log.d(TAG, "address = $address")
+
+                            if (!message.isEmpty()) {
+                                Utilities.sendMatrix(mainActivity, message, address, messageType)
+                            }
+                            if (mediaData != null) {
+                                Utilities.sendMatrix(
+                                    mainActivity,
+                                    mediaData,
+                                    address,
+                                    messageType,
+                                    fileName,
+                                    fileType
+                                )
+                            }
+                        } while (addrCur.moveToPrevious())
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, Objects.requireNonNull(e.message))
+            }
+        }
+    }
+
+
+    private fun readMMSPart(partId: String): ByteArray? {
+        var partData: ByteArray? = null
+        val partURI = Uri.parse("content://mms/part/$partId")
+        val baos = ByteArrayOutputStream()
+        var `is`: InputStream? = null
+
+        try {
+            Log.i(TAG, "Entered into readMMSPart try.")
+            val mContentResolver = mainActivity.contentResolver
+            `is` = mContentResolver.openInputStream(partURI)
+
+            val buffer = ByteArray(256)
+            checkNotNull(`is`)
+            var len = `is`.read(buffer)
+            while (len >= 0) {
+                baos.write(buffer, 0, len)
+                len = `is`.read(buffer)
+            }
+            partData = baos.toByteArray()
+
+            //Log.i(TAG, "Text Msg  :: " + new String(partData));
+        } catch (e: IOException) {
+            Log.e(TAG, "Exception == Failed to load part data")
+        } finally {
+            if (`is` != null) {
+                try {
+                    `is`.close()
+                } catch (e: IOException) {
+                    Log.e(TAG, "Exception :: Failed to close stream")
+                }
+            }
+        }
+        return partData
+    }
+
+
+    private fun isImageType(mime: String): Boolean {
+        return mime.equals("image/jpg", ignoreCase = true)
+                || mime.equals("image/jpeg", ignoreCase = true)
+                || mime.equals("image/png", ignoreCase = true)
+                || mime.equals("image/gif", ignoreCase = true)
+                || mime.equals("image/bmp", ignoreCase = true)
+    }
+
+
+    private fun isVideoType(mime: String): Boolean {
+        return mime.equals("video/3gpp", ignoreCase = true)
+                || mime.equals("video/3gpp2", ignoreCase = true)
+                || mime.equals("video/avi", ignoreCase = true)
+                || mime.equals("video/mp4", ignoreCase = true)
+                || mime.equals("video/mpeg", ignoreCase = true)
+                || mime.equals("video/webm", ignoreCase = true)
+    }
+
+    companion object {
+        private const val TAG = "MMSMonitor"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java
deleted file mode 100644
index de21cfd..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-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;
-import static android.Manifest.permission.READ_PHONE_STATE;
-import static android.Manifest.permission.READ_SMS;
-import static android.Manifest.permission.RECEIVE_SMS;
-import static android.Manifest.permission.SEND_SMS;
-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;
-    private EditText syncDelay;
-    private EditText syncTimeout;
-    private static final String[] PERMISSIONS_REQUIRED = new String[]{
-        READ_SMS, SEND_SMS, RECEIVE_SMS, READ_PHONE_STATE, READ_CONTACTS, READ_EXTERNAL_STORAGE
-    };
-    private static final int PERMISSION_REQUEST_CODE = 200;
-
-    @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);
-        syncDelay = (EditText) findViewById(R.id.editText_syncDelay);
-        syncTimeout = (EditText) findViewById(R.id.editText_syncTimeout);
-
-        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", ""));
-        syncDelay.setText(sp.getString("syncDelay", "12"));
-        syncTimeout.setText(sp.getString("syncTimeout", "30"));
-
-
-        Button saveButton = (Button) findViewById(R.id.button_save);
-        saveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!checkPermissions()) {
-                    askPermissions();
-                } else {
-                    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.putString("syncDelay", syncDelay.getText().toString());
-                    editor.putString("syncTimeout", syncTimeout.getText().toString());
-                    editor.apply();
-
-                    Log.e(TAG, "onClick: " + botUsername.getText().toString() );
-                    startService();
-                }
-
-            }
-        });
-        if (!checkPermissions()) {
-            askPermissions();
-        } else {
-            startService();
-        }
-    }
-
-    private boolean checkPermissions() {
-        for (String permission: PERMISSIONS_REQUIRED) {
-            int result = ContextCompat.checkSelfPermission(getApplicationContext(), permission);
-            if (result  != PackageManager.PERMISSION_GRANTED) {
-                return false;
-            }
-            Log.i(TAG, "setOnClickListener - result result result" + result);
-        }
-        return true;
-    }
-
-    private void askPermissions() {
-        ActivityCompat.requestPermissions(this, PERMISSIONS_REQUIRED, PERMISSION_REQUEST_CODE);
-    }
-
-
-    private void startService() {
-        Intent intent = new Intent(this, MatrixService.class);
-        startService(intent);
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.kt b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.kt
new file mode 100644
index 0000000..98220d1
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.kt
@@ -0,0 +1,160 @@
+package eu.droogers.smsmatrix
+
+import android.Manifest.permission
+import android.app.Activity
+import android.content.ContentValues
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import java.util.Arrays
+
+class MainActivity : Activity() {
+    private var sp: SharedPreferences? = null
+    private var botUsername: EditText? = null
+    private var botPassword: EditText? = null
+    private var username: EditText? = null
+    private var device: EditText? = null
+    private var hsUrl: EditText? = null
+    private var syncDelay: EditText? = null
+    private var syncTimeout: EditText? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        sp = getSharedPreferences("settings", MODE_PRIVATE)
+        botUsername = findViewById(R.id.editText_botUsername)
+        botPassword = findViewById(R.id.editText_botpassword)
+        username = findViewById(R.id.editText_username)
+        device = findViewById(R.id.editText_device)
+        hsUrl = findViewById(R.id.editText_hsUrl)
+        syncDelay = findViewById(R.id.editText_syncDelay)
+        syncTimeout = findViewById(R.id.editText_syncTimeout)
+
+        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", ""))
+        syncDelay.setText(sp.getString("syncDelay", "12"))
+        syncTimeout.setText(sp.getString("syncTimeout", "30"))
+
+        val saveButton = findViewById<Button>(R.id.button_save)
+        saveButton.setOnClickListener { v: View? ->
+            if (!checkPermissions()) {
+                askPermissions()
+            } else {
+                saveSettingsAndStartService()
+            }
+        }
+
+        if (!checkPermissions()) {
+            askPermissions()
+        } else {
+            startService()
+        }
+    }
+
+    private fun saveSettingsAndStartService() {
+        val editor = sp!!.edit()
+        editor.putString("botUsername", botUsername!!.text.toString())
+        editor.putString("botPassword", botPassword!!.text.toString())
+        editor.putString("username", username!!.text.toString())
+        editor.putString("device", device!!.text.toString())
+        editor.putString("hsUrl", hsUrl!!.text.toString())
+        editor.putString("syncDelay", syncDelay!!.text.toString())
+        editor.putString("syncTimeout", syncTimeout!!.text.toString())
+        editor.apply()
+
+        Log.e(ContentValues.TAG, "onClick: " + botUsername!!.text.toString())
+        startService()
+    }
+
+    private fun checkPermissions(): Boolean {
+        val requiredPermissions: MutableList<String> =
+            ArrayList(Arrays.asList(*PERMISSIONS_REQUIRED_BASE))
+
+        // Add POST_NOTIFICATIONS permission for Android 13+ (TIRAMISU)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            requiredPermissions.add(permission.POST_NOTIFICATIONS)
+        }
+
+        for (permission in requiredPermissions) {
+            val result = ContextCompat.checkSelfPermission(applicationContext, permission)
+            if (result != PackageManager.PERMISSION_GRANTED) {
+                return false
+            }
+        }
+        return true
+    }
+
+    private fun askPermissions() {
+        val requiredPermissions: MutableList<String> =
+            ArrayList(Arrays.asList(*PERMISSIONS_REQUIRED_BASE))
+
+        // Add POST_NOTIFICATIONS permission for Android 13+ (TIRAMISU)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            requiredPermissions.add(permission.POST_NOTIFICATIONS)
+        }
+
+        ActivityCompat.requestPermissions(
+            this,
+            requiredPermissions.toTypedArray<String>(),
+            PERMISSION_REQUEST_CODE
+        )
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            var allGranted = true
+            for (result in grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    allGranted = false
+                    break
+                }
+            }
+
+            if (allGranted) {
+                saveSettingsAndStartService()
+            } else {
+                Toast.makeText(this, "Required permissions not granted", Toast.LENGTH_LONG).show()
+            }
+        } else {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        }
+    }
+
+    private fun startService() {
+        val intent = Intent(this, MatrixService::class.java)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(intent)
+        } else {
+            startService(intent)
+        }
+    }
+
+    companion object {
+        var mx: Matrix? = null
+        private val PERMISSIONS_REQUIRED_BASE = arrayOf(
+            permission.READ_SMS,
+            permission.SEND_SMS,
+            permission.RECEIVE_SMS,
+            permission.READ_PHONE_STATE,
+            permission.READ_CONTACTS,
+            permission.READ_EXTERNAL_STORAGE
+        )
+        private const val PERMISSION_REQUEST_CODE = 200
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
deleted file mode 100644
index be74969..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
+++ /dev/null
@@ -1,400 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.telephony.SmsManager;
-import android.util.Log;
-import android.widget.Toast;
-
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-import org.json.JSONException;
-
-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.listeners.MXMediaUploadListener;
-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.message.Message;
-import org.matrix.androidsdk.rest.model.login.Credentials;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static android.content.ContentValues.TAG;
-
-/**
- * Created by gerben on 6-10-17.
- */
-
-public class Matrix {
-    private final int syncDelay;
-    private final int syncTimeout;
-    HomeServerConnectionConfig hsConfig;
-    Context context;
-    MXSession session;
-    int transaction;
-    private String tag = "Matrix";
-    private List<NotSendMesage> notSendMesages = new ArrayList<>();
-    MXDataHandler dh;
-    private IMXEventListener evLis;
-    IMXStore store;
-    String deviceName;
-    private String botUsername;
-    private String botHSUrl;
-
-    private String realUserid;
-
-    // Message type constants.
-    public static final String MESSAGE_TYPE_TEXT = "m.text";
-    public static final String MESSAGE_TYPE_IMAGE = "m.image";
-    public static final String MESSAGE_TYPE_VIDEO = "m.video";
-    public static final String MESSAGE_TYPE_NOTICE = "m.notice";
-
-    public Matrix(final Context context, String url, String botUsername, String botPassword, String username, String device, String syncDelay, String syncTimeout) {
-        this.context = context;
-
-        HomeServerConnectionConfig.Builder builder = new HomeServerConnectionConfig.Builder();
-
-        hsConfig = builder.withHomeServerUri(Uri.parse(url)).build();
-
-        realUserid = username;
-        deviceName = device;
-        this.botUsername = botUsername;
-        botHSUrl = url;
-        this.syncDelay = Integer.parseInt(syncDelay);
-        this.syncTimeout = Integer.parseInt(syncTimeout);
-
-        login(botUsername, botPassword);
-    }
-
-    private void login(String username, String password) {
-        new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, deviceName, new SimpleApiCallback<Credentials>() {
-
-            @Override
-            public void onSuccess(Credentials credentials) {
-                onLogin(credentials);
-            }
-
-            @Override
-            public void onMatrixError(MatrixError e) {
-                Log.e(TAG, "onLogin MatrixError" + e);
-            }
-
-            @Override
-            public void onNetworkError(Exception e) {
-                Log.e(TAG, "onLogin Network error" + e);
-            }
-
-            @Override
-            public void onUnexpectedError(Exception e) {
-                Log.e(TAG, "onLogin Unexpected error" + e);
-            }
-        });
-    }
-
-    private void onLogin(Credentials credentials) {
-        hsConfig.setCredentials(credentials);
-        startEventStream();
-    }
-
-    public void startEventStream() {
-        evLis = new EventListener(this);
-
-
-        if (false) {
-            store = new MXFileStore(hsConfig, false, context);
-        } else {
-            store = new MXMemoryStore(hsConfig.getCredentials(), context);
-        }
-
-        dh = new MXDataHandler(store, hsConfig.getCredentials());
-
-//        NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver();
-
-        MXSession.Builder builder = new MXSession.Builder(hsConfig, dh, context);
-
-        session = builder.build();
-        session.setSyncDelay(syncDelay * 1000);
-        session.setSyncTimeout(syncTimeout * 60 * 1000);
-        Log.e(TAG, "onLogin:" + session.getSyncTimeout());
-
-
-
-        if (store.isReady()) {
-            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.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, final String type) {
-        if (session != null && session.isAlive()) {
-            Room room = getRoomByPhonenumber(phoneNumber);
-            if (room == null) {
-                if (!type.equals("m.notice")) {
-                    Log.e(TAG, "sendMessage: not found" );
-                    session.createDirectMessageRoom(realUserid, new SimpleApiCallback<String>() {
-                        @Override
-                        public void onSuccess(String info) {
-                            session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>() {
-                                @Override
-                                public void onSuccess(Void aVoid) {
-
-                                }
-                            });
-
-                            changeDisplayname(info, getContactName(phoneNumber, context));
-                            Room room = store.getRoom(info);
-                            SendMesageToRoom(room, body, type);
-                        }
-                    });
-                }
-            } else {
-                changeDisplayname(room.getRoomId(), getContactName(phoneNumber, context));
-                SendMesageToRoom(room, body, type);
-            }
-        } else {
-            Log.e(tag, "Error with sending message");
-            notSendMesages.add(new NotSendMesage(phoneNumber, body, type));
-        }
-    }
-
-    public void sendFile(
-        final String phoneNumber,
-        final byte[] body,
-        final String type,
-        final String fileName,
-        final String contentType
-    ) {
-        String uploadID = String.valueOf(transaction);
-        transaction++;
-        session.getMediaCache().uploadContent(
-            new ByteArrayInputStream(body),
-            fileName,
-            contentType,
-            uploadID,
-            new MXMediaUploadListener()
-            {
-                @Override
-                public void onUploadComplete(final String uploadId, final String contentUri) {
-                    Room room = getRoomByPhonenumber(phoneNumber);
-                    JsonObject json = new JsonObject();
-                    json.addProperty("body", fileName);
-                    json.addProperty("msgtype", type);
-                    json.addProperty("url", contentUri);
-                    JsonObject info = new JsonObject();
-                    info.addProperty("mimetype", contentType);
-                    json.add("info", info);
-                    session.getRoomsApiClient().sendEventToRoom(
-                        String.valueOf(transaction),
-                        room.getRoomId(),
-                        "m.room.message",
-                        json,
-                        new SimpleApiCallback<CreatedEvent>() {
-                            @Override
-                            public void onSuccess(CreatedEvent createdEvent) {
-
-                            }
-                        }
-                    );
-                    transaction++;
-                }
-            }
-        );
-    }
-
-    private void changeDisplayname(String roomId, String displayname) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("displayname", displayname);
-        params.put("membership", "join");
-        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) {
-        Message msg = new Message();
-        msg.body = body;
-        msg.msgtype = type;
-        session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback<CreatedEvent>() {
-            @Override
-            public void onSuccess(CreatedEvent createdEvent) {
-                    Log.e(TAG, "sendMessage success");
-            }
-            @Override
-            public void onMatrixError(MatrixError e) {
-                Log.e(TAG, "sendMessage MatrixError" + e);
-            }
-            @Override
-            public void onNetworkError(Exception e) {
-                Log.e(TAG, "sendMessage Network error" + e);
-            }
-            @Override
-            public void onUnexpectedError(Exception e) {
-                Log.e(TAG, "sendMessage Unexpected error" + e);
-            }
-        });
-        transaction++;
-    }
-
-    public void getUnreadEvents() {
-        List<String> types = new ArrayList<>();
-        types.add("m.room.message");
-
-        Collection<Room> rooms = store.getRooms();
-        for (Room room : rooms) {
-            List<Event> roomsDirect = store.unreadEvents(room.getRoomId(), types);
-            for (Event event : roomsDirect) {
-                sendEvent(event);
-            }
-        }
-    }
-
-    public void sendEvent(Event event) {
-        if ((event.sender != null) && (event.sender.equals(realUserid))) {
-            Room room = store.getRoom(event.roomId);
-            SmsManager smsManager = SmsManager.getDefault();
-            JsonObject json = event.getContent().getAsJsonObject();
-            
-            if (event.type.equals("m.room.message")) {
-                if (json.get("msgtype").getAsString().equals(MESSAGE_TYPE_TEXT)) {
-                    ArrayList<String> body = smsManager.divideMessage(json.get("body").getAsString());
-                    smsManager.sendMultipartTextMessage(room.getTopic(), null, body, null, null);
-                } else {
-                    ArrayList<String> url = smsManager.divideMessage(session.getContentManager().getDownloadableUrl(json.get("url").getAsString()));
-                    smsManager.sendMultipartTextMessage(room.getTopic(), null, url, null, null);
-                }
-            } else if (event.type.equals("m.room.member")) {
-                if (json.get("membership").getAsString().equals("leave")) {
-                    room.leave(new SimpleApiCallback<Void>() {
-                        @Override
-                        public void onSuccess(Void aVoid) {
-
-                        }
-                    });
-                } else if (json.get("membership").getAsString().equals("invite")) {
-                    room.join(new SimpleApiCallback<Void>() {
-                        @Override
-                        public void onSuccess(Void aVoid) {
-
-                        }
-                    });
-                }
-            } else {
-                Log.e(TAG, "sendEvent: Event type not supported ");
-            }
-
-
-            room.markAllAsRead(new SimpleApiCallback<Void>() {
-                @Override
-                public void onSuccess(Void aVoid) {
-
-                }
-            });
-        }
-    }
-
-
-    public void onEventStreamLoaded() {
-        sendMessageList(notSendMesages);
-        notSendMesages.clear();
-    }
-
-    public void sendMessageList(List<NotSendMesage> messages) {
-        for (NotSendMesage ms : messages) {
-            sendMessage(ms.getPhone(), ms.getBody(), ms.getType());
-        }
-    }
-
-    private Room getRoomByPhonenumber (String number) {
-        Collection<Room> 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;
-    }
-
-    private String getContactName(final String phoneNumber, Context context)
-    {
-        Uri uri=Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,Uri.encode(phoneNumber));
-
-        String[] projection = new String[]{ContactsContract.PhoneLookup.DISPLAY_NAME};
-
-        String contactName="";
-        Cursor cursor=context.getContentResolver().query(uri,projection,null,null,null);
-
-        if (cursor != null) {
-            if(cursor.moveToFirst()) {
-                contactName=cursor.getString(0);
-            }
-            cursor.close();
-        }
-
-        if (contactName.isEmpty()) {
-            contactName = phoneNumber;
-        }
-
-        return contactName;
-    }
-
-    public void destroy() {
-        session.stopEventStream();
-        dh.removeListener(evLis);
-        store.close();
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.kt b/app/src/main/java/eu/droogers/smsmatrix/Matrix.kt
new file mode 100644
index 0000000..20a4af6
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.kt
@@ -0,0 +1,386 @@
+package eu.droogers.smsmatrix
+
+import android.content.ContentValues
+import android.content.Context
+import android.net.Uri
+import android.provider.ContactsContract
+import android.telephony.SmsManager
+import android.util.Log
+import com.google.gson.JsonObject
+import org.matrix.androidsdk.HomeServerConnectionConfig
+import org.matrix.androidsdk.MXDataHandler
+import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.callback.SimpleApiCallback
+import org.matrix.androidsdk.core.model.MatrixError
+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.listeners.MXMediaUploadListener
+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.login.Credentials
+import org.matrix.androidsdk.rest.model.message.Message
+import java.io.ByteArrayInputStream
+
+/**
+ * Created by gerben on 6-10-17.
+ */
+class Matrix(
+    var context: Context,
+    url: String?,
+    botUsername: String,
+    botPassword: String,
+    username: String,
+    device: String,
+    syncDelay: String,
+    syncTimeout: String
+) {
+    private val syncDelay: Int
+    private val syncTimeout: Int
+    var hsConfig: HomeServerConnectionConfig
+    var session: MXSession? = null
+    var transaction: Int = 0
+    private val notSendMessages: MutableList<NotSendMessage> = ArrayList()
+    var dh: MXDataHandler? = null
+    private var evLis: IMXEventListener? = null
+    var store: IMXStore? = null
+    var deviceName: String
+
+    private val realUserid: String
+
+    init {
+        val builder = HomeServerConnectionConfig.Builder()
+
+        hsConfig = builder.withHomeServerUri(Uri.parse(url)).build()
+
+        realUserid = username
+        deviceName = device
+        this.syncDelay = syncDelay.toInt()
+        this.syncTimeout = syncTimeout.toInt()
+
+        login(botUsername, botPassword)
+    }
+
+    private fun login(username: String, password: String) {
+        LoginRestClient(hsConfig).loginWithUser(
+            username,
+            password,
+            deviceName,
+            deviceName,
+            object : SimpleApiCallback<Credentials?>() {
+                override fun onSuccess(credentials: Credentials) {
+                    onLogin(credentials)
+                }
+
+                override fun onMatrixError(e: MatrixError) {
+                    Log.e(ContentValues.TAG, "onLogin MatrixError$e")
+                }
+
+                override fun onNetworkError(e: Exception) {
+                    Log.e(ContentValues.TAG, "onLogin Network error$e")
+                }
+
+                override fun onUnexpectedError(e: Exception) {
+                    Log.e(ContentValues.TAG, "onLogin Unexpected error$e")
+                }
+            })
+    }
+
+    private fun onLogin(credentials: Credentials) {
+        hsConfig.credentials = credentials
+        startEventStream()
+    }
+
+    fun startEventStream() {
+        evLis = EventListener(this)
+
+
+        store = if (false) {
+            MXFileStore(hsConfig, false, context)
+        } else {
+            MXMemoryStore(hsConfig.credentials, context)
+        }
+
+        dh = MXDataHandler(store, hsConfig.credentials)
+
+        //        NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver();
+        val builder = MXSession.Builder(hsConfig, dh!!, context)
+
+        session = builder.build()
+        session.setSyncDelay(syncDelay * 1000)
+        session.setSyncTimeout(syncTimeout * 60 * 1000)
+        Log.e(ContentValues.TAG, "onLogin:" + session.getSyncTimeout())
+
+
+
+        if (store!!.isReady) {
+            session.startEventStream(store.getEventStreamToken())
+            session.getDataHandler().addListener(evLis)
+        } else {
+            store!!.addMXStoreListener(object : IMXStoreListener {
+                override fun postProcess(s: String) {
+                }
+
+                override fun onStoreReady(s: String) {
+                    session.startEventStream(store.getEventStreamToken())
+                    session.getDataHandler().addListener(evLis)
+                }
+
+                override fun onStoreCorrupted(s: String, s1: String) {
+                    Log.e(ContentValues.TAG, "onStoreCorrupted: $s")
+                }
+
+                override fun onStoreOOM(s: String, s1: String) {
+                }
+
+                override fun onReadReceiptsLoaded(s: String) {
+                }
+            })
+        }
+    }
+
+    fun sendMessage(phoneNumber: String, body: String?, type: String) {
+        if (session != null && session!!.isAlive) {
+            val room = getRoomByPhonenumber(phoneNumber)
+            if (room == null) {
+                if (type != "m.notice") {
+                    Log.e(ContentValues.TAG, "sendMessage: not found")
+                    session!!.createDirectMessageRoom(
+                        realUserid,
+                        object : SimpleApiCallback<String?>() {
+                            override fun onSuccess(info: String) {
+                                session!!.roomsApiClient.updateTopic(
+                                    info,
+                                    phoneNumber,
+                                    object : SimpleApiCallback<Void?>() {
+                                        override fun onSuccess(aVoid: Void) {
+                                        }
+                                    })
+
+                                changeDisplayname(info, getContactName(phoneNumber, context))
+                                val room = store!!.getRoom(info)
+                                SendMessageToRoom(room, body, type)
+                            }
+                        })
+                }
+            } else {
+                changeDisplayname(room.getRoomId(), getContactName(phoneNumber, context))
+                SendMessageToRoom(room, body, type)
+            }
+        } else {
+            val tag = "Matrix"
+            Log.e(tag, "Error with sending message")
+            notSendMessages.add(NotSendMessage(phoneNumber, body, type))
+        }
+    }
+
+    fun sendFile(
+        phoneNumber: String,
+        body: ByteArray?,
+        type: String?,
+        fileName: String?,
+        contentType: String?
+    ) {
+        val uploadID = transaction.toString()
+        transaction++
+        session!!.mediaCache.uploadContent(
+            ByteArrayInputStream(body),
+            fileName,
+            contentType,
+            uploadID,
+            object : MXMediaUploadListener() {
+                override fun onUploadComplete(uploadId: String, contentUri: String) {
+                    val room = getRoomByPhonenumber(phoneNumber)
+                    val json = JsonObject()
+                    json.addProperty("body", fileName)
+                    json.addProperty("msgtype", type)
+                    json.addProperty("url", contentUri)
+                    val info = JsonObject()
+                    info.addProperty("mimetype", contentType)
+                    json.add("info", info)
+                    checkNotNull(room)
+                    session!!.roomsApiClient.sendEventToRoom(
+                        transaction.toString(),
+                        room.getRoomId(),
+                        "m.room.message",
+                        json,
+                        object : SimpleApiCallback<CreatedEvent?>() {
+                            override fun onSuccess(createdEvent: CreatedEvent) {
+                            }
+                        }
+                    )
+                    transaction++
+                }
+            }
+        )
+    }
+
+    private fun changeDisplayname(roomId: String, displayname: String) {
+        val params: MutableMap<String, Any> = HashMap()
+        params["displayname"] = displayname
+        params["membership"] = "join"
+        session!!.roomsApiClient.sendStateEvent(
+            roomId,
+            "m.room.member",
+            session.getMyUserId(),
+            params,
+            object : SimpleApiCallback<Void?>() {
+                override fun onSuccess(aVoid: Void) {
+                }
+            })
+    }
+
+    fun SendMessageToRoom(room: Room, body: String?, type: String?) {
+        val msg = Message()
+        msg.body = body
+        msg.msgtype = type
+        session!!.roomsApiClient.sendMessage(
+            transaction.toString(),
+            room.getRoomId(),
+            msg,
+            object : SimpleApiCallback<CreatedEvent?>() {
+                override fun onSuccess(createdEvent: CreatedEvent) {
+                    Log.e(ContentValues.TAG, "sendMessage success")
+                }
+
+                override fun onMatrixError(e: MatrixError) {
+                    Log.e(ContentValues.TAG, "sendMessage MatrixError$e")
+                }
+
+                override fun onNetworkError(e: Exception) {
+                    Log.e(ContentValues.TAG, "sendMessage Network error$e")
+                }
+
+                override fun onUnexpectedError(e: Exception) {
+                    Log.e(ContentValues.TAG, "sendMessage Unexpected error$e")
+                }
+            })
+        transaction++
+    }
+
+    val unreadEvents: Unit
+        get() {
+            val types: MutableList<String> =
+                ArrayList()
+            types.add("m.room.message")
+
+            val rooms = store!!.rooms
+            for (room in rooms) {
+                val roomsDirect =
+                    store!!.unreadEvents(room.getRoomId(), types)
+                for (event in roomsDirect) {
+                    sendEvent(event)
+                }
+            }
+        }
+
+    fun sendEvent(event: Event) {
+        if ((event.sender != null) && (event.sender == realUserid)) {
+            val room = store!!.getRoom(event.roomId)
+            val smsManager = SmsManager.getDefault()
+            val json: JsonObject = event.getContent().getAsJsonObject()
+
+            if (event.type == "m.room.message") {
+                if (json["msgtype"].asString == MESSAGE_TYPE_TEXT) {
+                    val body = smsManager.divideMessage(json["body"].asString)
+                    smsManager.sendMultipartTextMessage(room.topic, null, body, null, null)
+                } else {
+                    val url = smsManager.divideMessage(
+                        session!!.contentManager.getDownloadableUrl(
+                            json["url"].asString
+                        )
+                    )
+                    smsManager.sendMultipartTextMessage(room.topic, null, url, null, null)
+                }
+            } else if (event.type == "m.room.member") {
+                if (json["membership"].asString == "leave") {
+                    room.leave(object : SimpleApiCallback<Void?>() {
+                        override fun onSuccess(aVoid: Void) {
+                        }
+                    })
+                } else if (json["membership"].asString == "invite") {
+                    room.join(object : SimpleApiCallback<Void?>() {
+                        override fun onSuccess(aVoid: Void) {
+                        }
+                    })
+                }
+            } else {
+                Log.e(ContentValues.TAG, "sendEvent: Event type not supported ")
+            }
+
+
+            room.markAllAsRead(object : SimpleApiCallback<Void?>() {
+                override fun onSuccess(aVoid: Void) {
+                }
+            })
+        }
+    }
+
+
+    fun onEventStreamLoaded() {
+        sendMessageList(notSendMessages)
+        notSendMessages.clear()
+    }
+
+    fun sendMessageList(messages: List<NotSendMessage>) {
+        for (ms in messages) {
+            sendMessage(ms.phone, ms.body, ms.type)
+        }
+    }
+
+    private fun getRoomByPhonenumber(number: String): Room? {
+        val rooms = store!!.rooms
+        Log.e(ContentValues.TAG, "getRoomByPhonenumber: $number")
+        Log.e(ContentValues.TAG, "getRoomByPhonenumber: " + rooms.size)
+        for (room in rooms) {
+            Log.e(ContentValues.TAG, "getRoomByPhonenumber: " + room.topic)
+            if (room.topic != null && room.topic == number) {
+                return room
+            }
+        }
+        return null
+    }
+
+    private fun getContactName(phoneNumber: String, context: Context): String {
+        val uri = Uri.withAppendedPath(
+            ContactsContract.PhoneLookup.CONTENT_FILTER_URI,
+            Uri.encode(phoneNumber)
+        )
+
+        val projection = arrayOf(ContactsContract.PhoneLookup.DISPLAY_NAME)
+
+        var contactName = ""
+        val cursor = context.contentResolver.query(uri, projection, null, null, null)
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                contactName = cursor.getString(0)
+            }
+            cursor.close()
+        }
+
+        if (contactName.isEmpty()) {
+            contactName = phoneNumber
+        }
+
+        return contactName
+    }
+
+    fun destroy() {
+        session!!.stopEventStream()
+        dh!!.removeListener(evLis)
+        store!!.close()
+    }
+
+    companion object {
+        // Message type constants.
+        const val MESSAGE_TYPE_TEXT: String = "m.text"
+        const val MESSAGE_TYPE_IMAGE: String = "m.image"
+        const val MESSAGE_TYPE_VIDEO: String = "m.video"
+        const val MESSAGE_TYPE_NOTICE: String = "m.notice"
+    }
+}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java
deleted file mode 100644
index f8305c5..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.IBinder;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.annotation.RequiresApi;
-import androidx.core.app.NotificationCompat;
-
-/**
- * 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;
-    private String syncDelay;
-    private String syncTimeout;
-    private MMSMonitor mms;
-    private String mChannelId = "";
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
-            if (mChannelId.isEmpty()) {
-                mChannelId = createNotificationChannel("sync", "Sync Service");
-            }
-            NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, mChannelId);
-            Notification notification = notificationBuilder.setOngoing(true)
-                    .setSmallIcon(R.mipmap.ic_launcher)
-                    .setContentText(getApplicationInfo().loadLabel(getPackageManager()))
-                    .setPriority(NotificationCompat.PRIORITY_MIN)
-                    .setCategory(Notification.CATEGORY_SERVICE)
-                    .build();
-            startForeground(1, notification);
-        }
-
-        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", "");
-        syncDelay = sp.getString("syncDelay", "12");
-        syncTimeout = sp.getString("syncTimeout", "60");
-
-        if (mx == null && !botUsername.isEmpty() && !botPassword.isEmpty() && !username.isEmpty() && !device.isEmpty() && !hsUrl.isEmpty() && !syncDelay.isEmpty() && !syncTimeout.isEmpty()) {
-            mx = new Matrix(getApplication(), hsUrl, botUsername, botPassword, username, device, syncDelay, syncTimeout);
-            Log.e(TAG, "onStartCommand: " + hsUrl );
-            Toast.makeText(this, "service starting:", Toast.LENGTH_SHORT).show();
-        } else if (mx == null) {
-            Toast.makeText(this, "Missing Information", Toast.LENGTH_SHORT).show();
-        }
-
-        Log.e(TAG, "onStartCommand: Service");
-
-        String phone = intent.getStringExtra("SendSms_phone");
-        String type = intent.getStringExtra("SendSms_type");
-        if (phone != null) {
-            System.out.println(phone);
-            if (type.equals(Matrix.MESSAGE_TYPE_TEXT) || type.equals(Matrix.MESSAGE_TYPE_NOTICE))
-            {
-                String body = intent.getStringExtra("SendSms_body");
-                mx.sendMessage(phone, body, type);
-            } else if (type.equals(Matrix.MESSAGE_TYPE_IMAGE) || type.equals(Matrix.MESSAGE_TYPE_VIDEO)) {
-                byte[] body = intent.getByteArrayExtra("SendSms_body");
-                String fileName = intent.getStringExtra("SendSms_fileName");
-                String contentType = intent.getStringExtra("SendSms_contentType");
-                mx.sendFile(phone, body, type, fileName, contentType);
-            }
-        }
-
-        if (this.mms == null) {
-            this.mms = new MMSMonitor(this , getApplicationContext());
-            this.mms.startMMSMonitoring();
-        }
-
-        return START_NOT_STICKY;
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private String createNotificationChannel(String channelId, String channelName){
-        NotificationChannel chan = new NotificationChannel(channelId,
-                channelName, NotificationManager.IMPORTANCE_NONE);
-        chan.setLightColor(Color.BLUE);
-        chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-        NotificationManager service = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        service.createNotificationChannel(chan);
-        return channelId;
-    }
-
-    @Override
-    public void onDestroy() {
-        if (mx != null) {
-            mx.destroy();
-        }
-        this.mms.stopMMSMonitoring();
-        this.mms = null;
-        super.onDestroy();
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.kt b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.kt
new file mode 100644
index 0000000..6a9b111
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.kt
@@ -0,0 +1,145 @@
+package eu.droogers.smsmatrix
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.Service
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
+
+/**
+ * Created by gerben on 7-10-17.
+ */
+class MatrixService : Service() {
+    private var mx: Matrix? = null
+    private var mms: MMSMonitor? = null
+    private var mChannelId = ""
+    override fun onCreate() {
+        super.onCreate()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (mChannelId.isEmpty()) {
+                mChannelId = createNotificationChannel("sync", "Sync Service")
+            }
+            val notificationBuilder = NotificationCompat.Builder(this, mChannelId)
+            val notification = notificationBuilder.setOngoing(true)
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setContentTitle("SMS Matrix Bridge") // Add a title
+                .setContentText(applicationInfo.loadLabel(packageManager))
+                .setPriority(NotificationCompat.PRIORITY_MIN)
+                .setCategory(Notification.CATEGORY_SERVICE)
+                .build()
+
+            try {
+                startForeground(1, notification)
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to start foreground service", e)
+                // If we can't start foreground, possibly stop the service
+                stopSelf()
+                return START_NOT_STICKY
+            }
+        }
+
+        val sp = getSharedPreferences("settings", MODE_PRIVATE)
+        val botUsername = sp.getString("botUsername", "")!!
+        val botPassword = sp.getString("botPassword", "")!!
+        val username = sp.getString("username", "")!!
+        val device = sp.getString("device", "")!!
+        val hsUrl = sp.getString("hsUrl", "")!!
+        val syncDelay = sp.getString("syncDelay", "12")!!
+        val syncTimeout = sp.getString("syncTimeout", "60")!!
+
+        val hasValidSettings =
+            !botUsername.isEmpty() && !botPassword.isEmpty() && !username.isEmpty() && !device.isEmpty() && !hsUrl.isEmpty() && !syncDelay.isEmpty() && !syncTimeout.isEmpty()
+
+        if (mx == null && hasValidSettings) {
+            mx = Matrix(
+                application,
+                hsUrl,
+                botUsername,
+                botPassword,
+                username,
+                device,
+                syncDelay,
+                syncTimeout
+            )
+            Log.e(TAG, "onStartCommand: $hsUrl")
+            Toast.makeText(this, "service starting:", Toast.LENGTH_SHORT).show()
+        } else if (mx == null) {
+            Toast.makeText(this, "Missing Information", Toast.LENGTH_SHORT).show()
+            // Return immediately if we don't have valid settings to create the mx object
+            return START_NOT_STICKY
+        }
+
+        Log.e(TAG, "onStartCommand: Service")
+
+        // Process SMS only if we have a valid mx object
+        if (intent != null && mx != null) {
+            val phone = intent.getStringExtra("SendSms_phone")
+            val type = intent.getStringExtra("SendSms_type")
+            if (phone != null && type != null) {
+                if (type == Matrix.MESSAGE_TYPE_TEXT || type == Matrix.MESSAGE_TYPE_NOTICE) {
+                    val body = intent.getStringExtra("SendSms_body")
+                    if (body != null) {
+                        mx!!.sendMessage(phone, body, type)
+                    }
+                } else if (type == Matrix.MESSAGE_TYPE_IMAGE || type == Matrix.MESSAGE_TYPE_VIDEO) {
+                    val body = intent.getByteArrayExtra("SendSms_body")
+                    val fileName = intent.getStringExtra("SendSms_fileName")
+                    val contentType = intent.getStringExtra("SendSms_contentType")
+                    if (body != null && fileName != null && contentType != null) {
+                        mx!!.sendFile(phone, body, type, fileName, contentType)
+                    }
+                }
+            }
+        }
+
+        // Initialize MMS monitor only if we have a valid mx object
+        if (this.mms == null && mx != null) {
+            this.mms = MMSMonitor(this, applicationContext)
+            mms!!.startMMSMonitoring()
+        }
+
+        return START_NOT_STICKY
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private fun createNotificationChannel(channelId: String, channelName: String): String {
+        val chan = NotificationChannel(
+            channelId,
+            channelName, NotificationManager.IMPORTANCE_NONE
+        )
+        chan.lightColor = Color.BLUE
+        chan.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
+        val service = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        service.createNotificationChannel(chan)
+        return channelId
+    }
+
+    override fun onDestroy() {
+        if (mx != null) {
+            mx!!.destroy()
+        }
+        if (this.mms != null) {
+            mms!!.stopMMSMonitoring()
+            this.mms = null
+        }
+        super.onDestroy()
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    companion object {
+        private const val TAG = "MatrixService"
+    }
+}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java b/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java
deleted file mode 100644
index bf4ff09..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.droogers.smsmatrix;
-
-/**
- * Created by gerben on 9-10-17.
- */
-
-class NotSendMesage {
-    private String type;
-    private String phone;
-    private String body;
-
-    public NotSendMesage(String phone, String body, String type) {
-        this.phone = phone;
-        this.body = body;
-        this.type = type;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public String getType() {
-        return type;
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.kt b/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.kt
new file mode 100644
index 0000000..60829a0
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.kt
@@ -0,0 +1,6 @@
+package eu.droogers.smsmatrix
+
+/**
+ * Created by gerben on 9-10-17.
+ */
+internal class NotSendMessage(val phone: String, val body: String, val type: String)
diff --git a/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java b/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java
deleted file mode 100644
index 23431a0..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java
+++ /dev/null
@@ -1,90 +0,0 @@
-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.telephony.TelephonyManager;
-
-import androidx.core.content.ContextCompat;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by gerben on 6-10-17.
- */
-
-public class ReceiverListener extends BroadcastReceiver {
-    private static final String TAG = "ReceiverListener";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")){
-            handleIncomingSMS(context, intent);
-        } else if (intent.getAction().equals("android.intent.action.PHONE_STATE")) {
-            handleIncomingCall(context, intent);
-        }
-        else if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
-            Intent intentServ = new Intent(context, MatrixService.class);
-            ContextCompat.startForegroundService(context, intentServ);
-        }
-    }
-
-    private void handleIncomingSMS(Context context, Intent intent) {
-        Map<String, String> msg = null;
-        SmsMessage[] msgs = null;
-        Bundle bundle = intent.getExtras();
-
-        if (bundle != null && bundle.containsKey("pdus")) {
-            Object[] pdus = (Object[]) bundle.get("pdus");
-
-            if (pdus != null) {
-                int nbrOfpdus = pdus.length;
-                msg = new HashMap<String, String>(nbrOfpdus);
-                msgs = new SmsMessage[nbrOfpdus];
-
-                // Send long SMS of same sender in one message
-                for (int i = 0; i < nbrOfpdus; i++) {
-                    msgs[i] = SmsMessage.createFromPdu((byte[])pdus[i]);
-
-                    String originatinAddress = msgs[i].getOriginatingAddress();
-
-                    // Check if index with number exists
-                    if (!msg.containsKey(originatinAddress)) {
-                        // Index with number doesn't exist
-                        msg.put(msgs[i].getOriginatingAddress(), msgs[i].getMessageBody());
-
-                    } else {
-                        // Number is there.
-                        String previousparts = msg.get(originatinAddress);
-                        String msgString = previousparts + msgs[i].getMessageBody();
-                        msg.put(originatinAddress, msgString);
-                    }
-                }
-            }
-        }
-        for (String originatinAddress : msg.keySet()) {
-            Utilities.sendMatrix(context, msg.get(originatinAddress), originatinAddress, Matrix.MESSAGE_TYPE_TEXT);
-        }
-    }
-
-    private void handleIncomingCall(Context context, Intent intent) {
-        String cal_state = intent.getExtras().getString(TelephonyManager.EXTRA_STATE);
-        String cal_from = intent.getExtras().getString(TelephonyManager.EXTRA_INCOMING_NUMBER);
-        String body = cal_from;
-        switch(cal_state){
-            case "IDLE":
-                body += " end call";
-                break;
-            case "OFFHOOK":
-                body += " answered call";
-                break;
-            case "RINGING":
-                body += " is calling";
-                break;
-        }
-        Utilities.sendMatrix(context, body, cal_from, Matrix.MESSAGE_TYPE_NOTICE);
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.kt b/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.kt
new file mode 100644
index 0000000..0ab5432
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.kt
@@ -0,0 +1,85 @@
+package eu.droogers.smsmatrix
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.telephony.SmsMessage
+import android.telephony.TelephonyManager
+import androidx.core.content.ContextCompat
+import eu.droogers.smsmatrix.MatrixService
+import eu.droogers.smsmatrix.Utilities.sendMatrix
+import java.util.Objects
+
+/**
+ * Created by gerben on 6-10-17.
+ */
+class ReceiverListener : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == "android.provider.Telephony.SMS_RECEIVED") {
+            handleIncomingSMS(context, intent)
+        } else if (intent.action == "android.intent.action.PHONE_STATE") {
+            handleIncomingCall(context, intent)
+        } else if (intent.action == "android.intent.action.BOOT_COMPLETED") {
+            val intentServ = Intent(context, MatrixService::class.java)
+            ContextCompat.startForegroundService(context, intentServ)
+        }
+    }
+
+    private fun handleIncomingSMS(context: Context, intent: Intent) {
+        var msg: MutableMap<String?, String?>? = null
+        val msgs: Array<SmsMessage?>
+        val bundle = intent.extras
+
+        if (bundle != null && bundle.containsKey("pdus")) {
+            val pdus = bundle["pdus"] as Array<Any>?
+
+            if (pdus != null) {
+                val nbrOfpdus = pdus.size
+                msg = HashMap(nbrOfpdus)
+                msgs = arrayOfNulls(nbrOfpdus)
+
+                // Send long SMS of same sender in one message
+                for (i in 0..<nbrOfpdus) {
+                    msgs[i] = SmsMessage.createFromPdu(pdus[i] as ByteArray)
+
+                    val originationAddress = msgs[i].getOriginatingAddress()
+
+                    // Check if index with number exists
+                    if (!msg.containsKey(originationAddress)) {
+                        // Index with number doesn't exist
+                        msg[msgs[i].getOriginatingAddress()] = msgs[i].getMessageBody()
+                    } else {
+                        // Number is there.
+                        val previousparts = msg[originationAddress]
+                        val msgString = previousparts + msgs[i].getMessageBody()
+                        msg[originationAddress] = msgString
+                    }
+                }
+            }
+        }
+        checkNotNull(msg)
+        for (originatinAddress in msg.keys) {
+            sendMatrix(
+                context,
+                msg[originatinAddress], originatinAddress, Matrix.MESSAGE_TYPE_TEXT
+            )
+        }
+    }
+
+    private fun handleIncomingCall(context: Context, intent: Intent) {
+        val cal_state =
+            Objects.requireNonNull(intent.extras).getString(TelephonyManager.EXTRA_STATE)
+        val cal_from = intent.extras!!.getString(TelephonyManager.EXTRA_INCOMING_NUMBER)
+        var body = cal_from
+        when (Objects.requireNonNull(cal_state)) {
+            "IDLE" -> body += " end call"
+            "OFFHOOK" -> body += " answered call"
+            "RINGING" -> body += " is calling"
+        }
+        sendMatrix(context, body, cal_from, Matrix.MESSAGE_TYPE_NOTICE)
+    }
+
+    companion object {
+        private const val TAG = "ReceiverListener"
+    }
+}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/Utilities.java b/app/src/main/java/eu/droogers/smsmatrix/Utilities.java
deleted file mode 100644
index cd2b27e..0000000
--- a/app/src/main/java/eu/droogers/smsmatrix/Utilities.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.content.Context;
-import android.content.Intent;
-
-public class Utilities {
-    public static void sendMatrix(Context context, String body, String phone, String type) {
-        Intent intent = new Intent(context, MatrixService.class);
-        intent.putExtra("SendSms_phone", phone);
-        intent.putExtra("SendSms_body", body);
-        intent.putExtra("SendSms_type", type);
-        context.startService(intent);
-    }
-
-    public static void sendMatrix(Context context, byte[] body, String phone, String type, String fileName, String contentType) {
-        Intent intent = new Intent(context, MatrixService.class);
-        intent.putExtra("SendSms_phone", phone);
-        intent.putExtra("SendSms_body", body);
-        intent.putExtra("SendSms_type", type);
-        intent.putExtra("SendSms_fileName", fileName);
-        intent.putExtra("SendSms_contentType", contentType);
-        context.startService(intent);
-    }
-}
diff --git a/app/src/main/java/eu/droogers/smsmatrix/Utilities.kt b/app/src/main/java/eu/droogers/smsmatrix/Utilities.kt
new file mode 100644
index 0000000..cfbb5fd
--- /dev/null
+++ b/app/src/main/java/eu/droogers/smsmatrix/Utilities.kt
@@ -0,0 +1,33 @@
+package eu.droogers.smsmatrix
+
+import android.content.Context
+import android.content.Intent
+import eu.droogers.smsmatrix.MatrixService
+
+object Utilities {
+    @JvmStatic
+    fun sendMatrix(context: Context, body: String?, phone: String?, type: String?) {
+        val intent = Intent(context, MatrixService::class.java)
+        intent.putExtra("SendSms_phone", phone)
+        intent.putExtra("SendSms_body", body)
+        intent.putExtra("SendSms_type", type)
+        context.startService(intent)
+    }
+
+    fun sendMatrix(
+        context: Context,
+        body: ByteArray?,
+        phone: String?,
+        type: String?,
+        fileName: String?,
+        contentType: String?
+    ) {
+        val intent = Intent(context, MatrixService::class.java)
+        intent.putExtra("SendSms_phone", phone)
+        intent.putExtra("SendSms_body", body)
+        intent.putExtra("SendSms_type", type)
+        intent.putExtra("SendSms_fileName", fileName)
+        intent.putExtra("SendSms_contentType", contentType)
+        context.startService(intent)
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b386f52..5c7d486 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.droogers.smsmatrix.MainActivity"
     android:layout_width="match_parent"
@@ -9,7 +7,7 @@
     android:layout_weight="1">
 <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     tools:layout_editor_absoluteY="0dp"
     tools:layout_editor_absoluteX="0dp">
@@ -27,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:autofillHints=""
         android:ems="10"
         android:hint="botSms"
         android:inputType="textPersonName"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 550f148..dca8b8b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,13 +5,13 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Base.TextAppearance.AppCompat.Subhead"></style>
+    <style name="Base.TextAppearance.AppCompat.Subhead" />
 
-    <style name="Base.TextAppearance.AppCompat"></style>
+    <style name="Base.TextAppearance.AppCompat" />
 
-    <style name="Base.TextAppearance"></style>
+    <style name="Base.TextAppearance" />
 
-    <style name="Base"></style>
+    <style name="Base" />
 
 
 </resources>
diff --git a/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.java b/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.java
deleted file mode 100644
index 25988b0..0000000
--- a/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.kt b/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.kt
new file mode 100644
index 0000000..3ace9ec
--- /dev/null
+++ b/app/src/test/java/eu/droogers/smsmatrix/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package eu.droogers.smsmatrix
+
+import org.junit.Assert
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+class ExampleUnitTest {
+    @Test
+    @Throws(Exception::class)
+    fun addition_isCorrect() {
+        Assert.assertEquals(4, (2 + 2).toLong())
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index cc521ef..8cbb11f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '2.1.20'
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.9.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.realm:realm-gradle-plugin:5.8.0"
+        classpath "io.realm:realm-gradle-plugin:10.19.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,10 +33,10 @@ allprojects {
             }
         }
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7059746..35d0c97 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 03 19:17:08 EDT 2021
+#Tue Apr 22 22:57:51 EDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip