updated feedback dependency to 2.0.1 which is written in kotlin as we…

…ll now
MFlisar · Jun 10, 2021 · 9b60754 · 9b60754
1 parent dd7aa80
commit 9b60754
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/library-feedback/src/main/java/com/michaelflisar/lumberjack/ExtensionFeedback.kt b/library-feedback/src/main/java/com/michaelflisar/lumberjack/ExtensionFeedback.kt
@@ -1,7 +1,8 @@
 package com.michaelflisar.lumberjack
 
 import android.content.Context
-import com.michaelflisar.feedbackmanager.FeedbackBuilder
+import com.michaelflisar.feedbackmanager.Feedback
+import com.michaelflisar.feedbackmanager.FeedbackFile
 import com.michaelflisar.lumberjack.core.CoreUtil
 import java.io.File
 
@@ -19,12 +20,12 @@ fun L.sendFeedback(
     titleForChooser: String = "Send feedback with",
     filesToAppend: List<File> = emptyList()
 ) {
-    val builder = FeedbackBuilder.create()
-        .withSubject(CoreUtil.getRealSubject(context, subject))
-        .addReceiver(receiver)
-    logFile?.let { builder.addFile(it) }
-    filesToAppend.forEach {
-        builder.addFile(it)
-    }
-    builder.startEmailChooser(context, titleForChooser)
+    val allFiles = filesToAppend.toMutableList()
+    logFile?.let { allFiles.add(0, it) }
+    val feedback = Feedback(
+        listOf(receiver),
+        CoreUtil.getRealSubject(context, subject),
+        attachments = allFiles.map { FeedbackFile.DefaultName(it) }
+    )
+    feedback.startEmailChooser(context, titleForChooser)
 }
diff --git a/library-notification/build.gradle b/library-notification/build.gradle
@@ -32,6 +32,12 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlinVersion}"
 
+    // ------------------------
+    // AndroidX
+    // ------------------------
+
+    implementation "androidx.core:core-ktx:${versions.core}"
+
     // ------------------------
     // Library
     // ------------------------

diff --git a/library-notification/src/main/java/com/michaelflisar/lumberjack/ExtensionNotification.kt b/library-notification/src/main/java/com/michaelflisar/lumberjack/ExtensionNotification.kt
@@ -5,7 +5,8 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
-import com.michaelflisar.feedbackmanager.FeedbackBuilder
+import com.michaelflisar.feedbackmanager.Feedback
+import com.michaelflisar.feedbackmanager.FeedbackFile
 import com.michaelflisar.lumberjack.core.CoreUtil
 import java.io.File
 
@@ -28,15 +29,15 @@ fun L.showCrashNotification(
     titleForChooser: String = "Send report with",
     filesToAppend: List<File> = emptyList()
 ) {
-    val builder = FeedbackBuilder.create()
-        .withSubject(CoreUtil.getRealSubject(context, subject))
-        .addReceiver(receiver)
-    logFile?.let { builder.addFile(it) }
-    filesToAppend.forEach {
-        builder.addFile(it)
-    }
+    val allFiles = filesToAppend.toMutableList()
+    logFile?.let { allFiles.add(0, it) }
+    val feedback = Feedback(
+        listOf(receiver),
+        CoreUtil.getRealSubject(context, subject),
+        attachments = allFiles.map { FeedbackFile.DefaultName(it) }
+    )
 
-    builder
+    feedback
         .startNotification(
             context,
             titleForChooser,

diff --git a/versions.gradle b/versions.gradle
@@ -8,7 +8,7 @@ ext {
             targetSdk        : 30]
 
     versions = [
-            kotlinVersion  : "1.5.0",
+            kotlinVersion  : "1.5.10",
             gradlePlugin   : "4.0.2",
             mavenVersion   : "2.0",
 
@@ -17,7 +17,7 @@ ext {
             lifecycle      : "2.3.1",
             core           : "1.5.0",
 
-            feedbackManager: "1.3",
+            feedbackManager: "2.0.1",
 
             slf4j          : "1.7.25",
             logback        : "2.0.0",