diff --git a/smssync/src/main/java/org/addhen/smssync/net/GoogleDocsHttpClient.java b/smssync/src/main/java/org/addhen/smssync/net/GoogleDocsHttpClient.java index f76bfa258..33d8fb7e7 100644 --- a/smssync/src/main/java/org/addhen/smssync/net/GoogleDocsHttpClient.java +++ b/smssync/src/main/java/org/addhen/smssync/net/GoogleDocsHttpClient.java @@ -17,14 +17,12 @@ package org.addhen.smssync.net; -import android.content.Context; -import android.content.res.Resources; - -import com.squareup.otto.Produce; - import org.addhen.smssync.R; import org.addhen.smssync.util.Util; +import android.content.Context; +import android.content.res.Resources; + import java.util.Locale; /** @@ -74,9 +72,4 @@ public void setServerError(String error, int statusCode) { res.getString(R.string.sending_failed_http_code, statusCode)); Util.logActivities(context, serverError); } - - @Produce - public boolean reloadLog() { - return true; - } } diff --git a/smssync/src/main/java/org/addhen/smssync/net/MessageSyncHttpClient.java b/smssync/src/main/java/org/addhen/smssync/net/MessageSyncHttpClient.java index 605e3c9b8..2b6a35a76 100644 --- a/smssync/src/main/java/org/addhen/smssync/net/MessageSyncHttpClient.java +++ b/smssync/src/main/java/org/addhen/smssync/net/MessageSyncHttpClient.java @@ -16,12 +16,7 @@ */ package org.addhen.smssync.net; -import android.content.Context; -import android.content.res.Resources; -import android.text.TextUtils; - import com.google.gson.Gson; -import com.squareup.otto.Produce; import org.addhen.smssync.R; import org.addhen.smssync.models.Message; @@ -35,6 +30,10 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.protocol.HTTP; +import android.content.Context; +import android.content.res.Resources; +import android.text.TextUtils; + import java.util.Locale; public class MessageSyncHttpClient extends MainHttpClient { @@ -212,11 +211,6 @@ public void setServerSuccessResp(SmssyncResponse smssyncResponse) { this.smssyncResponse = smssyncResponse; } - @Produce - public boolean reloadLog() { - return true; - } - public SyncUrl getSyncUrl() { return syncUrl; } diff --git a/smssync/src/main/java/org/addhen/smssync/services/AutoSyncScheduledService.java b/smssync/src/main/java/org/addhen/smssync/services/AutoSyncScheduledService.java index 33e165f60..1d1b74713 100644 --- a/smssync/src/main/java/org/addhen/smssync/services/AutoSyncScheduledService.java +++ b/smssync/src/main/java/org/addhen/smssync/services/AutoSyncScheduledService.java @@ -17,16 +17,13 @@ package org.addhen.smssync.services; -import android.content.Intent; - -import com.squareup.otto.Produce; - import org.addhen.smssync.App; import org.addhen.smssync.messages.ProcessMessage; import org.addhen.smssync.messages.ProcessSms; -import org.addhen.smssync.state.LogEvent; import org.addhen.smssync.util.ServicesConstants; +import android.content.Intent; + /** * This class handles background services for periodic synchronization of pending messages. * @@ -63,9 +60,4 @@ protected void executeTask(Intent intent) { sendBroadcast(statusIntent); } } - - @Produce - public LogEvent readLogs() { - return new LogEvent(); - } } diff --git a/smssync/src/main/java/org/addhen/smssync/services/CheckTaskScheduledService.java b/smssync/src/main/java/org/addhen/smssync/services/CheckTaskScheduledService.java index a3fccfd58..7ca065ea6 100644 --- a/smssync/src/main/java/org/addhen/smssync/services/CheckTaskScheduledService.java +++ b/smssync/src/main/java/org/addhen/smssync/services/CheckTaskScheduledService.java @@ -17,19 +17,16 @@ package org.addhen.smssync.services; -import android.content.Intent; - -import com.squareup.otto.Produce; - import org.addhen.smssync.App; import org.addhen.smssync.R; import org.addhen.smssync.database.BaseDatabseHelper; import org.addhen.smssync.messages.ProcessMessage; import org.addhen.smssync.messages.ProcessSms; import org.addhen.smssync.models.SyncUrl; -import org.addhen.smssync.state.LogEvent; import org.addhen.smssync.util.Util; +import android.content.Intent; + import java.util.List; public class CheckTaskScheduledService extends SmsSyncServices { @@ -52,7 +49,8 @@ public void executeTask(Intent intent) { public void onFinished(List result) { for (SyncUrl syncUrl : result) { new ProcessMessage(CheckTaskScheduledService.this, - new ProcessSms(CheckTaskScheduledService.this)).performTask(syncUrl); + new ProcessSms(CheckTaskScheduledService.this)) + .performTask(syncUrl); } } @@ -63,9 +61,4 @@ public void onError(Exception exception) { }); } - - @Produce - public LogEvent readLog() { - return new LogEvent(); - } } diff --git a/smssync/src/main/java/org/addhen/smssync/services/SmsReceiverService.java b/smssync/src/main/java/org/addhen/smssync/services/SmsReceiverService.java index 4d70346d0..331f054f7 100644 --- a/smssync/src/main/java/org/addhen/smssync/services/SmsReceiverService.java +++ b/smssync/src/main/java/org/addhen/smssync/services/SmsReceiverService.java @@ -17,6 +17,15 @@ package org.addhen.smssync.services; +import org.addhen.smssync.App; +import org.addhen.smssync.R; +import org.addhen.smssync.controllers.DebugCallbacks; +import org.addhen.smssync.messages.ProcessMessage; +import org.addhen.smssync.messages.ProcessSms; +import org.addhen.smssync.util.Logger; +import org.addhen.smssync.util.ServicesConstants; +import org.addhen.smssync.util.Util; + import android.app.Service; import android.content.Context; import android.content.Intent; @@ -31,18 +40,6 @@ import android.os.Process; import android.telephony.SmsMessage; -import com.squareup.otto.Produce; - -import org.addhen.smssync.App; -import org.addhen.smssync.R; -import org.addhen.smssync.controllers.DebugCallbacks; -import org.addhen.smssync.messages.ProcessMessage; -import org.addhen.smssync.messages.ProcessSms; -import org.addhen.smssync.state.LogEvent; -import org.addhen.smssync.util.Logger; -import org.addhen.smssync.util.ServicesConstants; -import org.addhen.smssync.util.Util; - import java.lang.ref.WeakReference; import java.util.Date; @@ -258,7 +255,8 @@ protected void handleSmsReceived(Intent intent) { log("handleSmsReceived() messagesUuid: " + messagesUuid); // Log received SMS - Util.logActivities(this, getString(R.string.received_msg, msg.getBody(), msg.getPhoneNumber())); + Util.logActivities(this, + getString(R.string.received_msg, msg.getBody(), msg.getPhoneNumber())); // route the sms boolean sent = mProcessMessage.routeSms(msg); @@ -290,17 +288,12 @@ protected void log(String message, Exception ex) { Logger.log(getClass().getName(), message, ex); } - @Produce - public LogEvent reloadLog() { - return new LogEvent(); - } - private static class ServiceHandler extends Handler { private final WeakReference mSmsReceiverService; public ServiceHandler(SmsReceiverService mSmsReceiverService, - Looper looper) { + Looper looper) { super(looper); this.mSmsReceiverService = new WeakReference<>( mSmsReceiverService);