From e059ecb10b1c99465fc0774b25c11454041f8efb Mon Sep 17 00:00:00 2001 From: Elijah Whang <59347000+ewhang5@users.noreply.github.com> Date: Tue, 2 Jul 2024 13:00:51 -0500 Subject: [PATCH] all: less warnings is more (fixes #3749) (#3750) Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../ole/planet/myplanet/ui/helpwanted/HelpWantedFragment.kt | 5 ++--- .../org/ole/planet/myplanet/utilities/JsonParserUtils.kt | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4c821c5a0c..1627842de0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1642 - versionName "0.16.42" + versionCode 1643 + versionName "0.16.43" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/helpwanted/HelpWantedFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/helpwanted/HelpWantedFragment.kt index 2fabc9258a..c4fb467168 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/helpwanted/HelpWantedFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/helpwanted/HelpWantedFragment.kt @@ -9,10 +9,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import com.google.gson.JsonObject -import com.google.gson.JsonParser +import com.google.gson.JsonParser.parseString import org.ole.planet.myplanet.R import org.ole.planet.myplanet.databinding.FragmentHelpWantedBinding -import org.ole.planet.myplanet.ui.sync.SyncActivity import org.ole.planet.myplanet.utilities.Constants.PREFS_NAME import org.ole.planet.myplanet.utilities.JsonUtils.getString @@ -23,7 +22,7 @@ class HelpWantedFragment : Fragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { fragmentHelpWantedBinding = FragmentHelpWantedBinding.inflate(inflater, container, false) settings = requireActivity().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) - if (settings.contains("user_admin")) manager = JsonParser().parse(settings.getString("user_admin", "")).asJsonObject + if (settings.contains("user_admin")) manager = parseString(settings.getString("user_admin", "")).asJsonObject return fragmentHelpWantedBinding.root } diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/JsonParserUtils.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/JsonParserUtils.kt index d98db11e81..3aa3bdf9de 100644 --- a/app/src/main/java/org/ole/planet/myplanet/utilities/JsonParserUtils.kt +++ b/app/src/main/java/org/ole/planet/myplanet/utilities/JsonParserUtils.kt @@ -1,13 +1,12 @@ package org.ole.planet.myplanet.utilities import com.google.gson.JsonArray -import com.google.gson.JsonParser +import com.google.gson.JsonParser.parseString object JsonParserUtils { @JvmStatic fun getStringAsJsonArray(s: String?): JsonArray { - val parser = JsonParser() - val arrayElement = parser.parse(s) + val arrayElement = parseString(s) return arrayElement.asJsonArray } }