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-03-02 14:52:42 +01:00
parent b31450ad8d
commit c8e9616894
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -3,7 +3,7 @@ apply from: 'buildsystem/dependencies.gradle'
apply plugin: "com.vanniktech.android.junit.jacoco" apply plugin: "com.vanniktech.android.junit.jacoco"
buildscript { buildscript {
ext.kotlin_version = '1.4.30' ext.kotlin_version = '1.4.31'
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()

4
buildsystem/dependencies.gradle
View File

@ -26,7 +26,7 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.32' daggerVersion = '2.33'
gsonVersion = '2.8.6' gsonVersion = '2.8.6'
@ -55,7 +55,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.2' googleClientVersion = '1.31.3'
msgraphVersion = '2.8.1' msgraphVersion = '2.8.1'
msaAuthVersion = '0.10.0' msaAuthVersion = '0.10.0'

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

@ -3,7 +3,7 @@ package org.cryptomator.data.cloud.googledrive;
import android.content.Context; import android.content.Context;
import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.json.jackson2.JacksonFactory;
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;
@ -35,7 +35,9 @@ class GoogleDriveClientFactory {
Logger.getLogger("com.google.api.client").addHandler(new Handler() { Logger.getLogger("com.google.api.client").addHandler(new Handler() {
@Override @Override
public void publish(LogRecord record) { public void publish(LogRecord record) {
if (record.getMessage().startsWith("-------------- RESPONSE --------------") || record.getMessage().startsWith("-------------- REQUEST --------------") || record.getMessage().startsWith("{\n \"files\": [\n")) { if (record.getMessage().startsWith("-------------- RESPONSE --------------") //
|| record.getMessage().startsWith("-------------- REQUEST --------------") //
|| record.getMessage().startsWith("{\n \"files\": [\n")) {
Timber.tag("GoogleDriveClient").d(record.getMessage()); Timber.tag("GoogleDriveClient").d(record.getMessage());
} }
} }
@ -53,7 +55,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(new NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) // return new Drive.Builder(new NetHttpTransport(), JacksonFactory.getDefaultInstance(), credential) //
.setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) // .setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) //
.build(); .build();
} catch (Exception e) { } catch (Exception e) {