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

Merge pull request #2371 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-7.3.0

Browse Source 
Bump gradle from 7.2.2 to 7.3.0
This commit is contained in:
Andy Scherzinger 2022-09-16 16:36:33 +02:00 committed by GitHub
commit 713fc1f10d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -38,6 +38,9 @@ apply plugin: 'kotlinx-serialization'
android {
compileSdkVersion 31
buildToolsVersion '33.0.0'
namespace 'com.nextcloud.talk'
defaultConfig {
minSdkVersion 21
targetSdkVersion 31

3
app/src/gplay/AndroidManifest.xml
View File

@ -21,8 +21,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.nextcloud.talk">
xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".application.NextcloudTalkApplication"

3
app/src/main/AndroidManifest.xml
View File

@ -21,8 +21,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.nextcloud.talk">
xmlns:tools="http://schemas.android.com/tools">
<uses-feature
android:name="android.hardware.camera.any"

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

@ -1543,6 +1543,7 @@ class ChatController(args: Bundle) :
val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
val fd: AssetFileDescriptor = activity?.contentResolver!!.openAssetFileDescriptor(uri, "r")!!
fd.use {
val fis = fd.createInputStream()
file.createNewFile()
@ -1552,6 +1553,7 @@ class ChatController(args: Bundle) :
}
}
}
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION) {

5
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -30,7 +30,6 @@ import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.view.inputmethod.InputMethodManager
import androidx.annotation.NonNull
import autodagger.AutoInjector
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
@ -330,7 +329,7 @@ class MessageActionsDialog(
// unused atm
}
override fun onNext(@NonNull genericOverall: GenericOverall) {
override fun onNext(genericOverall: GenericOverall) {
val statusCode = genericOverall.ocs?.meta?.statusCode
if (statusCode == HTTP_CREATED) {
chatController.updateAdapterAfterSendReaction(message, emoji)
@ -366,7 +365,7 @@ class MessageActionsDialog(
// unused atm
}
override fun onNext(@NonNull genericOverall: GenericOverall) {
override fun onNext(genericOverall: GenericOverall) {
Log.d(TAG, "deleted reaction: $emoji")
}

5
app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt
View File

@ -31,7 +31,6 @@ import android.os.Bundle
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.annotation.NonNull
import androidx.recyclerview.widget.LinearLayoutManager
import autodagger.AutoInjector
import com.google.android.material.bottomsheet.BottomSheetBehavior
@ -172,7 +171,7 @@ class ShowReactionsDialog(
// unused atm
}
override fun onNext(@NonNull reactionsOverall: ReactionsOverall) {
override fun onNext(reactionsOverall: ReactionsOverall) {
val reactionVoters: ArrayList<ReactionItem> = ArrayList()
if (reactionsOverall.ocs?.data != null) {
val map = reactionsOverall.ocs?.data
@ -227,7 +226,7 @@ class ShowReactionsDialog(
// unused atm
}
override fun onNext(@NonNull genericOverall: GenericOverall) {
override fun onNext(genericOverall: GenericOverall) {
Log.d(TAG, "deleted reaction: $emoji")
}

5
app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
View File

@ -54,9 +54,12 @@ class FileUploader(
var requestBody: RequestBody? = null
try {
val input: InputStream = context.contentResolver.openInputStream(sourceFileUri)!!
input.use {
val buf = ByteArray(input.available())
while (input.read(buf) != -1)
while (it.read(buf) != -1) {
requestBody = RequestBody.create("application/octet-stream".toMediaTypeOrNull(), buf)
}
}
} catch (e: Exception) {
Log.e(TAG, "failed to create RequestBody for $sourceFileUri", e)
}

2
build.gradle
View File

@ -34,7 +34,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5'