From 9e447a805e4f8c71f282397e161bf04c684fc7d3 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 8 Aug 2013 00:32:47 -0500 Subject: [PATCH] Remove unused code --- .../astrid/actfm/CommentsFragment.java | 3 - .../astrid/actfm/sync/ActFmInvoker.java | 36 ------ .../astrid/actfm/sync/ActFmSyncThread.java | 112 ------------------ .../astrid/notes/EditNoteActivity.java | 6 - 4 files changed, 157 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java index 5cc04be4b..a35a96f53 100644 --- a/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java @@ -321,9 +321,6 @@ public abstract class CommentsFragment extends SherlockListFragment { } } } - - @Override - public void runOnErrors(List errors) {/**/} }; @Override diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java index 313aafbe0..9c571f293 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java @@ -8,13 +8,10 @@ package com.todoroo.astrid.actfm.sync; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.RestClient; -import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Pair; import com.todoroo.andlib.utility.Preferences; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.http.entity.mime.MultipartEntity; -import org.apache.http.entity.mime.content.StringBody; import org.astrid.R; import org.json.JSONException; import org.json.JSONObject; @@ -22,7 +19,6 @@ import org.json.JSONObject; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Collections; @@ -133,38 +129,6 @@ public class ActFmInvoker { } } - public JSONObject postSync(String data, MultipartEntity entity, String tok) throws IOException { - try { - String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true); - - Object[] params = {"token", tok, "data", data, "time", timeString}; - - String request = createFetchUrl("api/" + API_VERSION, "synchronize", params); - Charset chars; - try { - chars = Charset.forName("UTF-8"); - } catch (Exception e) { - chars = null; - } - - entity.addPart("token", new StringBody(tok)); - entity.addPart("data", new StringBody(data, chars)); - entity.addPart("time", new StringBody(timeString)); - - String response = restClient.post(request, entity); - JSONObject object = new JSONObject(response); - - if (object.getString("status").equals("error")) { - throw new ActFmServiceException(object.getString("message"), object); - } - return object; - } catch (JSONException e) { - throw new IOException(e.getMessage()); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - } - /** * Creates a URL for invoking an HTTP GET/POST on the given method * diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index e21bfffd8..9d9326465 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -1,14 +1,10 @@ package com.todoroo.astrid.actfm.sync; -import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.v4.app.NotificationCompat; import android.util.Log; import com.todoroo.andlib.data.TodorooCursor; @@ -24,8 +20,6 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.messages.ChangesHappened; import com.todoroo.astrid.actfm.sync.messages.ClientToServerMessage; import com.todoroo.astrid.actfm.sync.messages.NameMaps; -import com.todoroo.astrid.actfm.sync.messages.ReplayOutstandingEntries; -import com.todoroo.astrid.actfm.sync.messages.ReplayTaskListMetadataOutstanding; import com.todoroo.astrid.actfm.sync.messages.TaskListMetadataChangesHappened; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; @@ -43,19 +37,11 @@ import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.data.OutstandingEntry; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.data.TagOutstanding; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadataOutstanding; -import com.todoroo.astrid.data.TaskOutstanding; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.widget.TasksWidget; - -import org.astrid.R; -import org.json.JSONArray; -import org.json.JSONObject; import java.util.Collections; import java.util.HashMap; @@ -102,20 +88,14 @@ public class ActFmSyncThread { @Autowired private TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - private String token; - private boolean syncMigration = false; - private boolean isTimeForBackgroundSync = false; - private final NotificationManager notificationManager; private int notificationId = -1; public static interface SyncMessageCallback { public void runOnSuccess(); - - public void runOnErrors(List errors); } public static enum ModelType { @@ -208,7 +188,6 @@ public class ActFmSyncThread { } public synchronized void setTimeForBackgroundSync(boolean isTimeForBackgroundSync) { - this.isTimeForBackgroundSync = isTimeForBackgroundSync; if (isTimeForBackgroundSync) { synchronized (monitor) { monitor.notifyAll(); @@ -222,12 +201,8 @@ public class ActFmSyncThread { Intent refresh = new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH); ContextManager.getContext().sendBroadcast(refresh); } - - @Override - public void runOnErrors(List errors) {/**/} }; - private void sync() { try { while (true) { @@ -258,70 +233,6 @@ public class ActFmSyncThread { } } - private Map> buildErrorMap(JSONArray errors) { - Map> result = new HashMap>(); - if (errors != null) { - for (int i = 0; i < errors.length(); i++) { - JSONArray error = errors.optJSONArray(i); - if (error != null && error.length() > 0) { - int index = error.optInt(0); - List errorList = result.get(index); - if (errorList == null) { - errorList = new LinkedList(); - result.put(index, errorList); - } - errorList.add(error); - } - } - } - return result; - } - - // Reapplies changes still in the outstanding tables to the local database - // Called after a batch has finished processing - private void replayOutstandingChanges(boolean afterErrors) { - new ReplayOutstandingEntries(Task.class, NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, afterErrors).execute(); - new ReplayOutstandingEntries(TagData.class, NameMaps.TABLE_ID_TAGS, tagDataDao, tagOutstandingDao, afterErrors).execute(); - new ReplayTaskListMetadataOutstanding(taskListMetadataDao, taskListMetadataOutstandingDao, afterErrors).execute(); - } - - private boolean timeForBackgroundSync() { - return isTimeForBackgroundSync; - } - - private void setWidgetSuppression(boolean suppress) { - long date = suppress ? DateUtilities.now() : 0; - TasksWidget.suppressUpdateFlag = date; - - if (date == 0) { - Context context = ContextManager.getContext(); - if (context != null) { - TasksWidget.updateWidgets(context); - } - } - } - - private JSONObject clientVersion = null; - - - private JSONObject getClientVersion() { - if (clientVersion == null) { - try { - PackageManager pm = ContextManager.getContext().getPackageManager(); - PackageInfo pi = pm.getPackageInfo(Constants.PACKAGE, PackageManager.GET_META_DATA); - JSONObject message = new JSONObject(); - message.put(ClientToServerMessage.TYPE_KEY, "ClientVersion"); - message.put("platform", "android"); - message.put("versionName", pi.versionName); - message.put("versionCode", pi.versionCode); - clientVersion = message; - } catch (Exception e) { - Log.e(ERROR_TAG, "Error getting client version", e); - } - } - return clientVersion; - } - public void repopulateQueueFromOutstandingTables() { constructChangesHappenedFromOutstandingTable(Task.class, taskDao, taskOutstandingDao); constructChangesHappenedFromOutstandingTable(TagData.class, tagDataDao, tagOutstandingDao); @@ -353,29 +264,6 @@ public class ActFmSyncThread { } } - private void setupNotification() { - try { - NotificationCompat.Builder builder = new NotificationCompat.Builder(ContextManager.getContext()); - builder.setContentText(ContextManager.getString(R.string.actfm_sync_ongoing)) - .setContentTitle(ContextManager.getString(R.string.app_name)) - .setOngoing(true) - .setSmallIcon(android.R.drawable.stat_notify_sync) - .setContentIntent(PendingIntent.getActivity(ContextManager.getContext().getApplicationContext(), 0, new Intent(), 0)); - - - notificationManager.notify(0, builder.getNotification()); - notificationId = 0; - } catch (Exception e) { - Log.e(ERROR_TAG, "Exception creating notification", e); //$NON-NLS-1$ - } catch (Error e) { - Log.e(ERROR_TAG, "Error creating notification", e); //$NON-NLS-1$ - } - } - - private boolean checkForToken() { - return false; - } - public static class NetworkStateChangedReceiver extends BroadcastReceiver { private static long lastSyncFromNetworkChange = 0; private static final String PREF_LAST_SYNC_FROM_NETWORK_CHANGE = "p_last_sync_from_net_change"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java index 4e53a0c53..fe67a61cc 100644 --- a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -146,9 +146,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } } } - - @Override - public void runOnErrors(List errors) {/**/} }; private static boolean respondToPicture = false; @@ -493,9 +490,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene }); } } - - @Override - public void runOnErrors(List errors) {/**/} }); new FetchHistory(taskDao, Task.HISTORY_FETCH_DATE, Task.HISTORY_HAS_MORE, NameMaps.TABLE_ID_TASKS, task.getUuid(), task.getValue(Task.TITLE), task.getValue(Task.HISTORY_FETCH_DATE), 0, callback).execute();