Merge pull request #131 from otormaigh/release/0.4.0

Release/0.4.0

Author: otormaigh

.idea/codeStyles/Project.xml

@@ -9,6 +9,7 @@ if (file('../enc.properties').exists()) {
 }
 
 android {
+  namespace "ie.otormaigh.lazyotp"
   compileSdkVersion versions.compileSdk
 
   defaultConfig {
@@ -95,19 +96,20 @@ dependencies {
   implementation deps.androidx.core_ktx
   implementation deps.androidx.constraintlayout
   implementation deps.androidx.prefs
-  implementation deps.androidx.work.runtime_ktx
   implementation deps.androidx.room.core_ktx
   implementation deps.androidx.room.runtime
   kapt deps.androidx.room.compiler
+  implementation deps.androidx.viewmodel
+  implementation deps.androidx.work.runtime_ktx
 
   implementation deps.square.retrofit.core
   implementation deps.square.okhttp.core
   implementation deps.square.okhttp.logging
 
   implementation deps.timber
 
+  testImplementation deps.google.truth
   testImplementation deps.junit
-  testImplementation deps.square.assertj
 
   androidTestImplementation deps.androidx.test.runner
   androidTestImplementation deps.androidx.test.rules

app/build.gradle

@@ -17,6 +17,7 @@
     tools:ignore="GoogleAppIndexingWarning">
     <activity
       android:name="ie.otormaigh.lazyotp.feature.MainActivity"
+      android:exported="true"
       android:screenOrientation="fullSensor">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -29,7 +30,9 @@
       android:name="ie.otormaigh.lazyotp.feature.settings.SettingsActivity"
       android:screenOrientation="fullSensor" />
 
-    <receiver android:name="ie.otormaigh.lazyotp.service.SmsReceiver">
+    <receiver
+      android:name="ie.otormaigh.lazyotp.service.SmsReceiver"
+      android:exported="true">
       <intent-filter android:priority="1000">
         <action android:name="android.provider.Telephony.SMS_RECEIVED" />
       </intent-filter>

app/src/main/AndroidManifest.xml

@@ -22,10 +22,12 @@ class LazySmsApplication : Application() {
   override fun onCreate() {
     super.onCreate()
 
-    Timber.plant(object : Timber.DebugTree() {
-      override fun createStackElementTag(element: StackTraceElement) =
-        "(${element.fileName}:${element.lineNumber})"
-    })
+    if (BuildConfig.DEBUG) {
+      Timber.plant(object : Timber.DebugTree() {
+        override fun createStackElementTag(element: StackTraceElement) =
+          "(${element.fileName}:${element.lineNumber})"
+      })
+    }
 
     if (settingsPrefs.batteryWarningEnabled) BatteryLevelService.start(this)
     else BatteryLevelService.stop(this)

app/src/main/java/ie/otormaigh/lazyotp/LazySmsApplication.kt

@@ -115,6 +115,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
   }
 
   private fun processState(state: AddSmsProviderState) {
+    // FIXME: Non exhaustive 'when' statements on sealed class/interface will be prohibited in 1.7, add 'Default', 'Loading' branches or 'else' branch instead
     when (state) {
       is AddSmsProviderState.Fail.Sender -> binding.tilProvider.error = state.reason
       is AddSmsProviderState.Fail.DigitCount -> binding.tilDigitCount.error = state.reason

app/src/main/java/ie/otormaigh/lazyotp/feature/MainActivity.kt

@@ -20,6 +20,7 @@ class SmsReceiver : BroadcastReceiver(), CoroutineScope {
   override val coroutineContext: CoroutineContext get() = Job()
 
   override fun onReceive(context: Context, intent: Intent) {
+    Timber.d("onReceive")
     if (ContextCompat.checkSelfPermission(context, Manifest.permission.RECEIVE_SMS) != PackageManager.PERMISSION_GRANTED) return
 
     if (intent.action == Telephony.Sms.Intents.SMS_RECEIVED_ACTION) {
@@ -28,8 +29,13 @@ class SmsReceiver : BroadcastReceiver(), CoroutineScope {
   }
 
   private suspend fun parseMessage(context: Context, intent: Intent) {
+    Timber.d("Parsing message")
+
     val smsCodeProviders = context.app.database.smsCodeProviderDao().fetchAllAsync()
     Telephony.Sms.Intents.getMessagesFromIntent(intent).forEach { smsMessage ->
+      Timber.d("SmsMessage -> ${smsMessage.messageBody}")
+      Timber.d("From -> ${smsMessage.displayOriginatingAddress}")
+
       smsCodeProviders.firstOrNull { it.sender == smsMessage.displayOriginatingAddress }?.let {
         WorkScheduler.oneTimeRequest<SlackPostWorker>(
           context,

app/src/main/java/ie/otormaigh/lazyotp/service/SmsReceiver.kt

@@ -9,6 +9,10 @@ fun View.hideKeyboard() {
     ?.hideSoftInputFromWindow(windowToken, 0)
 }
 
+/**
+ * FIXME
+ * Deprecated -> Use showSoftInput(View, int) or hideSoftInputFromWindow(IBinder, int) explicitly instead.
+ */
 fun View.showKeyboard() {
   (context.getSystemService(Activity.INPUT_METHOD_SERVICE) as? InputMethodManager)
     ?.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)

app/src/main/java/ie/otormaigh/lazyotp/toolbox/extension/View.kt

@@ -1,6 +1,6 @@
 package ie.otormaigh.lazyotp.toolbox
 
-import org.assertj.core.api.Assertions.assertThat
+import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 
 class SmsCodeParserTest {

app/src/test/java/ie/otormaigh/lazyotp/toolbox/SmsCodeParserTest.kt

@@ -7,7 +7,7 @@ buildscript {
 
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
+    classpath 'com.android.tools.build:gradle:7.3.0-alpha05'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
   }
 }
@@ -24,6 +24,6 @@ task clean(type: Delete) {
 }
 
 wrapper {
-  gradleVersion = "7.1"
+  gradleVersion = "7.4"
   distributionType = "bin"
 }

build.gradle

@@ -1,5 +1,5 @@
 repositories {
-  jcenter()
+  mavenCentral()
 }
 
 plugins {