From 389ef3b2a7d6d40afe08117d275829b4c570ea4f Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 10 Jun 2014 09:28:41 -0500 Subject: [PATCH] Replace android logging with slf4j --- .../todoroo/andlib/data/AbstractDatabase.java | 9 +++--- .../andlib/utility/AndroidUtilities.java | 8 ++--- .../astrid/actfm/ActFmGoogleAuthActivity.java | 7 ++-- .../astrid/activity/TaskListFragment.java | 5 ++- .../todoroo/astrid/alarms/AlarmService.java | 7 ++-- .../astrid/backup/BackupDateUtilities.java | 7 ++-- .../todoroo/astrid/backup/BackupService.java | 13 ++++---- .../astrid/backup/FilePickerBuilder.java | 7 ++-- .../astrid/backup/TasksXmlExporter.java | 11 +++---- .../astrid/backup/TasksXmlImporter.java | 27 ++++++---------- .../calls/PhoneStateChangedReceiver.java | 7 ++-- .../astrid/core/CustomFilterActivity.java | 17 +++------- .../astrid/core/DefaultsPreferences.java | 7 ++-- .../java/com/todoroo/astrid/dao/Database.java | 32 +++++++++++-------- .../com/todoroo/astrid/files/FileExplore.java | 11 ++++--- .../astrid/gcal/CalendarAlarmListCreator.java | 7 ++-- .../astrid/gcal/CalendarAlarmScheduler.java | 2 -- .../todoroo/astrid/gcal/GCalControlSet.java | 3 +- .../com/todoroo/astrid/gcal/GCalHelper.java | 7 +++- .../astrid/gcal/GCalTaskCompleteListener.java | 7 ++-- .../astrid/gtasks/GtasksScheduler.java | 8 +++-- .../astrid/gtasks/GtasksTaskListUpdater.java | 8 +++-- .../gtasks/auth/GtasksLoginActivity.java | 7 ++-- .../reminders/ReminderSchedulingService.java | 7 ++-- .../repeats/RepeatTaskCompleteListener.java | 7 ++-- .../astrid/service/StartupService.java | 2 +- .../todoroo/astrid/service/TaskService.java | 7 ++-- .../AstridOrderedListFragmentHelper.java | 8 +++-- .../subtasks/AstridOrderedListUpdater.java | 8 +++-- .../OrderedMetadataListFragmentHelper.java | 9 ++++-- .../astrid/subtasks/SubtasksHelper.java | 7 ++-- .../com/todoroo/astrid/voice/AACRecorder.java | 10 +++--- .../astrid/voice/VoiceInputAssistant.java | 7 ++-- .../todoroo/astrid/widget/TasksWidget.java | 7 ++-- .../astrid/widget/WidgetUpdateService.java | 8 +++-- .../tasks/widget/ScrollableViewsFactory.java | 8 +++-- 36 files changed, 183 insertions(+), 136 deletions(-) diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java index 7c4ba7c9c..8475f8218 100644 --- a/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java +++ b/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java @@ -142,16 +142,15 @@ abstract public class AbstractDatabase { try { database = helper.getWritableDatabase(); } catch (NullPointerException e) { - // don't know why this happens + log.error(e.getMessage(), e); throw new IllegalStateException(e); } catch (final RuntimeException original) { - Log.e("database-" + getName(), "Error opening db", - original); + log.error(original.getMessage(), original); try { // provide read-only database openForReading(); } catch (Exception readException) { - log.error("database-open-{}", getName(), original); + log.error(readException.getMessage(), readException); // throw original write exception throw original; } @@ -223,7 +222,7 @@ abstract public class AbstractDatabase { } catch (SQLiteConstraintException e) { // Throw these exceptions throw e; } catch (Exception e) { // Suppress others - Log.e("SQLiteDatabase", "Error inserting " + values, e); + log.error(e.getMessage(), e); result = -1; } onDatabaseUpdated(); diff --git a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 049c5288d..0a347a41f 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -14,7 +14,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; import android.text.InputType; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; @@ -77,8 +76,7 @@ public class AndroidUtilities { try { bitmap = BitmapFactory.decodeFile(file, opts); } catch (OutOfMemoryError e) { - // Too big - Log.e("decode-bitmap", "Out of memory with sample size " + opts.inSampleSize, e); //$NON-NLS-1$//$NON-NLS-2$ + log.error(e.getMessage(), e); } tries++; } @@ -98,7 +96,7 @@ public class AndroidUtilities { context.startActivity(intent); } } catch (Exception e) { - log.error("start-external-intent-{}", intent.toString(), e); + log.error(e.getMessage(), e); } } @@ -313,7 +311,7 @@ public class AndroidUtilities { putter.put(object, key, 's', value); } } catch (IndexOutOfBoundsException e) { - Log.e("deserialize", "Badly formed serialization: " + string, e); + log.error(e.getMessage(), e); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java index b517345a4..aa3c40d1d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java @@ -13,7 +13,6 @@ import android.app.ListActivity; import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.Window; @@ -26,6 +25,8 @@ import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountMa import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DialogUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import java.io.IOException; @@ -41,6 +42,8 @@ import java.util.concurrent.TimeUnit; */ public class ActFmGoogleAuthActivity extends ListActivity { + private static final Logger log = LoggerFactory.getLogger(ActFmGoogleAuthActivity.class); + public static final String AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/userinfo.profile"; //$NON-NLS-1$ public static final String RESULT_EMAIL = "email"; //$NON-NLS-1$ @@ -123,7 +126,7 @@ public class ActFmGoogleAuthActivity extends ListActivity { dismissDialog = true; } } catch (final Exception e) { - Log.e("actfm-google-auth", "Login Error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); runOnUiThread(new Runnable() { @Override public void run() { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index b236c41b7..8ed0fa4cc 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -21,7 +21,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.app.Fragment; import android.text.TextUtils; -import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; @@ -201,10 +200,10 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel try { newFragment = (TaskListFragment) component.newInstance(); } catch (java.lang.InstantiationException e) { - Log.e("tla-instantiate", "tla-instantiate", e); + log.error(e.getMessage(), e); newFragment = new TaskListFragment(); } catch (IllegalAccessException e) { - Log.e("tla-instantiate", "tla-instantiate", e); + log.error(e.getMessage(), e); newFragment = new TaskListFragment(); } Bundle args = new Bundle(); 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 ea4c6a71a..cd2ae0517 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java @@ -9,7 +9,6 @@ import android.app.AlarmManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.util.Log; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Criterion; @@ -26,6 +25,8 @@ import com.todoroo.astrid.reminders.ReminderService; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.MetadataService.SynchronizeMetadataCallback; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.injection.ForApplication; import java.util.ArrayList; @@ -43,6 +44,8 @@ import javax.inject.Singleton; @Singleton public class AlarmService { + private static final Logger log = LoggerFactory.getLogger(AlarmService.class); + // --- data retrieval public static final String IDENTIFIER = "alarms"; //$NON-NLS-1$ @@ -151,7 +154,7 @@ public class AlarmService { scheduleAlarm(alarm); } } catch (Exception e) { - Log.i("astrid-alarms", "Error scheduling alarm", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.info(e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$ } finally { cursor.close(); } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java index f28aa7c16..269e3c287 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java @@ -5,7 +5,8 @@ */ package com.todoroo.astrid.backup; -import android.util.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.DateFormat; import java.text.ParseException; @@ -22,6 +23,8 @@ import static org.tasks.date.DateTimeUtils.newDate; */ public class BackupDateUtilities { + private static final Logger log = LoggerFactory.getLogger(BackupDateUtilities.class); + private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssz"; /** @@ -33,7 +36,7 @@ public class BackupDateUtilities { try { return df.parse(s); } catch (ParseException e) { - Log.e("DateUtilities", "Error parsing ISO 8601 date"); + log.error(e.getMessage(), e); return null; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java index 8be27da6c..24f29e74a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java @@ -10,11 +10,12 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import android.util.Log; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingService; import org.tasks.preferences.Preferences; @@ -31,7 +32,7 @@ import javax.inject.Inject; */ public class BackupService extends InjectingService { - private static final String TAG = "BackupService"; + private static final Logger log = LoggerFactory.getLogger(BackupService.class); // --- constants for backup @@ -62,7 +63,7 @@ public class BackupService extends InjectingService { ContextManager.setContext(this); startBackup(this); } catch (Exception e) { - Log.e(TAG, e.getMessage(), e); + log.error(e.getMessage(), e); } } @@ -87,14 +88,14 @@ public class BackupService extends InjectingService { try { deleteOldBackups(); } catch (Exception e) { - Log.e("error-deleting", "Error deleting old backups", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } xmlExporter.exportTasks(context, TasksXmlExporter.ExportType.EXPORT_TYPE_SERVICE, backupDirectorySetting.getBackupDirectory()); } catch (Exception e) { - Log.e("error-backup", "Error starting backups", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); preferences.setString(BackupPreferences.PREF_BACKUP_LAST_ERROR, e.toString()); } } @@ -146,7 +147,7 @@ public class BackupService extends InjectingService { }); for(int i = DAYS_TO_KEEP_BACKUP; i < files.length; i++) { if(!files[i].delete()) { - Log.i("astrid-backups", "Unable to delete: " + files[i]); //$NON-NLS-1$ //$NON-NLS-2$ + log.info("Unable to delete: {}", files[i]); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java index daaa69999..44fdc6320 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java @@ -8,10 +8,11 @@ package com.todoroo.astrid.backup; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import android.util.Log; import com.todoroo.andlib.utility.AndroidUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import java.io.File; @@ -19,6 +20,8 @@ import java.io.FilenameFilter; public class FilePickerBuilder extends AlertDialog.Builder implements DialogInterface.OnClickListener { + private static final Logger log = LoggerFactory.getLogger(FilePickerBuilder.class); + public interface OnFilePickedListener { void onFilePicked(String filePath); } @@ -56,7 +59,7 @@ public class FilePickerBuilder extends AlertDialog.Builder implements DialogInte setItems(files, this); } else { - Log.e("FilePicker", "Cannot access sdcard."); + log.error("Cannot access sdcard."); setMessage(R.string.DLG_error_sdcard + "sdcard"); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java index 4044a4a90..d00ca17ef 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; import android.os.Handler; -import android.util.Log; import android.util.Xml; import android.widget.Toast; @@ -29,6 +28,8 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.preferences.Preferences; import org.xmlpull.v1.XmlSerializer; @@ -41,7 +42,7 @@ import javax.inject.Inject; public class TasksXmlExporter { - private static final String TAG = "TasksXmlExporter"; + private static final Logger log = LoggerFactory.getLogger(TasksXmlExporter.class); // --- public interface @@ -128,7 +129,7 @@ public class TasksXmlExporter { onFinishExport(output); } } catch (IOException e) { - Log.e(TAG, exportType + ": " + e.getMessage(), e); + log.error(e.getMessage(), e); } finally { handler.post(new Runnable() { @Override @@ -248,9 +249,7 @@ public class TasksXmlExporter { try { property.accept(xmlWritingVisitor, model); } catch (Exception e) { - Log.e("astrid-exporter", //$NON-NLS-1$ - "Caught exception while reading " + property.name + //$NON-NLS-1$ - " from " + model.getDatabaseValues(), e); //$NON-NLS-1$ + log.error(e.getMessage(), e); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index 046e86650..cb99b4b8f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -14,7 +14,6 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Handler; import android.text.TextUtils; -import android.util.Log; import android.view.WindowManager.BadTokenException; import com.google.ical.values.RRule; @@ -40,6 +39,8 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TaskToTagMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -52,11 +53,10 @@ import java.util.LinkedHashSet; import java.util.StringTokenizer; import javax.inject.Inject; -import javax.inject.Singleton; public class TasksXmlImporter { - private static final String TAG = "TasksXmlImporter"; + private static final Logger log = LoggerFactory.getLogger(TasksXmlImporter.class); private final TagDataService tagDataService; private final TagService tagService; @@ -121,7 +121,7 @@ public class TasksXmlImporter { try { performImport(); } catch (IOException | XmlPullParserException e) { - Log.e(TAG, e.getMessage(), e); + log.error(e.getMessage(), e); } } }).start(); @@ -229,9 +229,7 @@ public class TasksXmlImporter { } } catch (Exception e) { errorCount++; - Log.e("astrid-importer", //$NON-NLS-1$ - "Caught exception while reading from " + //$NON-NLS-1$ - xpp.getText(), e); + log.error(e.getMessage(), e); } } } @@ -327,9 +325,7 @@ public class TasksXmlImporter { try { property.accept(xmlReadingVisitor, model); } catch (Exception e) { - Log.e("astrid-importer", //$NON-NLS-1$ - "Caught exception while writing " + property.name + //$NON-NLS-1$ - " from " + xpp.getText(), e); //$NON-NLS-1$ + log.error(e.getMessage(), e); } } } @@ -399,9 +395,7 @@ public class TasksXmlImporter { } } catch (Exception e) { errorCount++; - Log.e("astrid-importer", //$NON-NLS-1$ - "Caught exception while reading from " + //$NON-NLS-1$ - xpp.getText(), e); + log.error(e.getMessage(), e); } } } @@ -451,9 +445,7 @@ public class TasksXmlImporter { } } catch (Exception e) { errorCount++; - Log.e("astrid-importer", //$NON-NLS-1$ - "Caught exception while reading from " + //$NON-NLS-1$ - xpp.getText(), e); + log.error(e.getMessage(), e); } } } @@ -528,8 +520,7 @@ public class TasksXmlImporter { String fieldName = xpp.getAttributeName(i); String fieldValue = xpp.getAttributeValue(i); if(!setTaskField(task, fieldName, fieldValue)) { - Log.i("astrid-xml-import", "Task: " + taskName + ": Unknown field '" + - fieldName + "' with value '" + fieldValue + "' disregarded."); + log.info("Task: {}: Unknown field '{}' with value '{}' disregarded.", taskName, fieldName, fieldValue); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java index 3e7f352d1..5f234fcc3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java @@ -13,11 +13,12 @@ import android.provider.CallLog.Calls; import android.provider.ContactsContract; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingBroadcastReceiver; import org.tasks.preferences.Preferences; @@ -28,6 +29,8 @@ import static org.tasks.date.DateTimeUtils.newDate; public class PhoneStateChangedReceiver extends InjectingBroadcastReceiver { + private static final Logger log = LoggerFactory.getLogger(PhoneStateChangedReceiver.class); + private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number"; private static final long WAIT_BEFORE_READ_LOG = 3000L; @@ -127,7 +130,7 @@ public class PhoneStateChangedReceiver extends InjectingBroadcastReceiver { context.startActivity(missedCallIntent); } } catch (Exception e) { - Log.e("phone-state", "Unexpected exception in PhoneStateChangedReceiver", e); + log.error(e.getMessage(), e); } finally { if (calls != null) { calls.close(); diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index fb88a8f31..a5b2778d8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -18,7 +18,6 @@ import android.os.Parcelable; import android.support.v7.app.ActionBar; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.MenuItem; @@ -47,6 +46,8 @@ import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingActionBarActivity; import org.tasks.preferences.ActivityPreferences; @@ -68,6 +69,8 @@ import javax.inject.Inject; */ public class CustomFilterActivity extends InjectingActionBarActivity { + private static final Logger log = LoggerFactory.getLogger(CustomFilterActivity.class); + private static final String IDENTIFIER_TITLE = "title"; //$NON-NLS-1$ private static final String IDENTIFIER_IMPORTANCE = "importance"; //$NON-NLS-1$ private static final String IDENTIFIER_DUEDATE = "dueDate"; //$NON-NLS-1$ @@ -562,17 +565,7 @@ public class CustomFilterActivity extends InjectingActionBarActivity { criteria.put(filterCriterion.identifier, filterCriterion); } } catch (Exception e) { - String addon; - try { - addon = intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON); - } catch (Exception e1) { - Log.e("receive-custom-filter-criteria-error-retrieving-addon", //$NON-NLS-1$ - e.toString(), e); - return; - } - Log.e("receive-custom-filter-criteria-" + //$NON-NLS-1$ - addon, - e.toString(), e); + log.error(e.getMessage(), e); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java index 7ea4e7e39..4d5151faf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java @@ -10,12 +10,13 @@ import android.content.res.Resources; import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; -import android.util.Log; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.gcal.GCalHelper; import com.todoroo.astrid.utility.TodorooPreferenceActivity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.preferences.Preferences; @@ -32,6 +33,8 @@ import javax.inject.Inject; */ public class DefaultsPreferences extends TodorooPreferenceActivity { + private static final Logger log = LoggerFactory.getLogger(DefaultsPreferences.class); + @Inject Preferences preferences; @Inject GCalHelper calendarHelper; @@ -167,7 +170,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity { if(currentSettingIndex == -1 || currentSettingIndex > calendars.calendarIds.length+1) { // Should not happen! // Leave the preference at disabled. - Log.d("astrid", "initCalendarsPreference: Unknown calendar."); + log.debug("initCalendarsPreference: Unknown calendar."); currentSettingIndex = 0; } diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java index d53f9f1dc..d82e11dd7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java @@ -7,7 +7,6 @@ package com.todoroo.astrid.dao; import android.database.sqlite.SQLiteException; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.data.AbstractDatabase; import com.todoroo.andlib.data.AbstractModel; @@ -22,6 +21,9 @@ import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.UserActivity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.inject.Inject; import javax.inject.Singleton; @@ -34,6 +36,8 @@ import javax.inject.Singleton; @Singleton public class Database extends AbstractDatabase { + private static final Logger log = LoggerFactory.getLogger(Database.class); + // --- constants /** @@ -168,13 +172,13 @@ public class Database extends AbstractDatabase { property.accept(visitor, null) + " DEFAULT 0"); } } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 10: case 11: try { database.execSQL(createTableSql(visitor, TagData.TABLE.name, TagData.PROPERTIES)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 12: case 13: try { @@ -183,31 +187,31 @@ public class Database extends AbstractDatabase { database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " + TagData.MEMBER_COUNT.accept(visitor, null) + " DEFAULT 0"); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 14: try { database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " + TagData.TASK_COUNT.accept(visitor, null) + " DEFAULT 0"); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 15: try { database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " + Task.LAST_SYNC.accept(visitor, null) + " DEFAULT 0"); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 16: try { database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " + Task.CREATOR_ID.accept(visitor, null) + " DEFAULT 0"); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 17: try { database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " + TagData.TAG_DESCRIPTION.accept(visitor, null)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 18: try { database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " + @@ -215,7 +219,7 @@ public class Database extends AbstractDatabase { database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " + Metadata.VALUE7.accept(visitor, null)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 19: case 20: try { @@ -235,7 +239,7 @@ public class Database extends AbstractDatabase { onCreateTables(); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 21: case 22: @@ -244,7 +248,7 @@ public class Database extends AbstractDatabase { database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " + Task.REPEAT_UNTIL.accept(visitor, null)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 25: @@ -252,13 +256,13 @@ public class Database extends AbstractDatabase { database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " + TagData.TAG_ORDERING.accept(visitor, null)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 27: try { database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " + Task.SOCIAL_REMINDER.accept(visitor, null)); } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); + log.error("db-upgrade-" + oldVersion + "-" + newVersion, e); } case 28: case 29: @@ -296,7 +300,7 @@ public class Database extends AbstractDatabase { try { database.execSQL(sql); } catch (SQLiteException e) { - Log.e("astrid", "SQL Error: " + sql, e); + log.error("SQL Error: " + sql, e); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java index bfcb24d19..a01a725c9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java @@ -14,7 +14,6 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.os.Bundle; import android.os.Environment; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; @@ -23,6 +22,8 @@ import android.widget.TextView; import com.todoroo.andlib.utility.DialogUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import java.io.File; @@ -36,14 +37,14 @@ import java.util.ArrayList; */ public class FileExplore extends Activity { + private static final Logger log = LoggerFactory.getLogger(FileExplore.class); + // Stores names of traversed directories ArrayList str = new ArrayList<>(); // Check if the first level of the directory structure is the one showing private Boolean firstLvl = true; - private static final String TAG = "F_PATH"; //$NON-NLS-1$ - public static final String RESULT_FILE_SELECTED = "fileSelected"; //$NON-NLS-1$ public static final String RESULT_DIR_SELECTED = "dirSelected"; //$NON-NLS-1$ @@ -77,7 +78,7 @@ public class FileExplore extends Activity { showDialog(DIALOG_LOAD_FILE); upString = getString(R.string.file_browser_up); - Log.d(TAG, path.getAbsolutePath()); + log.debug(path.getAbsolutePath()); } @@ -127,7 +128,7 @@ public class FileExplore extends Activity { fileList = temp; } } else { - Log.e(TAG, "path does not exist"); //$NON-NLS-1$ + log.error("path {} does not exist", path); //$NON-NLS-1$ } adapter = new ArrayAdapter(this, diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java index 6cf4a42c5..8690c9cf3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java @@ -3,7 +3,6 @@ package com.todoroo.astrid.gcal; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; @@ -17,6 +16,8 @@ import com.todoroo.astrid.service.TagDataService; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingActivity; import org.tasks.preferences.ResourceResolver; @@ -27,6 +28,8 @@ import javax.inject.Inject; public class CalendarAlarmListCreator extends InjectingActivity { + private static final Logger log = LoggerFactory.getLogger(CalendarAlarmListCreator.class); + public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$ @Inject TagDataService tagDataService; @@ -168,7 +171,7 @@ public class CalendarAlarmListCreator extends InjectingActivity { member.put("email", email); //$NON-NLS-1$ array.put(member); } catch (JSONException e) { - Log.e(CalendarAlarmScheduler.TAG, "Error creating json member " + email, e); //$NON-NLS-1$ + log.error(e.getMessage(), e); } } return array; 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 6631fb23a..e41813835 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java @@ -19,8 +19,6 @@ import javax.inject.Singleton; @Singleton public class CalendarAlarmScheduler { - public static final String TAG = "calendar-alarm"; - public static final String URI_PREFIX = "cal-reminder"; public static final String URI_PREFIX_POSTPONE = "cal-postpone"; diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index b5932be7f..5a10389be 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.AdapterView; @@ -215,7 +214,7 @@ public class GCalControlSet extends PopupControlSet { intent.putExtra("endTime", cursor.getLong(1)); } catch (Exception e) { - Log.e("gcal-error", "Error opening calendar", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); Toast.makeText(activity, R.string.gcal_TEA_error, Toast.LENGTH_LONG).show(); } finally { cursor.close(); diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java index 7471b6935..a7e0e68ed 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java @@ -21,6 +21,8 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.ForApplication; import org.tasks.preferences.Preferences; @@ -32,6 +34,9 @@ import javax.inject.Inject; import static com.todoroo.astrid.gcal.Calendars.getCalendarContentUri; public class GCalHelper { + + private static final Logger log = LoggerFactory.getLogger(GCalHelper.class); + /** If task has no estimated time, how early to set a task in calendar (seconds)*/ private static final long DEFAULT_CAL_TIME = DateUtilities.ONE_HOUR; @@ -195,7 +200,7 @@ public class GCalHelper { task.setCalendarUri( ""); } catch (Exception e) { - Log.e("astrid-gcal", "error-deleting-calendar-event", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java index 0261aaa18..918354ec0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java @@ -11,13 +11,14 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingBroadcastReceiver; @@ -25,6 +26,8 @@ import javax.inject.Inject; public class GCalTaskCompleteListener extends InjectingBroadcastReceiver { + private static final Logger log = LoggerFactory.getLogger(GCalTaskCompleteListener.class); + @Inject TaskService taskService; @Override @@ -52,7 +55,7 @@ public class GCalTaskCompleteListener extends InjectingBroadcastReceiver { task.getTitle())); cr.update(Uri.parse(calendarUri), values, null, null); } catch (Exception e) { - Log.d("astrid-gcal", "Error updating calendar entry", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$ } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java index 6cb49c334..388025b11 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java @@ -4,10 +4,11 @@ import android.app.AlarmManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.util.Log; import com.todoroo.andlib.utility.DateUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.injection.ForApplication; import org.tasks.preferences.Preferences; @@ -17,6 +18,8 @@ import javax.inject.Singleton; @Singleton public class GtasksScheduler { + private static final Logger log = LoggerFactory.getLogger(GtasksScheduler.class); + /** Minimum time before an auto-sync */ private static final long AUTO_SYNC_MIN_OFFSET = 5*60*1000L; @@ -58,8 +61,7 @@ public class GtasksScheduler { PendingIntent pendingIntent = PendingIntent.getService(context, gtasksPreferenceService.getSyncIntervalKey(), createAlarmIntent(context), PendingIntent.FLAG_UPDATE_CURRENT); - Log.i("Astrid", "Autosync set for " + offset / 1000 //$NON-NLS-1$ //$NON-NLS-2$ - + " seconds repeating every " + syncFrequencySeconds); //$NON-NLS-1$ + log.info("Autosync set for {} seconds repeating every {}", offset / 1000, syncFrequencySeconds); //$NON-NLS-1$ // cancel all existing am.cancel(pendingIntent); diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index ce31c2ac7..14aa60258 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.gtasks; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.Property.LongProperty; @@ -23,6 +22,9 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncService; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.HashMap; import java.util.HashSet; import java.util.concurrent.atomic.AtomicInteger; @@ -34,6 +36,8 @@ import javax.inject.Singleton; @Singleton public class GtasksTaskListUpdater extends OrderedMetadataListUpdater { + private static final Logger log = LoggerFactory.getLogger(GtasksTaskListUpdater.class); + /** map of task -> parent task */ final HashMap parents = new HashMap<>(); @@ -218,7 +222,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater " + version); //$NON-NLS-1$ databaseRestoreIfEmpty(activity); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 2dce3241c..92163f4c5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -7,7 +7,6 @@ package com.todoroo.astrid.service; import android.content.ContentValues; import android.content.Intent; -import android.util.Log; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; @@ -31,6 +30,8 @@ import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.TitleParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.Broadcaster; import org.tasks.filters.FilterCounter; import org.tasks.scheduling.RefreshScheduler; @@ -52,7 +53,7 @@ import javax.inject.Singleton; @Singleton public class TaskService { - private static final String TAG = "TaskService"; + private static final Logger log = LoggerFactory.getLogger(TaskService.class); public static final String TRANS_QUICK_ADD_MARKUP = "markup"; //$NON-NLS-1$ @@ -313,7 +314,7 @@ public class TaskService { try { quickAddMarkup = parseQuickAddMarkup(tagService, task, tags); } catch (Throwable e) { - Log.e(TAG, e.getMessage(), e); + log.error(e.getMessage(), e); } ContentValues forMetadata = null; diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 086145ced..49fee18f6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -4,7 +4,6 @@ import android.app.Activity; import android.database.Cursor; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; import android.util.TypedValue; import android.view.View; import android.widget.ListView; @@ -28,6 +27,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.ui.DraggableListView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.preferences.ActivityPreferences; @@ -39,6 +40,7 @@ import java.util.concurrent.atomic.AtomicReference; public class AstridOrderedListFragmentHelper implements OrderedListFragmentHelperInterface { + private static final Logger log = LoggerFactory.getLogger(AstridOrderedListFragmentHelper.class); private final DisplayMetrics metrics = new DisplayMetrics(); private final AstridOrderedListUpdater updater; @@ -109,7 +111,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen updater.moveTo(list, getFilter(), targetTaskId, destinationTaskId); } } catch (Exception e) { - Log.e("drag", "Drag Error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } fragment.reconstructCursor(); @@ -136,7 +138,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen try { updater.indent(list, getFilter(), targetTaskId, delta); } catch (Exception e) { - Log.e("drag", "Indent Error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } fragment.reconstructCursor(); diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index 1f3b4cb0f..132da2219 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -1,7 +1,5 @@ package com.todoroo.astrid.subtasks; -import android.util.Log; - import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.data.RemoteModel; @@ -10,6 +8,8 @@ import com.todoroo.astrid.service.TaskService; import org.json.JSONArray; import org.json.JSONException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.HashMap; @@ -19,6 +19,8 @@ import java.util.Set; public abstract class AstridOrderedListUpdater { + private static final Logger log = LoggerFactory.getLogger(AstridOrderedListUpdater.class); + private final TaskService taskService; public AstridOrderedListUpdater(TaskService taskService) { @@ -393,7 +395,7 @@ public abstract class AstridOrderedListUpdater { JSONArray tree = new JSONArray(serializedTree); recursivelyBuildChildren(root, tree, callback); } catch (JSONException e) { - Log.e("OrderedListUpdater", "Error building tree model", e); //$NON-NLS-1$//$NON-NLS-2$ + log.error(e.getMessage(), e); } return root; } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index cf0abd9f5..b2a433582 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.database.Cursor; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; import android.util.TypedValue; import android.view.View; import android.widget.ListView; @@ -33,6 +32,8 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.Node; import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVisitor; import com.todoroo.astrid.ui.DraggableListView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.preferences.ActivityPreferences; @@ -45,6 +46,8 @@ import java.util.concurrent.atomic.AtomicReference; public class OrderedMetadataListFragmentHelper implements OrderedListFragmentHelperInterface { + private static final Logger log = LoggerFactory.getLogger(OrderedMetadataListFragmentHelper.class); + private final DisplayMetrics metrics = new DisplayMetrics(); private final OrderedMetadataListUpdater updater; private final TaskListFragment fragment; @@ -126,7 +129,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm updater.moveTo(list, targetTaskId, destinationTaskId); } } catch (Exception e) { - Log.e("drag", "Drag Error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } fragment.loadTaskListContent(true); @@ -152,7 +155,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm try { updater.indent(list, targetTaskId, delta); } catch (Exception e) { - Log.e("drag", "Indent Error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } fragment.loadTaskListContent(true); } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java index b1b60baf5..0ea333ae6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -1,7 +1,6 @@ package com.todoroo.astrid.subtasks; import android.text.TextUtils; -import android.util.Log; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; @@ -22,6 +21,8 @@ import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.preferences.Preferences; import java.util.ArrayList; @@ -29,6 +30,8 @@ import java.util.HashMap; public class SubtasksHelper { + private static final Logger log = LoggerFactory.getLogger(SubtasksHelper.class); + public static boolean shouldUseSubtasksFragmentForFilter(Preferences preferences, Filter filter) { if(filter == null || CoreFilterExposer.isInbox(filter) || CoreFilterExposer.isTodayFilter(filter) || SubtasksHelper.isTagFilter(filter)) { int sortFlags = preferences.getSortFlags(); @@ -109,7 +112,7 @@ public class SubtasksHelper { ids.add(Long.parseLong(idString)); } } catch (NumberFormatException e) { - Log.e("widget-subtasks", "error parsing id " + idString, e); + log.error(e.getMessage(), e); } } return ids.toArray(new Long[ids.size()]); diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java b/astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java index 18f6152c1..0927e0795 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java @@ -3,13 +3,15 @@ package com.todoroo.astrid.voice; import android.annotation.TargetApi; import android.media.MediaRecorder; import android.os.Build; -import android.util.Log; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; public class AACRecorder { - private static final String TAG = "AACRecorder"; + private static final Logger log = LoggerFactory.getLogger(AACRecorder.class); private MediaRecorder mediaRecorder; @@ -34,13 +36,13 @@ public class AACRecorder { setOnErrorListener(new OnErrorListener() { @Override public void onError(MediaRecorder mr, int what, int extra) { - Log.e(TAG, "mediaRecorder.onError(mr, " + what + ", " + extra + ")"); + log.error("mediaRecorder.onError(mr, {}, {})", what, extra); } }); setOnInfoListener(new OnInfoListener() { @Override public void onInfo(MediaRecorder mr, int what, int extra) { - Log.i(TAG, "mediaRecorder.onInfo(mr, " + what + ", " + extra + ")"); + log.info("mediaRecorder.onInfo(mr, {}, {})", what, extra); } }); }}; diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java index 8a942d59e..ff48bbfc6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -11,7 +11,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.speech.RecognizerIntent; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.EditText; @@ -24,6 +23,8 @@ import com.todoroo.astrid.utility.Constants; import junit.framework.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import java.security.InvalidParameterException; @@ -42,6 +43,8 @@ import java.util.ArrayList; */ public class VoiceInputAssistant { + private static final Logger log = LoggerFactory.getLogger(VoiceInputAssistant.class); + /** requestcode for activityresult from voicerecognizer-intent */ public static final int VOICE_RECOGNITION_REQUEST_CODE = 1234; @@ -127,7 +130,7 @@ public class VoiceInputAssistant { } else if (fragment != null) { fragment.startActivityForResult(intent, requestCode); } else { - Log.e("Astrid VoiceInputAssistant", detailMessage, new IllegalStateException(detailMessage)); + log.error(detailMessage, new IllegalStateException(detailMessage)); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java index cd4063536..9490c8ab5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java @@ -11,7 +11,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.util.Log; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; @@ -21,6 +20,8 @@ import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingAppWidgetProvider; import org.tasks.preferences.ActivityPreferences; @@ -32,6 +33,8 @@ import static com.todoroo.astrid.api.AstridApiConstants.BROADCAST_EVENT_TASK_LIS public class TasksWidget extends InjectingAppWidgetProvider { + private static final Logger log = LoggerFactory.getLogger(TasksWidget.class); + @Inject TaskService taskService; @Inject WidgetHelper widgetHelper; @@ -84,7 +87,7 @@ public class TasksWidget extends InjectingAppWidgetProvider { } } } catch (Exception e) { - Log.e("astrid-update-widget", "widget update error", e); //$NON-NLS-1$ //$NON-NLS-2$ + log.error(e.getMessage(), e); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java b/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java index 497ecb0cb..aea9ffb0e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java @@ -7,7 +7,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.IBinder; -import android.util.Log; import android.view.View; import android.widget.RemoteViews; @@ -25,6 +24,8 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.subtasks.SubtasksHelper; import com.todoroo.astrid.utility.Constants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingService; import org.tasks.preferences.Preferences; @@ -34,6 +35,8 @@ import javax.inject.Inject; public class WidgetUpdateService extends InjectingService { + private static final Logger log = LoggerFactory.getLogger(WidgetUpdateService.class); + private static final int NUM_VISIBLE_TASKS = 25; public static final String EXTRA_WIDGET_ID = "widget_id"; //$NON-NLS-1$ @@ -153,8 +156,7 @@ public class WidgetUpdateService extends InjectingService { } } catch (Exception e) { - // can happen if database is not ready - Log.e("WIDGET-UPDATE", "Error updating widget", e); + log.error(e.getMessage(), e); } finally { if(cursor != null) { cursor.close(); diff --git a/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 877a2fd9c..e845f229f 100644 --- a/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -8,7 +8,6 @@ import android.content.res.Resources; import android.graphics.Paint; import android.os.Build; import android.text.TextUtils; -import android.util.Log; import android.widget.RemoteViews; import android.widget.RemoteViewsService; @@ -30,12 +29,16 @@ import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.widget.TasksWidget; import com.todoroo.astrid.widget.WidgetConfigActivity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.preferences.Preferences; @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { + private static final Logger log = LoggerFactory.getLogger(ScrollableViewsFactory.class); + private final Database database; private final TaskService taskService; private final TaskListMetadataDao taskListMetadataDao; @@ -170,8 +173,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac return row; } catch (Exception e) { - // can happen if database is not ready - Log.e("WIDGET-UPDATE", "Error updating widget", e); + log.error(e.getMessage(), e); } return null;