Merge pull request #77 from tobymurray/update-tooling

Update Gradle, Kotlin, and Gradle plug-in for Android
Merge pull request #80 from HammyHavoc/patch-1
2024-10-27 18:24:01 +00:00 · 2023-06-19 21:12:07 +02:00 · 2023-06-19 21:10:55 +02:00 · 2021-07-30 00:05:51 +01:00 · 2021-05-03 19:25:37 -04:00 · 2019-12-04 20:03:03 +01:00
22 changed files with 272 additions and 171 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,9 @@
+/.idea
 *.iml
+*.apk
+app/release/
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/SmsMatrix.iml" filepath="$PROJECT_DIR$/SmsMatrix.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/README.md
+++ b/README.md
@ -1,18 +1,29 @@
+<a href="https://matrix.to/#/#smsmatrix:matrix.org">
+    <img src="https://img.shields.io/badge/Chat-On%20Matrix-green"
+        alt="Chat on Matrix"/>
+</a>
+
 # SmsMatrix
 A simple SMS (text message) &lt;--> Matrix bridge.

 This app bridges all sms messages to matrix. For every (new) text conversation contact the bot will open a private 1:1 room and sends the incoming messages to that room. Any messages sent in that room by the matrix user will then be sent to the contact via SMS.  
 As currently there is no end-to-end encryption implemented in this app, for privacy reasons it is preferable to use it with your own Matrix server. Your data-in-transit however will always be safe as they are encrypted using https over matrix -- provided the Matrix server is configured properly.

+<a href="https://f-droid.org/app/eu.droogers.smsmatrix">
+    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+        alt="Get it on F-Droid" height="80"/>
+</a>
+
 # Set up
- Create a acount on a homeserver
- Install this app
+- Create an account on a homeserver
+- Install this app (apk can be found by [releases](https://github.com/tijder/SmsMatrix/releases) or from [f-droid](https://f-droid.org/app/eu.droogers.smsmatrix))
 - Give the app the app permission
 - Type in the needed info in the app
  - Bot Username: is the username of the just created user
  - Bot Password: is the password of the just created user
  - Homeserver url: is the url of the homeserver where the user is created
-  - Your username: is where you want to forward all yous text message to
+  - Your username: is where you want to forward all your text messages to
  - Devicename: is the devicename wich the api will use
 - Press save
 - Now all your text messages will be bridged
+- [optional] Disable battery optimisations for the app. so the app wont be killed by Android.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,15 +1,18 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'realm-android'

 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 29
+    buildToolsVersion '28.0.3'
    defaultConfig {
        applicationId "eu.droogers.smsmatrix"
        minSdkVersion 23
-        targetSdkVersion 26
-        versionCode 9
-        versionName "0.0.9"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 16
+        versionName "0.0.16"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        release {
@ -23,23 +26,33 @@ android {
            dir 'libs'
        }
    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }

 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'

-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
        exclude group: 'com.android.support', module: 'support-annotations'
    })
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'

-    compile(name: 'matrix-sdk', ext: 'aar')
-    compile(name: 'olm-sdk', ext: 'aar')
+    /************* Matrix SDK management **************/
+    implementation 'com.github.Bubu:matrix-android-sdk:v0.9.30-no-webrtc'

-    compile 'com.squareup.retrofit:retrofit:1.6.1'
-    compile 'com.google.code.gson:gson:2.3'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
+    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.squareup.okhttp3:okhttp:3.12.3'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.3'
+    implementation 'com.facebook.stetho:stetho:1.5.0'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
 }
--- a/app/libs/matrix-sdk.aar
+++ b/app/libs/matrix-sdk.aar
--- a/app/libs/olm-sdk.aar
+++ b/app/libs/olm-sdk.aar
--- a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java
@ -1,8 +1,8 @@
 package eu.droogers.smsmatrix;

 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;

 import org.junit.Test;
 import org.junit.runner.RunWith;
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -7,6 +7,8 @@
    <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" />

    <application
        tools:replace="allowBackup,label"
@ -31,6 +33,9 @@
            <intent-filter>
                <action android:name="android.intent.action.PHONE_STATE" />
            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
        </receiver>

        <service android:name="eu.droogers.smsmatrix.MatrixService" />
--- a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
@ -6,8 +6,10 @@ import org.matrix.androidsdk.data.MyUser;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.listeners.IMXEventListener;
 import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.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;

@ -51,7 +53,7 @@ public class EventListener implements IMXEventListener {

    @Override
    public void onLiveEvent(Event event, RoomState roomState) {
-        if (loaded == true) {
+        if (loaded) {
 //            mx.getUnreadEvents();
            mx.sendEvent(event);
        }
@ -69,12 +71,7 @@ public class EventListener implements IMXEventListener {
    }

    @Override
-    public void onEventEncrypted(Event event) {
-
-    }
-
-    @Override
-    public void onEventDecrypted(Event event) {
+    public void onEventSentStateUpdated(Event event) {

    }

@ -84,7 +81,7 @@ public class EventListener implements IMXEventListener {
    }

    @Override
-    public void onFailedSendingEvent(Event event) {
+    public void onEventDecrypted(String s, String s1) {

    }

@ -100,6 +97,11 @@ public class EventListener implements IMXEventListener {
        mx.getUnreadEvents();
    }

+    @Override
+    public void onSyncError(MatrixError matrixError) {
+
+    }
+
    @Override
    public void onCryptoSyncComplete() {

@ -120,21 +122,26 @@ public class EventListener implements IMXEventListener {

    }

-    @Override
-    public void onRoomInitialSyncComplete(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) {

@ -154,4 +161,44 @@ public class EventListener implements IMXEventListener {
    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) {
+
+    }
 }
--- a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java
@ -1,6 +1,5 @@
 package eu.droogers.smsmatrix;

-import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@ -12,8 +11,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;

 import static android.Manifest.permission.READ_CONTACTS;
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
--- a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
@ -25,10 +25,12 @@ import org.matrix.androidsdk.data.store.MXFileStore;
 import org.matrix.androidsdk.data.store.MXMemoryStore;
 import org.matrix.androidsdk.listeners.IMXEventListener;
 import org.matrix.androidsdk.listeners.MXMediaUploadListener;
-import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.core.callback.SimpleApiCallback;
+import org.matrix.androidsdk.core.model.MatrixError;
 import org.matrix.androidsdk.rest.client.LoginRestClient;
+import org.matrix.androidsdk.rest.model.CreatedEvent;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.login.Credentials;

 import java.io.ByteArrayInputStream;
@ -70,7 +72,10 @@ public class Matrix {

    public Matrix(final Context context, String url, String botUsername, String botPassword, String username, String device, String syncDelay, String syncTimeout) {
        this.context = context;
-        hsConfig = new HomeServerConnectionConfig(Uri.parse(url));
+
+        HomeServerConnectionConfig.Builder builder = new HomeServerConnectionConfig.Builder();
+
+        hsConfig = builder.withHomeServerUri(Uri.parse(url)).build();

        realUserid = username;
        deviceName = device;
@ -83,13 +88,27 @@ public class Matrix {
    }

    private void login(String username, String password) {
-        new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, new SimpleApiCallback<Credentials>() {
+        new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, deviceName, new SimpleApiCallback<Credentials>() {

            @Override
            public void onSuccess(Credentials credentials) {
-                super.onSuccess(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);
+            }
        });
    }

@ -103,7 +122,7 @@ public class Matrix {


        if (false) {
-            store = new MXFileStore(hsConfig, context);
+            store = new MXFileStore(hsConfig, false, context);
        } else {
            store = new MXMemoryStore(hsConfig.getCredentials(), context);
        }
@ -112,7 +131,9 @@ public class Matrix {

 //        NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver();

-        session = new MXSession(hsConfig, dh, context);
+        MXSession.Builder builder = new MXSession.Builder(hsConfig, dh, context);
+
+        session = builder.build();
        session.setSyncDelay(syncDelay * 1000);
        session.setSyncTimeout(syncTimeout * 60 * 1000);
        Log.e(TAG, "onLogin:" + session.getSyncTimeout());
@ -120,7 +141,6 @@ public class Matrix {


        if (store.isReady()) {
-            session.getDataHandler().checkPermanentStorageData();
            session.startEventStream(store.getEventStreamToken());
            session.getDataHandler().addListener(evLis);
        } else {
@ -132,7 +152,6 @@ public class Matrix {

                @Override
                public void onStoreReady(String s) {
-                    session.getDataHandler().checkPermanentStorageData();
                    session.startEventStream(store.getEventStreamToken());
                    session.getDataHandler().addListener(evLis);
                }
@ -161,11 +180,16 @@ public class Matrix {
            if (room == null) {
                if (!type.equals("m.notice")) {
                    Log.e(TAG, "sendMessage: not found" );
-                    session.createRoomDirectMessage(realUserid, new SimpleApiCallback<String>() {
+                    session.createDirectMessageRoom(realUserid, new SimpleApiCallback<String>() {
                        @Override
                        public void onSuccess(String info) {
-                            super.onSuccess(info);
-                            session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>());
+                            session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>() {
+                                @Override
+                                public void onSuccess(Void aVoid) {
+
+                                }
+                            });
+
                            changeDisplayname(info, getContactName(phoneNumber, context));
                            Room room = store.getRoom(info);
                            SendMesageToRoom(room, body, type);
@ -191,7 +215,7 @@ public class Matrix {
    ) {
        String uploadID = String.valueOf(transaction);
        transaction++;
-        session.getMediasCache().uploadContent(
+        session.getMediaCache().uploadContent(
            new ByteArrayInputStream(body),
            fileName,
            contentType,
@ -213,7 +237,12 @@ public class Matrix {
                        room.getRoomId(),
                        "m.room.message",
                        json,
-                        new SimpleApiCallback<Event>()
+                        new SimpleApiCallback<CreatedEvent>() {
+                            @Override
+                            public void onSuccess(CreatedEvent createdEvent) {
+
+                            }
+                        }
                    );
                    transaction++;
                }
@ -225,14 +254,36 @@ public class Matrix {
        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>());
+        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<Event>());
+        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++;
    }

@ -250,7 +301,7 @@ public class Matrix {
    }

    public void sendEvent(Event event) {
-        if (event.sender.equals(realUserid)) {
+        if ((event.sender != null) && (event.sender.equals(realUserid))) {
            Room room = store.getRoom(event.roomId);
            SmsManager smsManager = SmsManager.getDefault();
            JsonObject json = event.getContent().getAsJsonObject();
@ -265,16 +316,31 @@ public class Matrix {
                }
            } else if (event.type.equals("m.room.member")) {
                if (json.get("membership").getAsString().equals("leave")) {
-                    room.leave(new SimpleApiCallback<Void>());
+                    room.leave(new SimpleApiCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void aVoid) {
+
+                        }
+                    });
                } else if (json.get("membership").getAsString().equals("invite")) {
-                    room.join(new SimpleApiCallback<Void>());
+                    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>());
+            room.markAllAsRead(new SimpleApiCallback<Void>() {
+                @Override
+                public void onSuccess(Void aVoid) {
+
+                }
+            });
        }
    }

--- a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java
@ -1,14 +1,22 @@
 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.
 */
@ -24,6 +32,7 @@ public class MatrixService extends Service {
    private String syncDelay;
    private String syncTimeout;
    private MMSMonitor mms;
+    private String mChannelId = "";

    @Override
    public void onCreate() {
@ -32,6 +41,21 @@ public class MatrixService extends Service {

    @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", "");
@ -76,9 +100,22 @@ public class MatrixService extends Service {

    }

+    @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() {
-        mx.destroy();
+        if (mx != null) {
+            mx.destroy();
+        }
        this.mms.stopMMSMonitoring();
        this.mms = null;
        super.onDestroy();
--- a/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java
@ -6,7 +6,9 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.telephony.SmsMessage;
 import android.telephony.TelephonyManager;
-import android.util.Log;
+
+import androidx.core.content.ContextCompat;
+
 import java.util.HashMap;
 import java.util.Map;

@ -24,6 +26,10 @@ public class ReceiverListener extends BroadcastReceiver {
        } 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) {
--- a/build.gradle
+++ b/build.gradle
@ -1,12 +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'
+
    repositories {
-        jcenter()
        google()
+        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "io.realm:realm-gradle-plugin:5.8.0"

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
@ -15,8 +19,21 @@ buildscript {

 allprojects {
    repositories {
-        jcenter()
+        // For Matrix Android SDK.
+        // This has to be declared first, to ensure that Matrix Android SDK library is not downloaded from another repo
+        maven {
+            url 'https://jitpack.io'
+            content {
+                // Use this repo only for matrix SDK library
+                includeGroupByRegex "com\\.github\\.Bubu"
+                // Also add subgroups, due to SDK split into modules
+                includeGroupByRegex "com\\.github\\.Bubu\\.matrix-android-sdk"
+                // And Olm library
+                includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org"
+            }
+        }
        google()
+        jcenter()
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@ -9,6 +9,8 @@

 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m

 # When configured, Gradle will run in incubating parallel mode.
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Fri Nov 16 18:23:47 CET 2018
+#Mon May 03 19:17:08 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
Author	SHA1	Message	Date
tijder	d0810b99b6	Merge pull request #77 from tobymurray/update-tooling Update Gradle, Kotlin, and Gradle plug-in for Android	2023-06-19 21:12:07 +02:00
tijder	8ccbf530dd	Merge pull request #80 from HammyHavoc/patch-1 Fixed typos	2023-06-19 21:10:55 +02:00
Hammy Havoc	17177fc7a9	Fixed typos :- )	2021-07-30 00:05:51 +01:00
Toby Murray	1dc6f435ce	Update Gradle, Kotlin, and Gradle plug-in for Android Trying to build/install this application in a new installation of Android Studio yielded: > Unable to determine application id: com.android.tools.idea.run.ApkProvisionException: Error loading build artifacts from:<snip>\sms-matrix\app\build\outputs\apk\debug\output-metadata.json This updates the versions of applications central to building the Android project to make it compatible. This does not (intentionally, at least) have any functional impact on the application at all. I opted not to jump to Gradle 7.0 as it has just recently been released and increasing 1 major version is change enough for one PR.	2021-05-03 19:25:37 -04:00
tijder	e7f96ba44a	Update to version 0.0.16	2019-12-04 20:03:03 +01:00
Gerben Droogers	820036d483	Fix crash at startup	2019-12-03 22:25:12 +01:00
tijder	072ebeb1b1	Update to version 0.0.15	2019-11-26 16:27:15 +01:00
tijder	c85515c917	Merge pull request #62 from PhieF/master Start on boot and notification on Android O	2019-11-26 16:25:33 +01:00
Phie	fd08bb747a	oreo need a foreground notification (it can be hidden by user)	2019-11-26 09:33:11 +01:00
Phie	faa8984c43	start service on boot	2019-11-26 09:10:28 +01:00
tijder	4471b7221a	Fix typo	2019-10-17 22:22:47 +02:00
tijder	d4912a23e1	Merge pull request #61 from Lindenk/master Fixed typo in readme	2019-10-17 22:21:45 +02:00
Linden Krouse	9cb4a1a371	Fixed typo in readme	2019-10-17 15:57:43 -04:00
tijder	8517eca96c	Update to version 0.0.14	2019-10-14 22:17:12 +02:00
Gerben Droogers	85e79ced3a	Matrix SDK library is now built and hosted by Jitpack	2019-10-14 20:27:15 +02:00
tijder	2b8b3a4e7c	Update to version 0.0.13	2019-10-12 22:27:36 +02:00
tijder	70bd79b95e	Add link to smsmatrix room on matrix	2019-10-12 22:26:08 +02:00
Tulir Asokan	380553bc60	Update to latest matrix-android-sdk (#60 ) * Make it build * Add olm sdk * Make it work * Update other dependencies	2019-10-12 22:21:09 +02:00
tijder	37ba680d0f	Add f-droid info closes #24	2019-02-09 19:53:07 +01:00
Gerben Droogers	c11de44b21	Update to version 0.0.12	2019-02-06 19:04:01 +01:00
Gerben Droogers	63d1bd9f80	Merge branch 'fancypantalons-master'	2019-02-06 18:34:36 +01:00
Gerben Droogers	780d78bae5	Merge with master branch	2019-02-06 18:27:08 +01:00
Gerben Droogers	a94966e018	Update to version 0.0.11	2019-01-27 22:39:46 +01:00
Gerben Droogers	a8f6dda205	Git ignore release apk	2019-01-27 22:37:25 +01:00
Gerben Droogers	0d91b388e2	Update gradle version	2019-01-27 22:21:46 +01:00
Gerben Droogers	e39e083d5a	Remove idea folder from git	2019-01-27 22:18:51 +01:00
untidylamp	1cb24704be	Catch matrix login errors (#39 ) * catch Matrix onLogin errors Catch Matrix errors login and network errors * Catch sms to Matrix errors Catch errors when sending messages to Matrix	2019-01-20 17:52:55 +01:00
Brett Kosinski	575f591c13	Upgrade to matrix-android-sdk 0.9.14. There's a bunch of changes, required, to move to the latest SDK: 1. Update AAR's. The matrix-sdk.aar in this commit was built from the v0.9.14 tag of the matrix-android-sdk git repository. olm-sdk.jar is pulled from the same place. 2. Updates to the build scripts. matrix-android-sdk added kotlin as a dependency, moved to okhttp3, added io.realm, and so on. 3. Code modifications to support new SDK itself. The changes, here, are a grab bag, and you're best off just reading the commit. Of particular note, here, is that LoginRestClient.loginWithUser takes a device name and a device ID, now (the previous API only took a device name). As a wicked had, right now, I'm just using the name as the ID, but I have no doubt that's wrong and this should be cleaned up to include a randomly generated, persisted device ID, as I believe this is used by Synapse to track login sessions.	2018-12-29 16:26:49 -07:00
tijder	6fab08d956	Update README.md	2018-11-20 18:54:26 +01:00
tijder	303f7a8482	Update README.md	2018-11-19 21:14:49 +01:00
Gerben Droogers	24f853a62e	Update to version 0.0.10	2018-11-19 10:57:35 +01:00
Gerben Droogers	2214ba27d5	Fix gradle warning	2018-11-19 10:56:55 +01:00
Gerben Droogers	38b08a7b87	Move jcenter line below google #34	2018-11-19 10:46:46 +01:00