From dc811addf6e2db0c5483138fc5b97e73e1701352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Sun, 16 Apr 2017 00:43:27 +0200 Subject: [PATCH 1/2] Fix use of deprecated method from Google Drive API --- .../main/java/org/gnucash/android/export/ExportAsyncTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java index e5536cdde..4a7f670cc 100644 --- a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java +++ b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java @@ -300,7 +300,7 @@ private void moveExportToGoogleDrive() throws Exporter.ExporterException { SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mContext); String folderId = sharedPreferences.getString(mContext.getString(R.string.key_google_drive_app_folder_id), ""); - DriveFolder folder = Drive.DriveApi.getFolder(googleApiClient, DriveId.decodeFromString(folderId)); + DriveFolder folder = DriveId.decodeFromString(folderId).asDriveFolder(); // create a file on root folder DriveFolder.DriveFileResult driveFileResult = folder.createFile(googleApiClient, changeSet, driveContents) From 2a6c4c83d6aa9c8bfb6c619da0e672d7924e4914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Sun, 16 Apr 2017 00:51:23 +0200 Subject: [PATCH 2/2] Get the folder just once instead of for each exported file --- .../java/org/gnucash/android/export/ExportAsyncTask.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java index 4a7f670cc..9bc712ac4 100644 --- a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java +++ b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java @@ -271,6 +271,9 @@ private void moveExportToGoogleDrive() throws Exporter.ExporterException { final GoogleApiClient googleApiClient = BackupPreferenceFragment.getGoogleApiClient(GnuCashApplication.getAppContext()); googleApiClient.blockingConnect(); + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mContext); + String folderId = sharedPreferences.getString(mContext.getString(R.string.key_google_drive_app_folder_id), ""); + DriveFolder folder = DriveId.decodeFromString(folderId).asDriveFolder(); try { for (String exportedFilePath : mExportedFiles) { DriveApi.DriveContentsResult driveContentsResult = @@ -297,10 +300,6 @@ private void moveExportToGoogleDrive() throws Exporter.ExporterException { .setTitle(exportedFile.getName()) .setMimeType(mExporter.getExportMimeType()) .build(); - - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mContext); - String folderId = sharedPreferences.getString(mContext.getString(R.string.key_google_drive_app_folder_id), ""); - DriveFolder folder = DriveId.decodeFromString(folderId).asDriveFolder(); // create a file on root folder DriveFolder.DriveFileResult driveFileResult = folder.createFile(googleApiClient, changeSet, driveContents)