From 95cb4db92ca5452e0d5c25fbcff64d489cd0b5f5 Mon Sep 17 00:00:00 2001 From: youtaol Date: Wed, 20 Feb 2013 17:08:08 +0800 Subject: [PATCH] Change code style. --- .../android/apps/mytracks/io/drive/SendDriveAsyncTask.java | 6 +++++- .../google/android/apps/mytracks/io/sync/SyncAdapter.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java index 70c809d9c..5f0f9f262 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java @@ -76,7 +76,11 @@ public class SendDriveAsyncTask extends AbstractSendAsyncTask { return false; } Drive drive = SyncUtils.getDriveService(credential); - String folderId = SyncUtils.getMyTracksFolder(context, drive).getId(); + File folder = SyncUtils.getMyTracksFolder(context, drive); + if (folder == null) { + return false; + } + String folderId = folder.getId(); if (folderId == null) { return false; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java index 6d4a39024..b23c9bc04 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncAdapter.java @@ -113,7 +113,11 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter { driveAccountName = account.name; } - String folderId = SyncUtils.getMyTracksFolder(context, drive).getId(); + File folder = SyncUtils.getMyTracksFolder(context, drive); + if (folder == null) { + return; + } + String folderId = folder.getId(); if (folderId == null) { return; }