mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-02-19 15:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addresses a NumberFormatExcecption in SettingsActivity when the port

Browse Source 
number entered by the user is > MAX_INT
This commit is contained in:
casey langen 2017-08-24 10:34:42 -07:00
parent e38e8d2ea7
commit bb08f82c54
3 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/activity/ConnectionsActivity.kt
View File

@ -165,7 +165,7 @@ class ConfirmDeleteDialog : DialogFragment() {
val dlg = AlertDialog.Builder(activity) val dlg = AlertDialog.Builder(activity)
.setTitle(R.string.settings_confirm_delete_title) .setTitle(R.string.settings_confirm_delete_title)
.setTitle(message) .setMessage(message)
.setNegativeButton(R.string.button_no, null) .setNegativeButton(R.string.button_no, null)
.setPositiveButton(R.string.button_yes) { _, _ -> .setPositiveButton(R.string.button_yes) { _, _ ->
(activity as ConnectionsActivity).onConfirmDelete(connection) (activity as ConnectionsActivity).onConfirmDelete(connection)

60
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/activity/SettingsActivity.kt
View File

@ -200,9 +200,9 @@ class SettingsActivity : WebSocketActivityBase() {
} }
} }
private fun showInvalidConnectionDialog() { private fun showInvalidConnectionDialog(messageId: Int = R.string.settings_invalid_connection_message) {
if (!dialogVisible(InvalidConnectionDialog.TAG)) { if (!dialogVisible(InvalidConnectionDialog.TAG)) {
showDialog(InvalidConnectionDialog.newInstance(), InvalidConnectionDialog.TAG) showDialog(InvalidConnectionDialog.newInstance(messageId), InvalidConnectionDialog.TAG)
} }
} }
@ -235,28 +235,33 @@ class SettingsActivity : WebSocketActivityBase() {
val httpPort = httpPortText.text.toString() val httpPort = httpPortText.text.toString()
val password = passwordText.text.toString() val password = passwordText.text.toString()
prefs.edit() try {
.putString(Keys.ADDRESS, addr) prefs.edit()
.putInt(Keys.MAIN_PORT, if (port.isNotEmpty()) Integer.valueOf(port) else 0) .putString(Keys.ADDRESS, addr)
.putInt(Keys.AUDIO_PORT, if (httpPort.isNotEmpty()) Integer.valueOf(httpPort) else 0) .putInt(Keys.MAIN_PORT, if (port.isNotEmpty()) port.toInt() else 0)
.putString(Keys.PASSWORD, password) .putInt(Keys.AUDIO_PORT, if (httpPort.isNotEmpty()) httpPort.toInt() else 0)
.putBoolean(Keys.ALBUM_ART_ENABLED, albumArtCheckbox.isChecked) .putString(Keys.PASSWORD, password)
.putBoolean(Keys.MESSAGE_COMPRESSION_ENABLED, messageCompressionCheckbox.isChecked) .putBoolean(Keys.ALBUM_ART_ENABLED, albumArtCheckbox.isChecked)
.putBoolean(Keys.SOFTWARE_VOLUME, softwareVolume.isChecked) .putBoolean(Keys.MESSAGE_COMPRESSION_ENABLED, messageCompressionCheckbox.isChecked)
.putBoolean(Keys.SSL_ENABLED, sslCheckbox.isChecked) .putBoolean(Keys.SOFTWARE_VOLUME, softwareVolume.isChecked)
.putBoolean(Keys.CERT_VALIDATION_DISABLED, certCheckbox.isChecked) .putBoolean(Keys.SSL_ENABLED, sslCheckbox.isChecked)
.putInt(Keys.TRANSCODER_BITRATE_INDEX, bitrateSpinner.selectedItemPosition) .putBoolean(Keys.CERT_VALIDATION_DISABLED, certCheckbox.isChecked)
.putInt(Keys.DISK_CACHE_SIZE_INDEX, cacheSpinner.selectedItemPosition) .putInt(Keys.TRANSCODER_BITRATE_INDEX, bitrateSpinner.selectedItemPosition)
.apply() .putInt(Keys.DISK_CACHE_SIZE_INDEX, cacheSpinner.selectedItemPosition)
.apply()
if (!softwareVolume.isChecked) { if (!softwareVolume.isChecked) {
PlayerWrapper.setVolume(1.0f) PlayerWrapper.setVolume(1.0f)
}
StreamProxy.reload()
wss.disconnect()
finish()
}
catch (ex: NumberFormatException) {
showInvalidConnectionDialog(R.string.settings_invalid_connection_no_name_message)
} }
StreamProxy.reload()
wss.disconnect()
finish()
} }
override val webSocketServiceClient: WebSocketService.Client? override val webSocketServiceClient: WebSocketService.Client?
@ -344,7 +349,7 @@ class SettingsActivity : WebSocketActivityBase() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val dlg = AlertDialog.Builder(activity) val dlg = AlertDialog.Builder(activity)
.setTitle(R.string.settings_invalid_connection_title) .setTitle(R.string.settings_invalid_connection_title)
.setMessage(R.string.settings_invalid_connection_message) .setMessage(arguments.getInt(EXTRA_MESSAGE_ID))
.setNegativeButton(R.string.button_ok, null) .setNegativeButton(R.string.button_ok, null)
.create() .create()
@ -354,8 +359,13 @@ class SettingsActivity : WebSocketActivityBase() {
companion object { companion object {
val TAG = "invalid_connection_dialog" val TAG = "invalid_connection_dialog"
fun newInstance(): InvalidConnectionDialog { private val EXTRA_MESSAGE_ID = "extra_message_id"
return InvalidConnectionDialog() fun newInstance(messageId: Int = R.string.settings_invalid_connection_message): InvalidConnectionDialog {
val args = Bundle()
args.putInt(EXTRA_MESSAGE_ID, messageId)
val result = InvalidConnectionDialog()
result.arguments = args
return result
} }
} }
} }

1
src/musikdroid/app/src/main/res/values/strings.xml
View File

@ -89,6 +89,7 @@
<string name="settings_save_as_title">save as</string> <string name="settings_save_as_title">save as</string>
<string name="settings_invalid_connection_title">invalid connection</string> <string name="settings_invalid_connection_title">invalid connection</string>
<string name="settings_invalid_connection_message">one or more connection fields are invalid.\n\nensure you\'ve entered a valid name, hostname, and port numbers.</string> <string name="settings_invalid_connection_message">one or more connection fields are invalid.\n\nensure you\'ve entered a valid name, hostname, and port numbers.</string>
<string name="settings_invalid_connection_no_name_message">one or more connection fields are invalid.\n\nensure you\'ve entered a hostname and port numbers.</string>
<string name="settings_confirm_delete_title">confirm delete</string> <string name="settings_confirm_delete_title">confirm delete</string>
<string name="settings_confirm_delete_message">are you sure you want to delete \'%s\'?</string> <string name="settings_confirm_delete_message">are you sure you want to delete \'%s\'?</string>
<string name="connections_no_presets">no saved connection presets.</string> <string name="connections_no_presets">no saved connection presets.</string>