Simplify settings printer summary

Author: robbi5

pretixprint/app/src/main/java/eu/pretix/pretixprint/ui/Settings.kt

@@ -95,20 +95,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
     override fun onResume() {
         super.onResume()
         for (type in types) {
-            val connection = defaultSharedPreferences.getString("hardware_${type}printer_connection", "network_printer")
-
-            if (!TextUtils.isEmpty(defaultSharedPreferences.getString("hardware_${type}printer_ip", ""))) {
-                val ip = defaultSharedPreferences.getString("hardware_${type}printer_ip", "")
-                val name = defaultSharedPreferences.getString("hardware_${type}printer_printername", "")
-
-                findPreference<Preference>("hardware_${type}printer_find")?.summary = getString(
-                        R.string.pref_printer_current, name, ip, getString(resources.getIdentifier(connection, "string", requireActivity().packageName))
-                )
-            } else if (!TextUtils.isEmpty(defaultSharedPreferences.getString("hardware_${type}printer_connection", ""))) {
-                findPreference<Preference>("hardware_${type}printer_find")?.summary = getString(R.string.pref_printer_current_short,
-                    getString(resources.getIdentifier(connection, "string", requireActivity().packageName)))
-            } else {
-                findPreference<Preference>("hardware_${type}printer_find")?.summary = ""
+            val pref = findPreference<Preference>("hardware_${type}printer_find")
+            if (pref != null) {
+                if (!TextUtils.isEmpty(defaultSharedPreferences.getString("hardware_${type}printer_ip", ""))) {
+                    pref.summary = printerSummary(type)
+               } else {
+                    pref.summary = ""
+                }
             }
         }
 
@@ -122,6 +115,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
+    private fun printerSummary(type: String): String {
+        val ip = defaultSharedPreferences.getString("hardware_${type}printer_ip", "")
+        val name = defaultSharedPreferences.getString("hardware_${type}printer_printername", "")
+        val connection = defaultSharedPreferences.getString("hardware_${type}printer_connection", "network_printer")
+        return getString(R.string.pref_printer_current, name, ip, getString(resources.getIdentifier(connection, "string", requireActivity().packageName)))
+    }
+
     private fun asset_dialog(@StringRes title: Int) {
         val webView = WebView(requireActivity())
         webView.loadUrl("file:///android_asset/about.html")

pretixprint/app/src/main/res/xml/preferences.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="@string/settings_label_ticketprinter">
         <Preference