Remove LoggingTaskListener

- do basic logging in SignalExecutorTask itself Signed-off-by: Arka Prava Basu <arkaprava94@gmail.com>
guardianproject · Mar 21, 2019 · c16e574 · c16e574
1 parent 5721fd7
commit c16e574
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
@@ -28,7 +28,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -48,7 +47,6 @@
 import org.havenapp.main.model.Event;
 import org.havenapp.main.resources.IResourceManager;
 import org.havenapp.main.resources.ResourceManager;
-import org.havenapp.main.service.LoggingTaskListener;
 import org.havenapp.main.service.RemoveDeletedFilesJob;
 import org.havenapp.main.service.SignalSender;
 import org.havenapp.main.ui.EventActivity;
@@ -57,7 +55,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -137,8 +134,6 @@ public void onReceive(Context context, Intent intent) {
 
     private ProgressDialog progressDialog;
 
-    private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -380,7 +375,7 @@ private void testNotifications ()
             ArrayList<String> recip = new ArrayList<>();
             recip.add(preferences.getRemotePhoneNumber());
             sender.sendMessage(recip, resourceManager.getString(R.string.signal_test_message),
-                    null, loggingTaskListener);
+                    null, null);
         }
     }
 }
diff --git a/src/main/java/org/havenapp/main/service/LoggingTaskListener.kt b/src/main/java/org/havenapp/main/service/LoggingTaskListener.kt
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -125,8 +125,6 @@ public void handleMessage(Message msg) {
      */
     private HavenApp mApp = null;
 
-    private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
-
 	/**
 	 * Called on service creation, sends a notification
 	 */
@@ -394,7 +392,7 @@ else if (eventTrigger.getType() == EventTrigger.CAMERA_VIDEO) {
                     attachment = eventTrigger.getPath();
                 }
 
-                sender.sendMessage(recips, alertMessage.toString(), attachment, loggingTaskListener);
+                sender.sendMessage(recips, alertMessage.toString(), attachment, null);
             }
         }
 

diff --git a/src/main/java/org/havenapp/main/service/SignalExecutorTask.kt b/src/main/java/org/havenapp/main/service/SignalExecutorTask.kt
@@ -1,24 +1,32 @@
 package org.havenapp.main.service
 
 import android.os.AsyncTask
+import android.util.Log
 import net.sourceforge.argparse4j.inf.Namespace
 import org.asamk.signal.Main
 
 /**
  * Created by Arka Prava Basu<arkaprava94@gmail.com> on 20/03/19
  **/
+private val TAG = SignalExecutorTask::class.java.simpleName
 class SignalExecutorTask(private val commandMap: HashMap<String, Any>,
                          private val mainSignal: Main,
                          private val listener: TaskResult?)
     : AsyncTask<Unit, Unit, Int>() {
 
+    override fun onPreExecute() {
+        super.onPreExecute()
+        Log.i(TAG, "Requesting with request map $commandMap")
+    }
+
     override fun doInBackground(vararg params: Unit?): Int {
         val namespace = Namespace(commandMap)
         return mainSignal.handleCommands(namespace)
     }
 
     override fun onPostExecute(result: Int) {
         super.onPostExecute(result)
+        Log.i(TAG, "result = $result for request map $commandMap")
         if (result == 0) {
             listener?.onSuccess("Success for request map $commandMap")
         } else {