Skip to content

Commit c16e574

Browse files
committed
Remove LoggingTaskListener
- do basic logging in SignalExecutorTask itself Signed-off-by: Arka Prava Basu <[email protected]>
1 parent 5721fd7 commit c16e574

File tree

4 files changed

+10
-27
lines changed

4 files changed

+10
-27
lines changed

src/main/java/org/havenapp/main/ListActivity.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import android.graphics.drawable.Drawable;
2929
import android.os.Build;
3030
import android.os.Bundle;
31-
import android.telephony.SmsManager;
3231
import android.text.TextUtils;
3332
import android.util.Log;
3433
import android.view.Menu;
@@ -48,7 +47,6 @@
4847
import org.havenapp.main.model.Event;
4948
import org.havenapp.main.resources.IResourceManager;
5049
import org.havenapp.main.resources.ResourceManager;
51-
import org.havenapp.main.service.LoggingTaskListener;
5250
import org.havenapp.main.service.RemoveDeletedFilesJob;
5351
import org.havenapp.main.service.SignalSender;
5452
import org.havenapp.main.ui.EventActivity;
@@ -57,7 +55,6 @@
5755

5856
import java.util.ArrayList;
5957
import java.util.List;
60-
import java.util.StringTokenizer;
6158

6259
import androidx.annotation.NonNull;
6360
import androidx.appcompat.app.AppCompatActivity;
@@ -137,8 +134,6 @@ public void onReceive(Context context, Intent intent) {
137134

138135
private ProgressDialog progressDialog;
139136

140-
private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
141-
142137
@Override
143138
protected void onCreate(Bundle savedInstanceState) {
144139
super.onCreate(savedInstanceState);
@@ -380,7 +375,7 @@ private void testNotifications ()
380375
ArrayList<String> recip = new ArrayList<>();
381376
recip.add(preferences.getRemotePhoneNumber());
382377
sender.sendMessage(recip, resourceManager.getString(R.string.signal_test_message),
383-
null, loggingTaskListener);
378+
null, null);
384379
}
385380
}
386381
}

src/main/java/org/havenapp/main/service/LoggingTaskListener.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/java/org/havenapp/main/service/MonitorService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ public void handleMessage(Message msg) {
125125
*/
126126
private HavenApp mApp = null;
127127

128-
private LoggingTaskListener loggingTaskListener = new LoggingTaskListener();
129-
130128
/**
131129
* Called on service creation, sends a notification
132130
*/
@@ -394,7 +392,7 @@ else if (eventTrigger.getType() == EventTrigger.CAMERA_VIDEO) {
394392
attachment = eventTrigger.getPath();
395393
}
396394

397-
sender.sendMessage(recips, alertMessage.toString(), attachment, loggingTaskListener);
395+
sender.sendMessage(recips, alertMessage.toString(), attachment, null);
398396
}
399397
}
400398

src/main/java/org/havenapp/main/service/SignalExecutorTask.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
package org.havenapp.main.service
22

33
import android.os.AsyncTask
4+
import android.util.Log
45
import net.sourceforge.argparse4j.inf.Namespace
56
import org.asamk.signal.Main
67

78
/**
89
* Created by Arka Prava Basu<[email protected]> on 20/03/19
910
**/
11+
private val TAG = SignalExecutorTask::class.java.simpleName
1012
class SignalExecutorTask(private val commandMap: HashMap<String, Any>,
1113
private val mainSignal: Main,
1214
private val listener: TaskResult?)
1315
: AsyncTask<Unit, Unit, Int>() {
1416

17+
override fun onPreExecute() {
18+
super.onPreExecute()
19+
Log.i(TAG, "Requesting with request map $commandMap")
20+
}
21+
1522
override fun doInBackground(vararg params: Unit?): Int {
1623
val namespace = Namespace(commandMap)
1724
return mainSignal.handleCommands(namespace)
1825
}
1926

2027
override fun onPostExecute(result: Int) {
2128
super.onPostExecute(result)
29+
Log.i(TAG, "result = $result for request map $commandMap")
2230
if (result == 0) {
2331
listener?.onSuccess("Success for request map $commandMap")
2432
} else {

0 commit comments

Comments
 (0)