Skip to content

Commit eb93560

Browse files
AchoArnoldAchoArnold
committed
Move from Log to Timber
1 parent bab8d8f commit eb93560

6 files changed

Lines changed: 47 additions & 64 deletions

File tree

‎android/app/src/main/java/com/httpsms/DeliveredReceiver.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.httpsms
22

33
import android.app.Activity
4+
import android.content.BroadcastReceiver
45
import android.content.Context
56
import android.content.Intent
6-
import android.content.BroadcastReceiver
7-
import android.util.Log
7+
import timber.log.Timber
88
import java.time.ZoneOffset
99
import java.time.ZonedDateTime
1010

@@ -20,9 +20,9 @@ internal class DeliveredReceiver : BroadcastReceiver() {
2020
private fun handleMessageDelivered(messageId: String?) {
2121
val timestamp = ZonedDateTime.now(ZoneOffset.UTC)
2222
Thread {
23-
Log.i(TAG, "delivered message with ID [${messageId}]")
23+
Timber.i("delivered message with ID [${messageId}]")
2424
if (messageId == null) {
25-
Log.e(TAG, "cannot handle event because the message ID is null")
25+
Timber.e("cannot handle event because the message ID is null")
2626
return@Thread
2727
}
2828
HttpSmsApiService().sendDeliveredEvent(messageId, timestamp)
@@ -32,16 +32,12 @@ internal class DeliveredReceiver : BroadcastReceiver() {
3232
private fun handleMessageFailed(messageId: String?) {
3333
val timestamp = ZonedDateTime.now(ZoneOffset.UTC)
3434
Thread {
35-
Log.i(TAG, "message with ID [${messageId}] not delivered")
35+
Timber.i("message with ID [${messageId}] not delivered")
3636
if (messageId == null) {
37-
Log.e(TAG, "cannot handle event because the message ID is null")
37+
Timber.e("cannot handle event because the message ID is null")
3838
return@Thread
3939
}
4040
HttpSmsApiService().sendFailedEvent(messageId,timestamp, "NOT_DELIVERED")
4141
}.start()
4242
}
43-
44-
companion object {
45-
private val TAG = DeliveredReceiver::class.simpleName
46-
}
4743
}

‎android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import android.app.PendingIntent
44
import android.content.Context
55
import android.content.Intent
66
import android.content.IntentFilter
7-
import android.util.Log
87
import androidx.work.OneTimeWorkRequest
98
import androidx.work.WorkManager
109
import androidx.work.Worker
1110
import androidx.work.WorkerParameters
1211
import com.google.firebase.messaging.FirebaseMessagingService
1312
import com.google.firebase.messaging.RemoteMessage
13+
import timber.log.Timber
1414

1515

1616
class MyFirebaseMessagingService : FirebaseMessagingService() {
1717

1818
// [START receive_message]
1919
override fun onMessageReceived(remoteMessage: RemoteMessage) {
20-
Log.d(TAG, MyFirebaseMessagingService::onMessageReceived.name)
20+
Timber.d(MyFirebaseMessagingService::onMessageReceived.name)
2121
scheduleJob()
2222
}
2323
// [END receive_message]
@@ -29,7 +29,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
2929
* FCM registration token is initially generated so this is where you would retrieve the token.
3030
*/
3131
override fun onNewToken(token: String) {
32-
Log.d(TAG, "Refreshed token: $token")
32+
Timber.d("Refreshed token: $token")
3333

3434
// If you want to send messages to this application instance or
3535
// manage this apps subscriptions on the server side, send the
@@ -50,11 +50,11 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
5050
// [END dispatch_job]
5151
}
5252
private fun sendRegistrationToServer(token: String) {
53-
Log.d(TAG, "sendRegistrationTokenToServer($token)")
53+
Timber.d("sendRegistrationTokenToServer($token)")
5454
Settings.setApiKeyAsync(this, token)
5555

5656
if (Settings.isLoggedIn(this)) {
57-
Log.d(TAG, "updating phone with new fcm token")
57+
Timber.d("updating phone with new fcm token")
5858
HttpSmsApiService().updatePhone(Settings.getPhoneOrDefault(this), token)
5959
}
6060
}
@@ -80,22 +80,22 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
8080
}
8181

8282
private fun getMessage(owner: String): Message? {
83-
Log.d(TAG, "fetching message")
83+
Timber.d("fetching message")
8484
val messages = HttpSmsApiService().getOutstandingMessages(owner)
8585

8686
if (messages.isNotEmpty()) {
87-
Log.d(TAG, "fetched message with ID [${messages.first().id}]")
87+
Timber.d("fetched message with ID [${messages.first().id}]")
8888
return messages.first()
8989
}
9090

91-
Log.e(TAG, "cannot get message from API")
91+
Timber.e("cannot get message from API")
9292
return null
9393
}
9494

9595
private fun sendMessage(message: Message, sentIntent: PendingIntent, deliveredIntent: PendingIntent) {
96-
Log.d(TAG, "sending SMS for message with ID [${message.id}]")
96+
Timber.d("sending SMS for message with ID [${message.id}]")
9797
SmsManagerService().sendMessage(this.applicationContext, message, sentIntent, deliveredIntent)
98-
Log.d(TAG, "sent SMS for message with ID [${message.id}]")
98+
Timber.d("sent SMS for message with ID [${message.id}]")
9999
}
100100

101101

‎android/app/src/main/java/com/httpsms/HttpSmsApiService.kt‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import okhttp3.MediaType.Companion.toMediaType
55
import okhttp3.OkHttpClient
66
import okhttp3.Request
77
import okhttp3.RequestBody.Companion.toRequestBody
8+
import timber.log.Timber
89
import java.net.URI
910
import java.time.ZonedDateTime
1011
import java.time.format.DateTimeFormatter
@@ -31,14 +32,14 @@ class HttpSmsApiService {
3132
if (response.isSuccessful) {
3233
val payload = ResponseMessagesOutstanding.fromJson(response.body!!.string())?.data
3334
if (payload == null) {
34-
Log.e(TAG, "cannot decode payload [${response.body}]")
35+
Timber.e("cannot decode payload [${response.body}]")
3536
return listOf()
3637
}
3738
response.close()
3839
return payload
3940
}
4041

41-
Log.e(TAG, "invalid response with code [${response.code}] and payload [${response.body}]")
42+
Timber.e("invalid response with code [${response.code}] and payload [${response.body}]")
4243
response.close()
4344
return listOf()
4445
}
@@ -77,13 +78,13 @@ class HttpSmsApiService {
7778

7879
val response = client.newCall(request).execute()
7980
if (!response.isSuccessful) {
80-
Log.e(TAG, "error response [${response.body?.string()}] with code [${response.code}] while receiving message [${body}]}]")
81+
Timber.e("error response [${response.body?.string()}] with code [${response.code}] while receiving message [${body}]}]")
8182
return
8283
}
8384

8485
val message = ResponseMessage.fromJson(response.body!!.string())
8586
response.close()
86-
Log.i(TAG, "received message stored successfully for message with ID [${message?.data?.id}]" )
87+
Timber.i("received message stored successfully for message with ID [${message?.data?.id}]" )
8788
}
8889

8990

@@ -108,12 +109,12 @@ class HttpSmsApiService {
108109

109110
val response = client.newCall(request).execute()
110111
if (!response.isSuccessful) {
111-
Log.e(TAG, "error response [${response.body?.string()}] with code [${response.code}] while sending [${event}] event [${body}] for message with ID [${messageId}]")
112+
Timber.e("error response [${response.body?.string()}] with code [${response.code}] while sending [${event}] event [${body}] for message with ID [${messageId}]")
112113
return
113114
}
114115

115116
response.close()
116-
Log.i(TAG, "[$event] event sent successfully for message with ID [$messageId]" )
117+
Timber.i( "[$event] event sent successfully for message with ID [$messageId]" )
117118
}
118119

119120

@@ -134,15 +135,11 @@ class HttpSmsApiService {
134135

135136
val response = client.newCall(request).execute()
136137
if (!response.isSuccessful) {
137-
Log.e(TAG, "error response [${response.body?.string()}] with code [${response.code}] while sending fcm token [${body}]")
138+
Timber.e("error response [${response.body?.string()}] with code [${response.code}] while sending fcm token [${body}]")
138139
return
139140
}
140141

141142
response.close()
142-
Log.i(TAG, "fcm token sent successfully for phone [$phoneNumber]" )
143-
}
144-
145-
companion object {
146-
private val TAG = HttpSmsApiService::class.simpleName
143+
Timber.i("fcm token sent successfully for phone [$phoneNumber]" )
147144
}
148145
}

‎android/app/src/main/java/com/httpsms/ReceivedReceiver.kt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ import android.content.BroadcastReceiver
44
import android.content.Context
55
import android.content.Intent
66
import android.provider.Telephony
7-
import android.util.Log
7+
import timber.log.Timber
88
import java.time.ZoneOffset
99
import java.time.ZonedDateTime
1010

1111
class ReceivedReceiver: BroadcastReceiver()
1212
{
13-
companion object {
14-
private val TAG = ReceivedReceiver::class.simpleName
15-
}
16-
1713
override fun onReceive(context: Context,intent: Intent) {
1814
if (intent.action != Telephony.Sms.Intents.SMS_RECEIVED_ACTION) {
19-
Log.e(TAG, "received invalid intent with action [${intent.action}]")
15+
Timber.e("received invalid intent with action [${intent.action}]")
2016
return
2117
}
2218

@@ -38,7 +34,7 @@ class ReceivedReceiver: BroadcastReceiver()
3834
private fun handleMessageReceived(from: String, to : String, content: String) {
3935
val timestamp = ZonedDateTime.now(ZoneOffset.UTC)
4036
Thread {
41-
Log.i(TAG, "forwarding received message from [${from}]")
37+
Timber.i("forwarding received message from [${from}]")
4238
HttpSmsApiService().receive(from, to, content, timestamp)
4339
}.start()
4440
}

‎android/app/src/main/java/com/httpsms/SentReceiver.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ import android.content.BroadcastReceiver
55
import android.content.Context
66
import android.content.Intent
77
import android.telephony.SmsManager
8-
import android.util.Log
8+
import timber.log.Timber
99
import java.time.ZoneOffset
1010
import java.time.ZonedDateTime
1111

1212
internal class SentReceiver : BroadcastReceiver() {
13-
companion object {
14-
private val TAG = SentReceiver::class.simpleName
15-
}
16-
1713
override fun onReceive(context: Context, intent: Intent) {
1814
when (resultCode) {
1915
Activity.RESULT_OK -> handleMessageSent(intent.getStringExtra(Constants.KEY_MESSAGE_ID))
@@ -28,9 +24,9 @@ internal class SentReceiver : BroadcastReceiver() {
2824
private fun handleMessageSent(messageId: String?) {
2925
val timestamp = ZonedDateTime.now(ZoneOffset.UTC)
3026
Thread {
31-
Log.i(TAG, "sent message with ID [${messageId}]")
27+
Timber.d("sent message with ID [${messageId}]")
3228
if (messageId == null) {
33-
Log.e(TAG, "cannot handle event because the message ID is null")
29+
Timber.e("cannot handle event because the message ID is null")
3430
return@Thread
3531
}
3632
HttpSmsApiService().sendSentEvent(messageId,timestamp)
@@ -40,9 +36,9 @@ internal class SentReceiver : BroadcastReceiver() {
4036
private fun handleMessageFailed(messageId: String?, reason: String) {
4137
val timestamp = ZonedDateTime.now(ZoneOffset.UTC)
4238
Thread {
43-
Log.i(TAG, "message with ID [${messageId}] not sent with reason [$reason]")
39+
Timber.i("message with ID [${messageId}] not sent with reason [$reason]")
4440
if (messageId == null) {
45-
Log.e(TAG, "cannot handle event because the message ID is null")
41+
Timber.e("cannot handle event because the message ID is null")
4642
return@Thread
4743
}
4844
HttpSmsApiService().sendFailedEvent(messageId, timestamp, reason)

‎android/app/src/main/java/com/httpsms/Settings.kt‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.httpsms
22

33
import android.content.Context
4-
import android.util.Log
54
import androidx.preference.PreferenceManager
5+
import timber.log.Timber
66

77
object Settings {
88
const val DEFAULT_PHONE_NUMBER = "NO_PHONE_NUMBER"
@@ -13,18 +13,18 @@ object Settings {
1313
private const val SETTINGS_FCM_TOKEN = "SETTINGS_FCM_TOKEN"
1414

1515
fun getOwner(context: Context): String? {
16-
Log.d(TAG, Settings::getOwner.name)
16+
Timber.d(Settings::getOwner.name)
1717

1818
val owner = PreferenceManager
1919
.getDefaultSharedPreferences(context)
2020
.getString(this.SETTINGS_OWNER, null)
2121

2222
if (owner == null) {
23-
Log.e(TAG, "cannot get owner from preference [${this.SETTINGS_OWNER}]")
23+
Timber.e("cannot get owner from preference [${this.SETTINGS_OWNER}]")
2424
return null
2525
}
2626

27-
Log.d(TAG, "owner: [$owner]")
27+
Timber.d("owner: [$owner]")
2828
return owner
2929
}
3030

@@ -33,7 +33,7 @@ object Settings {
3333
}
3434

3535
fun setOwnerAsync(context: Context, owner: String) {
36-
Log.d(TAG, Settings::getOwner.name)
36+
Timber.d(Settings::getOwner.name)
3737

3838
PreferenceManager.getDefaultSharedPreferences(context)
3939
.edit()
@@ -42,18 +42,18 @@ object Settings {
4242
}
4343

4444
fun getActiveStatus(context: Context): Boolean {
45-
Log.d(TAG, Settings::getActiveStatus.name)
45+
Timber.d(Settings::getActiveStatus.name)
4646

4747
val activeStatus = PreferenceManager
4848
.getDefaultSharedPreferences(context)
4949
.getBoolean(this.SETTINGS_ACTIVE,false)
5050

51-
Log.d(TAG, "active status: [$activeStatus]")
51+
Timber.d("active status: [$activeStatus]")
5252
return activeStatus
5353
}
5454

5555
fun setActiveStatusAsync(context: Context, status: Boolean) {
56-
Log.d(TAG, Settings::setActiveStatusAsync.name)
56+
Timber.d(Settings::setActiveStatusAsync.name)
5757

5858
PreferenceManager.getDefaultSharedPreferences(context)
5959
.edit()
@@ -66,18 +66,18 @@ object Settings {
6666
}
6767

6868
fun getApiKey(context: Context): String?{
69-
Log.d(TAG, Settings::getApiKey.name)
69+
Timber.d(Settings::getApiKey.name)
7070

7171
val activeStatus = PreferenceManager
7272
.getDefaultSharedPreferences(context)
7373
.getString(this.SETTINGS_API_KEY,null)
7474

75-
Log.d(TAG, "API_KEY: [$activeStatus]")
75+
Timber.d("API_KEY: [$activeStatus]")
7676
return activeStatus
7777
}
7878

7979
fun setApiKeyAsync(context: Context, apiKey: String) {
80-
Log.d(TAG, Settings::setApiKeyAsync.name)
80+
Timber.d(Settings::setApiKeyAsync.name)
8181

8282
PreferenceManager.getDefaultSharedPreferences(context)
8383
.edit()
@@ -86,24 +86,22 @@ object Settings {
8686
}
8787

8888
fun getFcmToken(context: Context): String?{
89-
Log.d(TAG, Settings::getFcmToken.name)
89+
Timber.d(Settings::getFcmToken.name)
9090

9191
val activeStatus = PreferenceManager
9292
.getDefaultSharedPreferences(context)
9393
.getString(this.SETTINGS_FCM_TOKEN,null)
9494

95-
Log.d(TAG, "API_KEY: [$activeStatus]")
95+
Timber.d("API_KEY: [$activeStatus]")
9696
return activeStatus
9797
}
9898

9999
fun setFcmToken(context: Context, apiKey: String) {
100-
Log.d(TAG, Settings::setApiKeyAsync.name)
100+
Timber.d(Settings::setApiKeyAsync.name)
101101

102102
PreferenceManager.getDefaultSharedPreferences(context)
103103
.edit()
104104
.putString(this.SETTINGS_FCM_TOKEN, apiKey)
105105
.apply()
106106
}
107-
108-
private val TAG = Settings::class.simpleName
109107
}

0 commit comments

Comments
 (0)