From 25e2cabbdf64ce20528b8182cff38c9525fff584 Mon Sep 17 00:00:00 2001 From: Smarshal21 Date: Thu, 28 Sep 2023 11:21:33 +0530 Subject: [PATCH] Fixed Codacy Static and ktlint errors --- .../com/nextcloud/talk/adapters/GeocodingAdapter.kt | 2 +- .../com/nextcloud/talk/location/GeocodingActivity.kt | 11 ++++++----- .../nextcloud/talk/viewmodels/GeoCodingViewModel.kt | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/GeocodingAdapter.kt b/app/src/main/java/com/nextcloud/talk/adapters/GeocodingAdapter.kt index 643129003..2c3731fe2 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/GeocodingAdapter.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/GeocodingAdapter.kt @@ -36,7 +36,7 @@ class GeocodingAdapter(private val context: Context, private var dataSource: Lis fun onItemClick(position: Int) } fun updateData(data: List
) { - this.dataSource = data + this.dataSource = data notifyDataSetChanged() } diff --git a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt index 00323ba8b..ed8fb5048 100644 --- a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt @@ -103,10 +103,11 @@ class GeocodingActivity : viewModel = ViewModelProvider(this).get(GeoCodingViewModel::class.java) // Observe geocoding results LiveData - viewModel.getGeocodingResultsLiveData().observe(this, Observer { results -> - // Update the adapter with the new results - adapter.updateData(results) - }) + viewModel.getGeocodingResultsLiveData().observe( + this, + Observer { results -> // Update the adapter with the new results + adapter.updateData(results) + }) val baseUrl = getString(R.string.osm_geocoder_url) val email = context.getString(R.string.osm_geocoder_contact) nominatimClient = TalkJsonNominatimClient(baseUrl, okHttpClient, email) @@ -200,7 +201,7 @@ class GeocodingActivity : searchView?.maxWidth = Int.MAX_VALUE searchView?.inputType = InputType.TYPE_TEXT_VARIATION_FILTER var imeOptions = EditorInfo.IME_ACTION_DONE or EditorInfo.IME_FLAG_NO_FULLSCREEN - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences!!.isKeyboardIncognito) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences.isKeyboardIncognito) { imeOptions = imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING } searchView?.imeOptions = imeOptions diff --git a/app/src/main/java/com/nextcloud/talk/viewmodels/GeoCodingViewModel.kt b/app/src/main/java/com/nextcloud/talk/viewmodels/GeoCodingViewModel.kt index 98830755e..1591e023b 100644 --- a/app/src/main/java/com/nextcloud/talk/viewmodels/GeoCodingViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/viewmodels/GeoCodingViewModel.kt @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package com.nextcloud.talk.viewmodels import android.util.Log @@ -30,6 +31,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import okhttp3.OkHttpClient +import java.io.IOException class GeoCodingViewModel : ViewModel() { private val geocodingResultsLiveData = MutableLiveData>() @@ -53,9 +55,9 @@ class GeoCodingViewModel : ViewModel() { try { val results = nominatimClient.search(query) as ArrayList
geocodingResultsLiveData.postValue(results) - } catch (e: Exception) { + } catch (e: IOException) { Log.e(TAG, "Failed to get geocoded addresses", e) } } } -} \ No newline at end of file +}