mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 03:59:35 +01:00
Fix detekt issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
f1805c9ddd
commit
6adf741dc1
@ -27,12 +27,11 @@ import kotlinx.parcelize.Parcelize
|
|||||||
@Parcelize
|
@Parcelize
|
||||||
@JsonObject
|
@JsonObject
|
||||||
data class TranslateData(
|
data class TranslateData(
|
||||||
|
|
||||||
@JsonField(name = ["text"])
|
@JsonField(name = ["text"])
|
||||||
var text: String?,
|
var text: String?,
|
||||||
@JsonField(name = ["from"])
|
@JsonField(name = ["from"])
|
||||||
var fromLanguage: String?
|
var fromLanguage: String?
|
||||||
) : Parcelable {
|
) : Parcelable {
|
||||||
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
|
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
|
||||||
constructor() : this(null, null )
|
constructor() : this(null, null)
|
||||||
}
|
}
|
||||||
|
@ -129,15 +129,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
fromLanguages = fromLanguagesSet.toTypedArray()
|
fromLanguages = fromLanguagesSet.toTypedArray()
|
||||||
toLanguages = toLanguagesSet.toTypedArray()
|
toLanguages = toLanguagesSet.toTypedArray()
|
||||||
|
|
||||||
binding.fromLanguageSpinner.adapter = ArrayAdapter(
|
fillSpinners()
|
||||||
this, android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
fromLanguages
|
|
||||||
)
|
|
||||||
|
|
||||||
binding.toLanguageSpinner.adapter = ArrayAdapter(
|
|
||||||
this, android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
toLanguages
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun enableSpinners(value: Boolean) {
|
private fun enableSpinners(value: Boolean) {
|
||||||
@ -174,6 +166,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onError(e: Throwable) {
|
override fun onError(e: Throwable) {
|
||||||
|
Log.w(TAG, "Error while translating message", e)
|
||||||
binding.progressBar.visibility = View.GONE
|
binding.progressBar.visibility = View.GONE
|
||||||
val dialogBuilder = MaterialAlertDialogBuilder(this@TranslateActivity)
|
val dialogBuilder = MaterialAlertDialogBuilder(this@TranslateActivity)
|
||||||
.setIcon(
|
.setIcon(
|
||||||
@ -210,6 +203,10 @@ class TranslateActivity : BaseActivity() {
|
|||||||
return Locale.getDefault().language
|
return Locale.getDefault().language
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return getISOFromServer(language)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getISOFromServer(language: String): String {
|
||||||
val currentUser: User = userManager.currentUser.blockingGet()
|
val currentUser: User = userManager.currentUser.blockingGet()
|
||||||
val json = JSONArray(CapabilitiesUtilNew.getLanguages(currentUser).toString())
|
val json = JSONArray(CapabilitiesUtilNew.getLanguages(currentUser).toString())
|
||||||
|
|
||||||
@ -224,14 +221,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun setupSpinners() {
|
private fun setupSpinners() {
|
||||||
binding.fromLanguageSpinner.adapter = ArrayAdapter(
|
fillSpinners()
|
||||||
this, android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
fromLanguages
|
|
||||||
)
|
|
||||||
binding.toLanguageSpinner.adapter = ArrayAdapter(
|
|
||||||
this, android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
toLanguages
|
|
||||||
)
|
|
||||||
|
|
||||||
binding.fromLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
binding.fromLanguageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||||
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
|
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
|
||||||
@ -264,6 +254,19 @@ class TranslateActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun fillSpinners() {
|
||||||
|
binding.fromLanguageSpinner.adapter = ArrayAdapter(
|
||||||
|
this,
|
||||||
|
android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
fromLanguages
|
||||||
|
)
|
||||||
|
binding.toLanguageSpinner.adapter = ArrayAdapter(
|
||||||
|
this,
|
||||||
|
android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
toLanguages
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val TAG = TranslateActivity::class.simpleName
|
private val TAG = TranslateActivity::class.simpleName
|
||||||
private const val FROM_ID = "from"
|
private const val FROM_ID = "from"
|
||||||
|
@ -28,7 +28,6 @@ import android.graphics.drawable.Drawable
|
|||||||
import android.graphics.drawable.LayerDrawable
|
import android.graphics.drawable.LayerDrawable
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.LinearLayout
|
import android.widget.LinearLayout
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import androidx.annotation.ColorInt
|
import androidx.annotation.ColorInt
|
||||||
|
@ -210,13 +210,12 @@ object CapabilitiesUtilNew {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getLanguages(user: User?) : Any? {
|
fun getLanguages(user: User?): Any? {
|
||||||
|
return if (isTranslationsSupported(user)) {
|
||||||
if(isTranslationsSupported(user)) {
|
user!!.capabilities!!.spreedCapability!!.config!!["chat"]!!["translations"]
|
||||||
return user!!.capabilities!!.spreedCapability!!.config!!["chat"]!!["translations"]
|
} else {
|
||||||
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const val DEFAULT_CHAT_SIZE = 1000
|
const val DEFAULT_CHAT_SIZE = 1000
|
||||||
|
Loading…
Reference in New Issue
Block a user