diff --git a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java index d5450a1d7..4b0e6de8f 100644 --- a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java +++ b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java @@ -7,10 +7,7 @@ package com.todoroo.andlib.data; import android.content.ContentValues; import android.database.Cursor; -import android.util.Log; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; @@ -35,15 +32,8 @@ public class DatabaseDao { private AbstractDatabase database; - @Autowired - protected Boolean debug; - public DatabaseDao(Class modelClass) { - DependencyInjectionService.getInstance().inject(this); this.modelClass = modelClass; - if(debug == null) { - debug = false; - } } /** Gets table associated with this DAO */ @@ -90,9 +80,6 @@ public class DatabaseDao { */ public TodorooCursor query(Query query) { query.from(table); - if(debug) { - Log.i("SQL-" + modelClass.getSimpleName(), query.toString()); //$NON-NLS-1$ - } Cursor cursor = database.rawQuery(query.toString()); return new TodorooCursor<>(cursor, query.getFields()); } diff --git a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java index cfd90b71b..34d2c1c39 100644 --- a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java @@ -118,10 +118,6 @@ public class DependencyInjectionService { // --- default dependency injector private class DefaultDependencyInjector extends AbstractDependencyInjector { - @Override - protected void addInjectables() { - injectables.put("debug", false); - } } // --- static methods diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index ae788290e..e79771af3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -696,15 +696,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable { taskDetailLoader.put(task.getId(), new StringBuilder(task.getDetails())); requestNewDetails(task); - if(Constants.DEBUG) { - System.err.println("Refreshing details: " + task.getId()); //$NON-NLS-1$ - } } continue; - } else if(Constants.DEBUG) { - System.err.println("Forced loading of details: " + task.getId() + //$NON-NLS-1$ - "\n details: " + newDate(task.getDetailsDate()) + //$NON-NLS-1$ - "\n modified: " + newDate(task.getModificationDate())); //$NON-NLS-1$ } addTaskToLoadingArray(task); diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java index c0d530db7..2ac0a699e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java @@ -27,13 +27,10 @@ import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.reminders.ReminderService; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.MetadataService.SynchronizeMetadataCallback; -import com.todoroo.astrid.utility.Constants; import java.util.ArrayList; import java.util.LinkedHashSet; -import static org.tasks.date.DateTimeUtils.newDate; - /** * Provides operations for working with alerts * @@ -190,10 +187,6 @@ public class AlarmService { if(time == 0 || time == NO_ALARM) { am.cancel(pendingIntent); } else if(time > DateUtilities.now()) { - if(Constants.DEBUG) { - Log.e("Astrid", "Alarm (" + taskId + ", " + ReminderService.TYPE_ALARM + - ", " + alarm.getId() + ") set for " + newDate(time)); - } am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java index 04a10acc7..fe41e37ba 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java @@ -9,7 +9,6 @@ import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; @@ -136,9 +135,6 @@ public class CalendarAlarmReceiver extends BroadcastReceiver { includesMe = true; continue; } - if (Constants.DEBUG) { - Log.w(CalendarAlarmScheduler.TAG, "Attendee: " + name + ", email: " + email); - } names.add(name); emails.add(email); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java index 187029aea..d6f4e8a8e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java @@ -7,16 +7,12 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; -import android.util.Log; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.utility.Constants; import org.tasks.R; -import static org.tasks.date.DateTimeUtils.newDate; - public class CalendarAlarmScheduler { public static final String TAG = "calendar-alarm"; @@ -60,10 +56,6 @@ public class CalendarAlarmScheduler { long alarmTime = start - DateUtilities.ONE_MINUTE * 15; am.set(AlarmManager.RTC_WAKEUP, alarmTime, pendingIntent); - - if (Constants.DEBUG) { - Log.w(TAG, "Scheduling calendar alarm for " + newDate(alarmTime)); - } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java index 9445dee14..f72dacbbb 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -8,7 +8,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; @@ -28,7 +27,6 @@ import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagFilterExposer; -import com.todoroo.astrid.utility.Constants; import org.tasks.R; @@ -243,9 +241,6 @@ public class CalendarReminderActivity extends Activity { am.cancel(pendingIntent); long alarmTime = endTime + DateUtilities.ONE_MINUTE * 5; - if (Constants.DEBUG) { - Log.w(CalendarAlarmScheduler.TAG, "Scheduling calendar alarm for " + newDate(alarmTime)); - } am.set(AlarmManager.RTC_WAKEUP, alarmTime, pendingIntent); dismissButton.performClick(); } diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java index d4fce6cf0..798ca53bd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java @@ -18,7 +18,6 @@ import android.net.Uri; import android.os.Bundle; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -397,10 +396,6 @@ public class Notifications extends BroadcastReceiver { } } - if(Constants.DEBUG) { - Log.w("Astrid", "Logging notification: " + text); //$NON-NLS-1$ //$NON-NLS-2$ - } - singleThreadVoicePool.submit(new NotificationRunnable(ringTimes, notificationId, notification, voiceReminder, maxOutVolumeForMultipleRingReminders, audioManager, previousAlarmVolume, text)); if (forceNotificationManager) { diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java index 4b7271fcf..05df45cbe 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Resources; -import android.util.Log; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; @@ -26,7 +25,6 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.utility.Constants; import org.joda.time.DateTime; import org.tasks.R; @@ -474,9 +472,6 @@ public final class ReminderService { time = DateUtilities.now() + 5000L; } - if(Constants.DEBUG) { - Log.e("Astrid", "Reminder set for " + newDate(time) + " for (\"" + task.getTitle() + "\" (" + task.getId() + "), " + type + ")"); - } am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java index 94d0351c1..6da3f724a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -22,7 +22,6 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.GtasksTaskListUpdater; import com.todoroo.astrid.gtasks.sync.GtasksSyncService; import com.todoroo.astrid.tags.TagService; -import com.todoroo.astrid.utility.Constants; import org.tasks.Broadcaster; import org.tasks.filters.FilterCounter; @@ -50,8 +49,6 @@ public class AstridDependencyInjector extends AbstractDependencyInjector { */ @Override protected void addInjectables() { - injectables.put("debug", Constants.DEBUG); - // com.todoroo.android.service injectables.put("applicationName", "astrid"); diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java index 23cf6dffb..e1fea5f8d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java @@ -27,11 +27,6 @@ public final class Constants { */ public static final long WIDGET_UPDATE_INTERVAL = 30 * 60 * 1000L; - /** - * Whether to turn on debugging logging and UI - */ - public static final boolean DEBUG = false; - // --- task list activity source strings public static final int SOURCE_OTHER = -1;