From 176b2b05d35fb0038b285fdc8a57fbd44792042a Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 24 Jun 2013 11:03:12 -0700 Subject: [PATCH] Code cleanup. In SendRequest, rename to driveSync. --- .../mytracks/AbstractSendToGoogleActivity.java | 2 +- .../apps/mytracks/TrackListActivity.java | 2 +- .../mytracks/io/sendtogoogle/SendRequest.java | 18 +++++++++--------- .../io/sendtogoogle/SendRequestTest.java | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java index fd39a3c3e..341686e42 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java @@ -273,7 +273,7 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv private void onSpreadsheetsPermissionSuccess() { Class next; if (sendRequest.isSendDrive()) { - if (sendRequest.isDriveEnableSync()) { + if (sendRequest.isDriveSync()) { PreferencesUtils.setBoolean(this, R.string.drive_sync_key, true); // Turn off everything diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index 71fdc7418..a9b9112a8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -708,7 +708,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity if (enable) { SendRequest sendRequest = new SendRequest(-1L); sendRequest.setSendDrive(true); - sendRequest.setDriveEnableSync(true); + sendRequest.setDriveSync(true); sendToGoogle(sendRequest); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequest.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequest.java index 890365b5e..f64c39f37 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequest.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequest.java @@ -36,10 +36,10 @@ public class SendRequest implements Parcelable { private boolean sendFusionTables = false; private boolean sendSpreadsheets = false; - private boolean driveEnableSync = false; // to enable Drive sync + private boolean driveSync = false; // to enable Drive sync private boolean driveShare = false; // to enable Drive share - private String driveShareEmails = null; // share with emails - private boolean driveSharePublic = false; // share as public + private String driveShareEmails = null; // for driveShare, emails to share + private boolean driveSharePublic = false; // for driveShare, share as public private Account account = null; @@ -94,12 +94,12 @@ public class SendRequest implements Parcelable { this.sendSpreadsheets = sendSpreadsheets; } - public boolean isDriveEnableSync() { - return driveEnableSync; + public boolean isDriveSync() { + return driveSync; } - public void setDriveEnableSync(boolean driveEnableSync) { - this.driveEnableSync = driveEnableSync; + public void setDriveSync(boolean driveSync) { + this.driveSync = driveSync; } public boolean isDriveShare() { @@ -180,7 +180,7 @@ public class SendRequest implements Parcelable { sendMaps = in.readByte() == 1; sendFusionTables = in.readByte() == 1; sendSpreadsheets = in.readByte() == 1; - driveEnableSync = in.readByte() == 1; + driveSync = in.readByte() == 1; driveShare = in.readByte() == 1; driveShareEmails = in.readString(); driveSharePublic = in.readByte() == 1; @@ -204,7 +204,7 @@ public class SendRequest implements Parcelable { out.writeByte((byte) (sendMaps ? 1 : 0)); out.writeByte((byte) (sendFusionTables ? 1 : 0)); out.writeByte((byte) (sendSpreadsheets ? 1 : 0)); - out.writeByte((byte) (driveEnableSync ? 1 : 0)); + out.writeByte((byte) (driveSync ? 1 : 0)); out.writeByte((byte) (driveShare ? 1 : 0)); out.writeString(driveShareEmails); out.writeByte((byte) (driveSharePublic ? 1 : 0)); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java index 019fa686d..4b587fe18 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java @@ -144,7 +144,7 @@ public class SendRequestTest extends AndroidTestCase { assertTrue(sendRequest.isSendMaps()); assertTrue(sendRequest.isSendFusionTables()); assertTrue(sendRequest.isSendSpreadsheets()); - assertTrue(sendRequest.isDriveEnableSync()); + assertTrue(sendRequest.isDriveSync()); assertTrue(sendRequest.isDriveShare()); assertEquals(DRIVE_SHARE_EMAILS, sendRequest.getDriveShareEmails()); assertTrue(sendRequest.isDriveSharePublic()); @@ -185,7 +185,7 @@ public class SendRequestTest extends AndroidTestCase { assertFalse(sendRequest.isSendMaps()); assertFalse(sendRequest.isSendFusionTables()); assertFalse(sendRequest.isSendSpreadsheets()); - assertFalse(sendRequest.isDriveEnableSync()); + assertFalse(sendRequest.isDriveSync()); assertFalse(sendRequest.isDriveShare()); assertNull(sendRequest.getDriveShareEmails()); assertFalse(sendRequest.isDriveSharePublic()); @@ -247,7 +247,7 @@ public class SendRequestTest extends AndroidTestCase { sendRequest.setSendMaps(true); sendRequest.setSendFusionTables(true); sendRequest.setSendSpreadsheets(true); - sendRequest.setDriveEnableSync(true); + sendRequest.setDriveSync(true); sendRequest.setDriveShare(true); sendRequest.setDriveShareEmails(DRIVE_SHARE_EMAILS); sendRequest.setDriveSharePublic(true);