punix/noteshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Remove redundant 'jsonString != null' checks

Browse Source 
Removed redundant 'if (jsonString != null)' checks in JsonImportExportDialog.kt as jsonString is always non-null at these points, addressing 'Condition is always true' warnings.
This commit is contained in:
Désiré Werner Menrath
2025-11-06 14:53:29 +01:00
parent fb8e7917bc
commit 12839ea88e
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/de/lxtools/noteshop/ui/JsonImportExportDialog.kt
View File

@@ -105,9 +105,8 @@ fun JsonImportExportDialog(
jsonString = fileContent.toString(Charsets.UTF_8)
}
if (jsonString != null) {
try {
notesViewModel.importNotesFromJson(jsonString)
notesViewModel.importNotesFromJson(jsonString!!)
android.widget.Toast.makeText(context, R.string.json_import_successful, android.widget.Toast.LENGTH_SHORT).show()
} catch (e: kotlinx.serialization.SerializationException) {
android.util.Log.e("JsonImportExportDialog", "Error parsing notes JSON: ${e.message}")
@@ -116,9 +115,6 @@ fun JsonImportExportDialog(
android.util.Log.e("JsonImportExportDialog", "Error importing notes: ${e.message}")
android.widget.Toast.makeText(context, context.getString(R.string.json_import_failed_generic, e.message), android.widget.Toast.LENGTH_LONG).show()
}
} else {
android.widget.Toast.makeText(context, R.string.json_import_failed_no_data, android.widget.Toast.LENGTH_SHORT).show()
}
}
}
}
@@ -189,9 +185,8 @@ fun JsonImportExportDialog(
jsonString = fileContent.toString(Charsets.UTF_8)
}
if (jsonString != null) {
try {
shoppingListsViewModel.importShoppingListsFromJson(jsonString)
shoppingListsViewModel.importShoppingListsFromJson(jsonString!!)
android.widget.Toast.makeText(context, R.string.json_import_successful, android.widget.Toast.LENGTH_SHORT).show()
} catch (e: kotlinx.serialization.SerializationException) {
android.util.Log.e("JsonImportExportDialog", "Error parsing shopping lists JSON: ${e.message}")
@@ -200,9 +195,6 @@ fun JsonImportExportDialog(
android.util.Log.e("JsonImportExportDialog", "Error importing shopping lists: ${e.message}")
android.widget.Toast.makeText(context, context.getString(R.string.json_import_failed_generic, e.message), android.widget.Toast.LENGTH_LONG).show()
}
} else {
android.widget.Toast.makeText(context, R.string.json_import_failed_no_data, android.widget.Toast.LENGTH_SHORT).show()
}
}
}
}
@@ -253,9 +245,8 @@ fun JsonImportExportDialog(
jsonString = fileContent.toString(Charsets.UTF_8)
}
if (jsonString != null) {
try {
recipesViewModel.importRecipesFromJson(jsonString)
recipesViewModel.importRecipesFromJson(jsonString!!)
android.widget.Toast.makeText(context, R.string.json_import_successful, android.widget.Toast.LENGTH_SHORT).show()
} catch (e: kotlinx.serialization.SerializationException) {
android.util.Log.e("JsonImportExportDialog", "Error parsing recipes JSON: ${e.message}")
@@ -264,9 +255,6 @@ fun JsonImportExportDialog(
android.util.Log.e("JsonImportExportDialog", "Error importing recipes: ${e.message}")
android.widget.Toast.makeText(context, context.getString(R.string.json_import_failed_generic, e.message), android.widget.Toast.LENGTH_LONG).show()
}
} else {
android.widget.Toast.makeText(context, R.string.json_import_failed_no_data, android.widget.Toast.LENGTH_SHORT).show()
}
}
}
}