Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Remove LoggingTaskListener

Arka Prava Basuc16e574055de
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 80e9481..13dd71b 100644
--- 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.PorterDuff;
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.database.async.EventInsertAsync;
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 org.havenapp.main.ui.PPAppIntro;
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 class ListActivity extends AppCompatActivity {
private ProgressDialog progressDialog;
- private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -380,7 +375,7 @@ public class ListActivity extends AppCompatActivity {
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
deleted file mode 100644
index 1952199..0000000
--- a/src/main/java/org/havenapp/main/service/LoggingTaskListener.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.havenapp.main.service
-
-import android.util.Log
-
-/**
- * An implementation of [SignalExecutorTask.TaskResult] which just logs the
- * msg on [SignalExecutorTask.TaskResult.onSuccess] and [SignalExecutorTask.TaskResult.onFailure]
- * Created by Arka Prava Basu<[email protected]> on 20/03/19
- **/
-class LoggingTaskListener: SignalExecutorTask.TaskResult {
- override fun onSuccess(msg: String) {
- Log.i(LoggingTaskListener::class.java.simpleName, msg)
- }
-
- override fun onFailure(msg: String) {
- Log.i(LoggingTaskListener::class.java.simpleName, msg)
- }
-}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 1528c38..0977d0f 100644
--- 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 class MonitorService extends Service {
*/
private HavenApp mApp = null;
- private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
-
/**
* Called on service creation, sends a notification
*/
@@ -394,7 +392,7 @@ public class MonitorService extends Service {
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
index 8ff9fe9..88fd160 100644
--- a/src/main/java/org/havenapp/main/service/SignalExecutorTask.kt
+++ b/src/main/java/org/havenapp/main/service/SignalExecutorTask.kt
@@ -1,17 +1,24 @@
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<[email protected]> 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)
@@ -19,6 +26,7 @@ class SignalExecutorTask(private val commandMap: HashMap<String, Any>,
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 {