1
0
mirror of https://github.com/owncloud/android-library.git synced 2025-09-09 08:57:22 +00:00

Compare commits

..

No commits in common. "cb076aa6b985cfd0fd480c29ed49bf171acb3410" and "359e5912752abbdbea18fd6627212928e51a86bb" have entirely different histories.

6 changed files with 23 additions and 17 deletions

View File

@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
orgJetbrainsKotlin = '1.7.20' kotlinVersion = '1.6.21'
comSquareupMoshi = '1.14.0' moshiVersion = "1.13.0"
} }
repositories { repositories {
@ -10,9 +10,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
} }
dependencies { dependencies {
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.0.0" classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0"
classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$orgJetbrainsKotlin" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
} }
} }
@ -26,4 +26,4 @@ allprojects {
subprojects { subprojects {
apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: "org.jlleitschuh.gradle.ktlint"
} }

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -5,16 +5,16 @@ apply plugin: 'kotlin-parcelize'
dependencies { dependencies {
api 'com.squareup.okhttp3:okhttp:4.6.0' api 'com.squareup.okhttp3:okhttp:4.6.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$orgJetbrainsKotlin" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5' api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2' api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
// Moshi // Moshi
implementation("com.squareup.moshi:moshi-kotlin:$comSquareupMoshi") { implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") {
exclude module: "kotlin-reflect" exclude module: "kotlin-reflect"
} }
implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'org.apache.commons:commons-lang3:3.12.0'
kapt "com.squareup.moshi:moshi-kotlin-codegen:$comSquareupMoshi" kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.9' testImplementation 'org.robolectric:robolectric:4.9'
@ -22,7 +22,7 @@ dependencies {
} }
android { android {
compileSdkVersion 33 compileSdkVersion 31
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
@ -39,5 +39,4 @@ android {
includeAndroidResources = true includeAndroidResources = true
} }
} }
namespace 'com.owncloud.android.lib'
} }

View File

@ -23,7 +23,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest package="com.owncloud.android.lib"
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23. <!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23.
In API >= 23 the do not exist anymore --> In API >= 23 the do not exist anymore -->

View File

@ -1,6 +1,8 @@
/* ownCloud Android Library is available under MIT license /* ownCloud Android Library is available under MIT license
* Copyright (C) 2022 ownCloud GmbH. * Copyright (C) 2022 ownCloud GmbH.
* *
* @author David González Verdugo
*
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
@ -30,7 +32,8 @@ import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation
import com.owncloud.android.lib.resources.status.RemoteCapability import com.owncloud.android.lib.resources.status.RemoteCapability
import com.owncloud.android.lib.resources.status.services.CapabilityService import com.owncloud.android.lib.resources.status.services.CapabilityService
class OCCapabilityService(override val client: OwnCloudClient) : CapabilityService { class OCCapabilityService(override val client: OwnCloudClient) :
CapabilityService {
override fun getCapabilities(): RemoteOperationResult<RemoteCapability> = override fun getCapabilities(): RemoteOperationResult<RemoteCapability> =
GetRemoteCapabilitiesOperation().execute(client) GetRemoteCapabilitiesOperation().execute(client)
} }

View File

@ -1,6 +1,8 @@
/* ownCloud Android Library is available under MIT license /* ownCloud Android Library is available under MIT license
* Copyright (C) 2022 ownCloud GmbH. * Copyright (C) 2022 ownCloud GmbH.
* *
* @author Abel García de Prada
*
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
@ -24,6 +26,7 @@
package com.owncloud.android.lib.resources.status.services.implementation package com.owncloud.android.lib.resources.status.services.implementation
import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation
@ -36,16 +39,16 @@ class OCServerInfoService : ServerInfoService {
override fun checkPathExistence( override fun checkPathExistence(
path: String, path: String,
isUserLoggedIn: Boolean, isUserLoggedIn: Boolean,
client: OwnCloudClient, client: OwnCloudClient
): RemoteOperationResult<Boolean> = ): RemoteOperationResult<Boolean> =
CheckPathExistenceRemoteOperation( CheckPathExistenceRemoteOperation(
remotePath = path, remotePath = path,
isUserLoggedIn = true, isUserLoggedIn = true
).execute(client) ).execute(client)
override fun getRemoteStatus( override fun getRemoteStatus(
path: String, path: String,
client: OwnCloudClient, client: OwnCloudClient
): RemoteOperationResult<RemoteServerInfo> = ): RemoteOperationResult<RemoteServerInfo> =
GetRemoteStatusOperation().execute(client) GetRemoteStatusOperation().execute(client)
} }