forked from upstream-mirrors/OpenTracks
Code cleanup. In SendRequest, rename to driveSync.
This commit is contained in:
@@ -273,7 +273,7 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
|
|||||||
private void onSpreadsheetsPermissionSuccess() {
|
private void onSpreadsheetsPermissionSuccess() {
|
||||||
Class<?> next;
|
Class<?> next;
|
||||||
if (sendRequest.isSendDrive()) {
|
if (sendRequest.isSendDrive()) {
|
||||||
if (sendRequest.isDriveEnableSync()) {
|
if (sendRequest.isDriveSync()) {
|
||||||
PreferencesUtils.setBoolean(this, R.string.drive_sync_key, true);
|
PreferencesUtils.setBoolean(this, R.string.drive_sync_key, true);
|
||||||
|
|
||||||
// Turn off everything
|
// Turn off everything
|
||||||
|
|||||||
@@ -708,7 +708,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
|||||||
if (enable) {
|
if (enable) {
|
||||||
SendRequest sendRequest = new SendRequest(-1L);
|
SendRequest sendRequest = new SendRequest(-1L);
|
||||||
sendRequest.setSendDrive(true);
|
sendRequest.setSendDrive(true);
|
||||||
sendRequest.setDriveEnableSync(true);
|
sendRequest.setDriveSync(true);
|
||||||
sendToGoogle(sendRequest);
|
sendToGoogle(sendRequest);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,10 +36,10 @@ public class SendRequest implements Parcelable {
|
|||||||
private boolean sendFusionTables = false;
|
private boolean sendFusionTables = false;
|
||||||
private boolean sendSpreadsheets = 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 boolean driveShare = false; // to enable Drive share
|
||||||
private String driveShareEmails = null; // share with emails
|
private String driveShareEmails = null; // for driveShare, emails to share
|
||||||
private boolean driveSharePublic = false; // share as public
|
private boolean driveSharePublic = false; // for driveShare, share as public
|
||||||
|
|
||||||
private Account account = null;
|
private Account account = null;
|
||||||
|
|
||||||
@@ -94,12 +94,12 @@ public class SendRequest implements Parcelable {
|
|||||||
this.sendSpreadsheets = sendSpreadsheets;
|
this.sendSpreadsheets = sendSpreadsheets;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDriveEnableSync() {
|
public boolean isDriveSync() {
|
||||||
return driveEnableSync;
|
return driveSync;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDriveEnableSync(boolean driveEnableSync) {
|
public void setDriveSync(boolean driveSync) {
|
||||||
this.driveEnableSync = driveEnableSync;
|
this.driveSync = driveSync;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDriveShare() {
|
public boolean isDriveShare() {
|
||||||
@@ -180,7 +180,7 @@ public class SendRequest implements Parcelable {
|
|||||||
sendMaps = in.readByte() == 1;
|
sendMaps = in.readByte() == 1;
|
||||||
sendFusionTables = in.readByte() == 1;
|
sendFusionTables = in.readByte() == 1;
|
||||||
sendSpreadsheets = in.readByte() == 1;
|
sendSpreadsheets = in.readByte() == 1;
|
||||||
driveEnableSync = in.readByte() == 1;
|
driveSync = in.readByte() == 1;
|
||||||
driveShare = in.readByte() == 1;
|
driveShare = in.readByte() == 1;
|
||||||
driveShareEmails = in.readString();
|
driveShareEmails = in.readString();
|
||||||
driveSharePublic = in.readByte() == 1;
|
driveSharePublic = in.readByte() == 1;
|
||||||
@@ -204,7 +204,7 @@ public class SendRequest implements Parcelable {
|
|||||||
out.writeByte((byte) (sendMaps ? 1 : 0));
|
out.writeByte((byte) (sendMaps ? 1 : 0));
|
||||||
out.writeByte((byte) (sendFusionTables ? 1 : 0));
|
out.writeByte((byte) (sendFusionTables ? 1 : 0));
|
||||||
out.writeByte((byte) (sendSpreadsheets ? 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.writeByte((byte) (driveShare ? 1 : 0));
|
||||||
out.writeString(driveShareEmails);
|
out.writeString(driveShareEmails);
|
||||||
out.writeByte((byte) (driveSharePublic ? 1 : 0));
|
out.writeByte((byte) (driveSharePublic ? 1 : 0));
|
||||||
|
|||||||
+3
-3
@@ -144,7 +144,7 @@ public class SendRequestTest extends AndroidTestCase {
|
|||||||
assertTrue(sendRequest.isSendMaps());
|
assertTrue(sendRequest.isSendMaps());
|
||||||
assertTrue(sendRequest.isSendFusionTables());
|
assertTrue(sendRequest.isSendFusionTables());
|
||||||
assertTrue(sendRequest.isSendSpreadsheets());
|
assertTrue(sendRequest.isSendSpreadsheets());
|
||||||
assertTrue(sendRequest.isDriveEnableSync());
|
assertTrue(sendRequest.isDriveSync());
|
||||||
assertTrue(sendRequest.isDriveShare());
|
assertTrue(sendRequest.isDriveShare());
|
||||||
assertEquals(DRIVE_SHARE_EMAILS, sendRequest.getDriveShareEmails());
|
assertEquals(DRIVE_SHARE_EMAILS, sendRequest.getDriveShareEmails());
|
||||||
assertTrue(sendRequest.isDriveSharePublic());
|
assertTrue(sendRequest.isDriveSharePublic());
|
||||||
@@ -185,7 +185,7 @@ public class SendRequestTest extends AndroidTestCase {
|
|||||||
assertFalse(sendRequest.isSendMaps());
|
assertFalse(sendRequest.isSendMaps());
|
||||||
assertFalse(sendRequest.isSendFusionTables());
|
assertFalse(sendRequest.isSendFusionTables());
|
||||||
assertFalse(sendRequest.isSendSpreadsheets());
|
assertFalse(sendRequest.isSendSpreadsheets());
|
||||||
assertFalse(sendRequest.isDriveEnableSync());
|
assertFalse(sendRequest.isDriveSync());
|
||||||
assertFalse(sendRequest.isDriveShare());
|
assertFalse(sendRequest.isDriveShare());
|
||||||
assertNull(sendRequest.getDriveShareEmails());
|
assertNull(sendRequest.getDriveShareEmails());
|
||||||
assertFalse(sendRequest.isDriveSharePublic());
|
assertFalse(sendRequest.isDriveSharePublic());
|
||||||
@@ -247,7 +247,7 @@ public class SendRequestTest extends AndroidTestCase {
|
|||||||
sendRequest.setSendMaps(true);
|
sendRequest.setSendMaps(true);
|
||||||
sendRequest.setSendFusionTables(true);
|
sendRequest.setSendFusionTables(true);
|
||||||
sendRequest.setSendSpreadsheets(true);
|
sendRequest.setSendSpreadsheets(true);
|
||||||
sendRequest.setDriveEnableSync(true);
|
sendRequest.setDriveSync(true);
|
||||||
sendRequest.setDriveShare(true);
|
sendRequest.setDriveShare(true);
|
||||||
sendRequest.setDriveShareEmails(DRIVE_SHARE_EMAILS);
|
sendRequest.setDriveShareEmails(DRIVE_SHARE_EMAILS);
|
||||||
sendRequest.setDriveSharePublic(true);
|
sendRequest.setDriveSharePublic(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user