From bb97727f01ced3c2bd650d7eb89ca399b8f32a5f Mon Sep 17 00:00:00 2001 From: Sean-on-Git Date: Thu, 19 Dec 2024 08:46:39 -0500 Subject: [PATCH 1/3] Fixed crash on share due to lack of notification icon --- .../main/java/org/seanandroid/mealieurlshare/ShareActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt b/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt index ac42eb4..ab11bc4 100644 --- a/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt +++ b/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt @@ -100,7 +100,7 @@ class ShareActivity : AppCompatActivity() { val notification = NotificationCompat.Builder(this, channelId) .setContentTitle("Mealie URL Share") .setContentText(message) - //.setSmallIcon(R.drawable.ic_notification) // Replace with your notification icon + .setSmallIcon(R.drawable.baseline_error_24) // Replace with your notification icon .setAutoCancel(true) .build() From 735da604a20950fa8c48da46eb32b855caa04ac9 Mon Sep 17 00:00:00 2001 From: Sean-on-Git Date: Thu, 19 Dec 2024 08:49:09 -0500 Subject: [PATCH 2/3] Fixed crash on share due to lack of notification icon --- .gitignore | 2 -- app/src/main/res/drawable/baseline_error_24.xml | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/baseline_error_24.xml diff --git a/.gitignore b/.gitignore index d796120..aa724b7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ .DS_Store /build /captures -/app -/.gradle .externalNativeBuild .cxx local.properties diff --git a/app/src/main/res/drawable/baseline_error_24.xml b/app/src/main/res/drawable/baseline_error_24.xml new file mode 100644 index 0000000..aef9dd2 --- /dev/null +++ b/app/src/main/res/drawable/baseline_error_24.xml @@ -0,0 +1,5 @@ + + + + + From af25897bb5f5a915286e97f6b6701fdf2310dd02 Mon Sep 17 00:00:00 2001 From: Sean-on-Git Date: Thu, 19 Dec 2024 11:12:13 -0500 Subject: [PATCH 3/3] Fixed share not working (Typo API and JSONify body) --- .../mealieurlshare/ShareActivity.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt b/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt index ab11bc4..7349a06 100644 --- a/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt +++ b/app/src/main/java/org/seanandroid/mealieurlshare/ShareActivity.kt @@ -11,10 +11,12 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.app.NotificationCompat import okhttp3.Call import okhttp3.Callback -import okhttp3.FormBody +import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.OkHttpClient import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response +import org.json.JSONObject import java.io.IOException class ShareActivity : AppCompatActivity() { @@ -44,10 +46,16 @@ class ShareActivity : AppCompatActivity() { private fun sendPostRequest(url: String, token: String, sharedText: String) { isRequestRunning = true - val fullUrl = "$url/api/recipe/create/url" - val requestBody = FormBody.Builder() - .add("data", sharedText) - .build() + val fullUrl = "$url/api/recipes/create/url" + + // Create JSON object for the request body + val jsonBody = JSONObject() + jsonBody.put("includeTags", false) // Set includeTags to false + jsonBody.put("url", sharedText) // Set the URL to the shared text + + // Create the request body with JSON media type + val requestBody = jsonBody.toString() + .toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull()) val request = Request.Builder() .url(fullUrl)