From 1cb24704bef42c771d9ba3fbe14ad5c4b245e89a Mon Sep 17 00:00:00 2001
From: untidylamp <44341286+untidylamp@users.noreply.github.com>
Date: Sun, 20 Jan 2019 16:52:55 +0000
Subject: [PATCH] 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
---
 .../java/eu/droogers/smsmatrix/Matrix.java    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
index b251858..81ab715 100644
--- a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
@@ -28,6 +28,7 @@ import org.matrix.androidsdk.listeners.MXMediaUploadListener;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.client.LoginRestClient;
 import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.rest.model.Message;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 
@@ -90,6 +91,21 @@ public class Matrix {
                 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);
+            }
         });
     }
 
@@ -232,7 +248,24 @@ public class Matrix {
         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<Event>() {
+            @Override
+            public void onSuccess(Event event) {
+                Log.i(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++;
     }