Remove unused code

Alex Baker 13 years ago
parent 8b584788b8
commit 2c6da26d23

@ -5,7 +5,6 @@
*/
package com.todoroo.astrid.actfm.sync;
import android.text.TextUtils;
import android.util.Log;
import com.todoroo.andlib.service.Autowired;
@ -17,7 +16,6 @@ import com.todoroo.andlib.utility.Pair;
import com.todoroo.andlib.utility.Preferences;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpEntity;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.StringBody;
import org.astrid.R;
@ -44,7 +42,6 @@ public class ActFmInvoker {
private static final String APP_ID = "a4732a32859dbcd3e684331acd36432c";
private static final String APP_SECRET = "e389bfc82a0d932332f9a8bd8203735f";
public static final String PROVIDER_GOOGLE = "google";
public static final String PROVIDER_PASSWORD = "password";
private static final int API_VERSION = 7;
@ -148,40 +145,6 @@ public class ActFmInvoker {
}
}
/**
* Invokes API method using HTTP POST
*
* @param method API method to invoke
* @param data data to transmit
* @param getParameters Name/Value pairs. Values will be URL encoded.
* @return response object
*/
public JSONObject post(String method, HttpEntity data, Object... getParameters) throws IOException {
try {
String request = createFetchUrl(null, method, getParameters);
if (SYNC_DEBUG) {
Log.e("act-fm-post", request);
}
String response = restClient.post(request, data);
JSONObject object = new JSONObject(response);
if (SYNC_DEBUG) {
AndroidUtilities.logJSONObject("act-fm-post-response", object);
}
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);
}
}
public JSONObject postSync(String data, MultipartEntity entity, String tok) throws IOException {
try {
String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true);

@ -16,12 +16,10 @@ import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.text.TextUtils;
import android.widget.Toast;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
@ -34,7 +32,6 @@ import com.todoroo.andlib.utility.TodorooPreferenceActivity;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.files.FileExplore;
import com.todoroo.astrid.gcal.CalendarStartupReceiver;
@ -44,7 +41,6 @@ import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.sync.SyncProviderPreferences;
import com.todoroo.astrid.ui.ContactListAdapter;
import com.todoroo.astrid.ui.TaskListFragmentPager;
import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec;
import com.todoroo.astrid.utility.AstridLitePreferenceSpec;
@ -177,8 +173,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
});
addDebugPreferences();
addPreferenceListeners();
disablePremiumPrefs();
@ -327,73 +321,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
}
private void addDebugPreferences() {
if (!Constants.DEBUG) {
return;
}
PreferenceCategory group = new PreferenceCategory(this);
group.setTitle("DEBUG");
getPreferenceScreen().addPreference(group);
Preference preference = new Preference(this);
preference.setTitle("Flush detail cache");
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
database.openForWriting();
Toast.makeText(EditPreferences.this, "" + taskService.clearDetails(Criterion.all),
Toast.LENGTH_LONG).show();
return false;
}
});
group.addPreference(preference);
preference = new Preference(this);
preference.setTitle("Make Lots of Tasks");
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
database.openForWriting();
Task task = new Task();
for (int i = 0; i < 100; i++) {
task.clear();
task.setValue(Task.TITLE, Integer.toString(i));
taskService.save(task);
}
DialogUtilities.okDialog(EditPreferences.this, "done", null);
return false;
}
});
group.addPreference(preference);
preference = new Preference(this);
preference.setTitle("Delete all tasks");
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
database.openForWriting();
taskService.deleteWhere(Criterion.all);
DialogUtilities.okDialog(EditPreferences.this, "done", null);
return false;
}
});
group.addPreference(preference);
preference = new Preference(this);
preference.setTitle("Make lots of contacts");
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
ContactListAdapter.makeLotsOfContacts();
DialogUtilities.okDialog(EditPreferences.this, "done", null);
return false;
}
});
group.addPreference(preference);
}
@Override
public void updatePreferences(final Preference preference, Object value) {
final Resources r = getResources();

@ -8,15 +8,12 @@ package com.todoroo.astrid.ui;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.MergeCursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.AsyncTask;
import android.provider.Contacts;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.view.LayoutInflater;
@ -27,12 +24,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Functions;
import com.todoroo.andlib.sql.Order;
import com.todoroo.andlib.sql.Query;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.service.TagDataService;
@ -146,37 +138,9 @@ public class ContactListAdapter extends CursorAdapter {
String filterParams = constraint == null ? "" : Uri.encode(constraint.toString());
Uri uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, filterParams);
String sort = Email.TIMES_CONTACTED + " DESC LIMIT 20";
Cursor peopleCursor = mContent.query(uri, PEOPLE_PROJECTION,
null, null, sort);
return peopleCursor;
return mContent.query(uri, PEOPLE_PROJECTION, null, null, sort);
}
private final ContentResolver mContent;
/**
* debug method
*/
public static void makeLotsOfContacts() {
ContentResolver cr = ContextManager.getContext().getContentResolver();
ContentValues personValues = new ContentValues();
ContentValues emailValues = new ContentValues();
for (int i = 0; i < 2000; i++) {
personValues.clear();
personValues.put(Contacts.People.NAME, "John " + i + " Doe");
Uri newPersonUri = cr.insert(Contacts.People.CONTENT_URI, personValues);
if (newPersonUri != null) {
emailValues.clear();
Uri emailUri = Uri.withAppendedPath(newPersonUri,
Contacts.People.ContactMethods.CONTENT_DIRECTORY);
emailValues.put(Contacts.ContactMethods.KIND,
Contacts.KIND_EMAIL);
emailValues.put(Contacts.ContactMethods.TYPE,
Contacts.ContactMethods.TYPE_HOME);
emailValues.put(Contacts.ContactMethods.DATA,
"john." + i + ".doe@test.com");
cr.insert(emailUri, emailValues);
}
}
}
}

Loading…
Cancel
Save