AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Julian Raufelder 2021-01-20 14:08:36 +01:00
parent e68c22d0f3
commit f83768ea4a
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildsystem/dependencies.gradle
View File

@ -27,7 +27,7 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.30.1' daggerVersion = '2.31'
gsonVersion = '2.8.6' gsonVersion = '2.8.6'
@ -56,7 +56,7 @@ ext {
googleApiServicesVersion = 'v3-rev197-1.25.0' googleApiServicesVersion = 'v3-rev197-1.25.0'
googlePlayServicesVersion = '19.0.0' googlePlayServicesVersion = '19.0.0'
googleClientVersion = '1.31.1' googleClientVersion = '1.31.2'
msgraphVersion = '2.5.0' msgraphVersion = '2.5.0'
msaAuthVersion = '0.10.0' msaAuthVersion = '0.10.0'
@ -70,8 +70,8 @@ ext {
jUnitVersion = '5.7.0' jUnitVersion = '5.7.0'
jUnit4Version = '4.13.1' jUnit4Version = '4.13.1'
assertJVersion = '1.7.1' assertJVersion = '1.7.1'
mockitoVersion = '3.6.28' mockitoVersion = '3.7.7'
mockitoInlineVersion = '3.6.28' mockitoInlineVersion = '3.7.7'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'
dexmakerVersion = '1.0' dexmakerVersion = '1.0'
espressoVersion = '3.3.0' espressoVersion = '3.3.0'

6
data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java
View File

@ -2,8 +2,8 @@ package org.cryptomator.data.cloud.googledrive;
import android.content.Context; import android.content.Context;
import com.google.api.client.extensions.android.http.AndroidHttp; import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.client.json.gson.GsonFactory;
import com.google.api.services.drive.Drive; import com.google.api.services.drive.Drive;
import com.google.api.services.drive.DriveScopes; import com.google.api.services.drive.DriveScopes;
@ -24,7 +24,7 @@ class GoogleDriveClientFactory {
try { try {
FixedGoogleAccountCredential credential = FixedGoogleAccountCredential.usingOAuth2(context, Collections.singleton(DriveScopes.DRIVE)); FixedGoogleAccountCredential credential = FixedGoogleAccountCredential.usingOAuth2(context, Collections.singleton(DriveScopes.DRIVE));
credential.setAccountName(accountName); credential.setAccountName(accountName);
return new Drive.Builder(AndroidHttp.newCompatibleTransport(), JacksonFactory.getDefaultInstance(), credential) // return new Drive.Builder(new NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) //
.setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) // .setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) //
.build(); .build();
} catch (Exception e) { } catch (Exception e) {