Skip to content

Commit 8eb0ac8

Browse files
author
Rob Rogers
committed
v44 changes for Play Store compliance. Default URL to blank, validate URL before saving.
1 parent 4aded60 commit 8eb0ac8

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ android {
3030
applicationId = "com.immichframe.immichframe"
3131
minSdk = 23
3232
targetSdk = 35
33-
versionCode = 43
34-
versionName = "1.0.43.0"
33+
versionCode = 44
34+
versionName = "1.0.44.0"
3535
}
3636

3737
buildTypes {

app/src/main/java/com/immichframe/immichframe/MainActivity.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,11 @@ class MainActivity : AppCompatActivity() {
570570
}, 500)
571571
}
572572
Handler(Looper.getMainLooper()).postDelayed({
573-
webView.loadUrl(savedUrl)
573+
//check url again in case the user has changed it
574+
val currentUrl = prefs.getString("webview_url", "")?.trim() ?: ""
575+
if (currentUrl.isNotEmpty()) {
576+
webView.loadUrl(currentUrl)
577+
}
574578
}, 5000)
575579
}
576580
}

app/src/main/java/com/immichframe/immichframe/SettingsFragment.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
5151

5252
val btnClose = findPreference<Preference>("closeSettings")
5353
btnClose?.setOnPreferenceClickListener {
54-
activity?.setResult(Activity.RESULT_OK)
55-
activity?.finish()
56-
true
54+
val url = PreferenceManager.getDefaultSharedPreferences(requireContext())
55+
.getString("webview_url", "")?.trim()
56+
val urlPattern = Regex("^https?://.+")
57+
return@setOnPreferenceClickListener if (url.isNullOrEmpty()|| !url.matches(urlPattern)) {
58+
Toast.makeText(requireContext(), "Please enter a valid server URL.", Toast.LENGTH_LONG).show()
59+
false
60+
} else {
61+
activity?.setResult(Activity.RESULT_OK)
62+
activity?.finish()
63+
true
64+
}
5765
}
66+
5867
val btnAndroidSettings = findPreference<Preference>("androidSettings")
5968
btnAndroidSettings?.setOnPreferenceClickListener {
6069
val intent = Intent(Settings.ACTION_SETTINGS)

app/src/main/res/xml/settings_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PreferenceCategory android:title="Connection Settings">
44
<EditTextPreference
5-
android:defaultValue="http://192.168.0.100:8080"
5+
android:defaultValue=""
66
android:inputType="textUri"
77
android:key="webview_url"
88
android:title="ImmichFrame Server URL" />

0 commit comments

Comments
 (0)