gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

ProfileController: code cleanup

Browse Source 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2022-06-29 11:23:03 +02:00 committed by Andy Scherzinger
parent cb2ee730fa
commit 95119ba9d6
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt
View File

@ -22,7 +22,6 @@
package com.nextcloud.talk.controllers package com.nextcloud.talk.controllers
import android.app.Activity import android.app.Activity
import android.content.ActivityNotFoundException
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.content.res.ColorStateList import android.content.res.ColorStateList
@ -86,7 +85,7 @@ import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody.Companion.asRequestBody
import okhttp3.ResponseBody import okhttp3.ResponseBody
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
@ -95,7 +94,6 @@ import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.IOException import java.io.IOException
import java.util.LinkedList import java.util.LinkedList
import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
@ -511,11 +509,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
} }
private fun takePictureForAvatar() { private fun takePictureForAvatar() {
try { startActivityForResult(TakePhotoActivity.createIntent(context), REQUEST_CODE_TAKE_PICTURE)
startActivityForResult(TakePhotoActivity.createIntent(context!!), REQUEST_CODE_TAKE_PICTURE)
} catch (e: ActivityNotFoundException) {
// TODO
}
} }
private fun handleAvatar(remotePath: String?) { private fun handleAvatar(remotePath: String?) {
@ -543,7 +537,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
takePictureForAvatar() takePictureForAvatar()
} else { } else {
Toast Toast
.makeText(context, context?.getString(R.string.take_photo_permission), Toast.LENGTH_LONG) .makeText(context, context.getString(R.string.take_photo_permission), Toast.LENGTH_LONG)
.show() .show()
} }
} }
@ -574,11 +568,11 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
private fun createTempFileForAvatar(): File? { private fun createTempFileForAvatar(): File? {
FileUtils.removeTempCacheFile( FileUtils.removeTempCacheFile(
this.context!!, this.context,
AVATAR_PATH AVATAR_PATH
) )
return FileUtils.getTempCacheFile( return FileUtils.getTempCacheFile(
context!!, context,
AVATAR_PATH AVATAR_PATH
) )
} }
@ -623,11 +617,11 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
builder.setType(MultipartBody.FORM) builder.setType(MultipartBody.FORM)
builder.addFormDataPart( builder.addFormDataPart(
"files[]", file!!.name, "files[]", file!!.name,
RequestBody.create(IMAGE_PREFIX_GENERIC.toMediaTypeOrNull(), file) file.asRequestBody(IMAGE_PREFIX_GENERIC.toMediaTypeOrNull())
) )
val filePart: MultipartBody.Part = MultipartBody.Part.createFormData( val filePart: MultipartBody.Part = MultipartBody.Part.createFormData(
"files[]", file.name, "files[]", file.name,
RequestBody.create(IMAGE_JPG.toMediaTypeOrNull(), file) file.asRequestBody(IMAGE_JPG.toMediaTypeOrNull())
) )
// upload file // upload file
@ -649,7 +643,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
Toast.makeText( Toast.makeText(
applicationContext, context!!.getString(R.string.default_error_msg), applicationContext, context.getString(R.string.default_error_msg),
Toast Toast
.LENGTH_LONG .LENGTH_LONG
).show() ).show()
@ -763,7 +757,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
) )
} }
if (controller.edit && if (controller.edit &&
controller.editableFields.contains(item.field.toString().toLowerCase(Locale.ROOT)) controller.editableFields.contains(item.field.toString().lowercase())
) { ) {
holder.binding.userInfoEditText.isEnabled = true holder.binding.userInfoEditText.isEnabled = true
holder.binding.userInfoEditText.isFocusableInTouchMode = true holder.binding.userInfoEditText.isFocusableInTouchMode = true