From 9c6b3f6a4b8d4a4471748099341e18662b3c0171 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Sep 2017 19:07:22 -0400 Subject: [PATCH] Replace Log with Timber --- qksms/build.gradle | 1 + qksms/src/main/java/com/moez/QKSMS/QKApplication.kt | 3 +++ .../com/moez/QKSMS/data/repository/MessageRepository.kt | 7 +++++-- .../main/java/com/moez/QKSMS/data/sync/MessageColumns.kt | 4 ++-- qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt | 4 ++-- qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt | 4 ++-- .../QKSMS/ui/conversations/ConversationListActivity.kt | 7 +++---- .../main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt | 5 ++--- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index 26cbd848..de1db2e0 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -40,6 +40,7 @@ dependencies { compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.bugsnag:bugsnag-android:3.9.0' compile "com.google.dagger:dagger:2.9" + compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.karumi:dexter:4.1.0' compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile "io.reactivex.rxjava2:rxjava:2.1.0" diff --git a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt index 03abeb92..8b07bc61 100644 --- a/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt +++ b/qksms/src/main/java/com/moez/QKSMS/QKApplication.kt @@ -5,6 +5,7 @@ import com.bugsnag.android.Bugsnag import com.moez.QKSMS.dagger.AppComponentManager import io.realm.Realm import io.realm.RealmConfiguration +import timber.log.Timber class QKApplication : Application() { @@ -20,6 +21,8 @@ class QKApplication : Application() { .build()) AppComponentManager.init(this) + + Timber.plant(Timber.DebugTree()) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index ad91428e..1cf1db7c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -6,6 +6,7 @@ import android.net.Uri import com.moez.QKSMS.data.model.Message import io.realm.Realm import io.realm.RealmResults +import timber.log.Timber class MessageRepository(val context: Context) { @@ -16,7 +17,7 @@ class MessageRepository(val context: Context) { .findAllSortedAsync("date") } - fun insertMessage(address: String, body: String, time: Long): Uri { + fun insertMessage(address: String, body: String, time: Long) { val contentResolver = context.contentResolver val cv = ContentValues() @@ -24,7 +25,9 @@ class MessageRepository(val context: Context) { cv.put("body", body) cv.put("date_sent", time) - return contentResolver.insert(Uri.parse("content://sms/inbox"), cv) + val uri = contentResolver.insert(Uri.parse("content://sms/inbox"), cv) + + Timber.d("Uri: $uri") } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt index a3900e76..cac0360b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt @@ -4,7 +4,7 @@ import android.database.Cursor import android.net.Uri import android.provider.BaseColumns import android.provider.Telephony -import android.util.Log +import timber.log.Timber @Suppress("unused") class MessageColumns(val cursor: Cursor) { @@ -75,7 +75,7 @@ class MessageColumns(val cursor: Cursor) { try { return cursor.getColumnIndexOrThrow(PROJECTION[index]) } catch (e: IllegalArgumentException) { - if (DEBUG) Log.w(TAG, e.message) + Timber.w(e) } return index diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt index dd842e44..bfed9a7a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt @@ -3,12 +3,12 @@ package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.util.Log +import timber.log.Timber class MmsReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - Log.d("MmsReceiver", "Received MMS: $intent") + Timber.v("Received MMS: $intent") } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 31280092..b957664d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -5,9 +5,9 @@ import android.content.Context import android.content.Intent import android.os.Build import android.telephony.SmsMessage -import android.util.Log import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository +import timber.log.Timber import javax.inject.Inject class SmsReceiver : BroadcastReceiver() { @@ -15,7 +15,7 @@ class SmsReceiver : BroadcastReceiver() { @Inject lateinit var messageRepo: MessageRepository override fun onReceive(context: Context, intent: Intent) { - Log.d("SmsReceiver", "Received SMS: $intent") + Timber.v("Received SMS: $intent") AppComponentManager.appComponent.inject(this) intent.extras?.let { extras -> diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index b29b730d..147f5236 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -4,7 +4,6 @@ import android.Manifest import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.widget.LinearLayoutManager -import android.util.Log import com.karumi.dexter.Dexter import com.karumi.dexter.MultiplePermissionsReport import com.karumi.dexter.PermissionToken @@ -13,9 +12,9 @@ import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity import kotlinx.android.synthetic.main.conversation_list_activity.* +import timber.log.Timber class ConversationListActivity : QkActivity() { - val TAG = "MainActivity" lateinit var viewModel: ConversationListViewModel @@ -43,8 +42,8 @@ class ConversationListActivity : QkActivity() { } override fun onPermissionsChecked(report: MultiplePermissionsReport) { - for (response in report.grantedPermissionResponses) Log.v(TAG, "Permission granted: ${response.permissionName}") - for (response in report.deniedPermissionResponses) Log.v(TAG, "Permission denied: ${response.permissionName}") + for (response in report.grantedPermissionResponses) Timber.v("Permission granted: ${response.permissionName}") + for (response in report.deniedPermissionResponses) Timber.v("Permission denied: ${response.permissionName}") } }) .check() diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index 95c004f8..22f263eb 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -1,7 +1,6 @@ package com.moez.QKSMS.ui.messages import android.content.Context -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R @@ -11,11 +10,11 @@ import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.util.DateFormatter import io.realm.OrderedRealmCollection import io.realm.RealmRecyclerViewAdapter +import timber.log.Timber import javax.inject.Inject class MessageAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { - val TAG = "MessageAdapter" val VIEWTYPE_IN = 0 val VIEWTYPE_OUT = 1 @@ -36,7 +35,7 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : val message = getItem(position)!! viewHolder.itemView.setOnClickListener { - Log.i(TAG, message.toString()) + Timber.v(message.toString()) } viewHolder.avatar.contact = Contact()