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

reformat kotlin

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-21 22:42:54 +02:00
parent 297ece8e7b
commit 2b71d30637
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
View File

@ -335,21 +335,17 @@ class IncomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
try { try {
for (workInfo in workers.get()) { for (workInfo in workers.get()) {
if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) { if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) {
Log.d( Log.d(TAG, "Download worker for " + fileId + " is already running or scheduled")
TAG, "Download worker for " + fileId + " is already running or " +
"scheduled"
)
return return
} }
} }
} catch (e: ExecutionException) { } catch (e: ExecutionException) {
Log.e(TAG, "Error when checking if worker already exsists", e) Log.e(TAG, "Error when checking if worker already exists", e)
} catch (e: InterruptedException) { } catch (e: InterruptedException) {
Log.e(TAG, "Error when checking if worker already exsists", e) Log.e(TAG, "Error when checking if worker already exists", e)
} }
val data: Data
val downloadWorker: OneTimeWorkRequest val data: Data = Data.Builder()
data = Data.Builder()
.putString(DownloadFileToCacheWorker.KEY_BASE_URL, baseUrl) .putString(DownloadFileToCacheWorker.KEY_BASE_URL, baseUrl)
.putString(DownloadFileToCacheWorker.KEY_USER_ID, userId) .putString(DownloadFileToCacheWorker.KEY_USER_ID, userId)
.putString(DownloadFileToCacheWorker.KEY_ATTACHMENT_FOLDER, attachmentFolder) .putString(DownloadFileToCacheWorker.KEY_ATTACHMENT_FOLDER, attachmentFolder)
@ -357,10 +353,12 @@ class IncomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
.putString(DownloadFileToCacheWorker.KEY_FILE_PATH, path) .putString(DownloadFileToCacheWorker.KEY_FILE_PATH, path)
.putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileSize) .putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileSize)
.build() .build()
downloadWorker = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
val downloadWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
.setInputData(data) .setInputData(data)
.addTag(fileId) .addTag(fileId)
.build() .build()
WorkManager.getInstance().enqueue(downloadWorker) WorkManager.getInstance().enqueue(downloadWorker)
WorkManager.getInstance(context!!).getWorkInfoByIdLiveData(downloadWorker.id) WorkManager.getInstance(context!!).getWorkInfoByIdLiveData(downloadWorker.id)

18
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
View File

@ -311,21 +311,17 @@ class OutcomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
try { try {
for (workInfo in workers.get()) { for (workInfo in workers.get()) {
if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) { if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) {
Log.d( Log.d(TAG, "Download worker for " + fileId + " is already running or scheduled")
TAG, "Download worker for " + fileId + " is already running or " +
"scheduled"
)
return return
} }
} }
} catch (e: ExecutionException) { } catch (e: ExecutionException) {
Log.e(TAG, "Error when checking if worker already exsists", e) Log.e(TAG, "Error when checking if worker already exists", e)
} catch (e: InterruptedException) { } catch (e: InterruptedException) {
Log.e(TAG, "Error when checking if worker already exsists", e) Log.e(TAG, "Error when checking if worker already exists", e)
} }
val data: Data
val downloadWorker: OneTimeWorkRequest val data: Data = Data.Builder()
data = Data.Builder()
.putString(DownloadFileToCacheWorker.KEY_BASE_URL, baseUrl) .putString(DownloadFileToCacheWorker.KEY_BASE_URL, baseUrl)
.putString(DownloadFileToCacheWorker.KEY_USER_ID, userId) .putString(DownloadFileToCacheWorker.KEY_USER_ID, userId)
.putString(DownloadFileToCacheWorker.KEY_ATTACHMENT_FOLDER, attachmentFolder) .putString(DownloadFileToCacheWorker.KEY_ATTACHMENT_FOLDER, attachmentFolder)
@ -333,10 +329,12 @@ class OutcomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
.putString(DownloadFileToCacheWorker.KEY_FILE_PATH, path) .putString(DownloadFileToCacheWorker.KEY_FILE_PATH, path)
.putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileSize) .putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileSize)
.build() .build()
downloadWorker = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
val downloadWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
.setInputData(data) .setInputData(data)
.addTag(fileId) .addTag(fileId)
.build() .build()
WorkManager.getInstance().enqueue(downloadWorker) WorkManager.getInstance().enqueue(downloadWorker)
WorkManager.getInstance(context!!).getWorkInfoByIdLiveData(downloadWorker.id) WorkManager.getInstance(context!!).getWorkInfoByIdLiveData(downloadWorker.id)

16
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -1031,15 +1031,19 @@ class ChatController(args: Bundle) :
uploadFiles(filesToUpload, false) uploadFiles(filesToUpload, false)
} }
} else { } else {
Toast.makeText(context, context?.getString(R.string.read_storage_no_permission), Toast.LENGTH_LONG) Toast
.makeText(context, context?.getString(R.string.read_storage_no_permission), Toast.LENGTH_LONG)
.show() .show()
} }
} else if (requestCode == REQUEST_RECORD_AUDIO_PERMISSION) { } else if (requestCode == REQUEST_RECORD_AUDIO_PERMISSION) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// do nothing. user will tap on the microphone again if he wants to record audio.. // do nothing. user will tap on the microphone again if he wants to record audio..
} else { } else {
Toast.makeText(context, context!!.getString(R.string.nc_voice_message_missing_audio_permission), Toast Toast.makeText(
.LENGTH_LONG).show() context,
context!!.getString(R.string.nc_voice_message_missing_audio_permission),
Toast.LENGTH_LONG
).show()
} }
} }
} }
@ -1181,11 +1185,13 @@ class ChatController(args: Bundle) :
EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener { EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener {
if (resources != null) { if (resources != null) {
smileyButton?.setImageDrawable( smileyButton?.setImageDrawable(
ContextCompat.getDrawable(context!!, R.drawable.ic_baseline_keyboard_24)) ContextCompat.getDrawable(context!!, R.drawable.ic_baseline_keyboard_24)
)
} }
}.setOnEmojiPopupDismissListener { }.setOnEmojiPopupDismissListener {
smileyButton?.setImageDrawable( smileyButton?.setImageDrawable(
ContextCompat.getDrawable(context!!, R.drawable.ic_insert_emoticon_black_24dp)) ContextCompat.getDrawable(context!!, R.drawable.ic_insert_emoticon_black_24dp)
)
}.setOnEmojiClickListener { emoji, }.setOnEmojiClickListener { emoji,
imageView -> imageView ->
binding.messageInputView.inputEditText?.editableText?.append(" ") binding.messageInputView.inputEditText?.editableText?.append(" ")

5
app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
View File

@ -239,10 +239,7 @@ class LocationPickerController(args: Bundle) :
MIN_LOCATION_UPDATE_DISTANCE, MIN_LOCATION_UPDATE_DISTANCE,
this this
) )
Log.d( Log.d(TAG, "LocationManager.NETWORK_PROVIDER falling back to LocationManager.GPS_PROVIDER")
TAG, "Using LocationManager.GPS_PROVIDER because LocationManager.NETWORK_PROVIDER" +
" was not available"
)
} }
else -> { else -> {
Log.e( Log.e(

3
app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
View File

@ -182,7 +182,8 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
currentUser: UserEntity, currentUser: UserEntity,
ncTargetpath: String?, ncTargetpath: String?,
filename: String?, filename: String?,
metaData: String?) { metaData: String?
) {
val paths: MutableList<String> = ArrayList() val paths: MutableList<String> = ArrayList()
paths.add("$ncTargetpath/$filename") paths.add("$ncTargetpath/$filename")