upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup, in SendRequest, remove support for sharing a map url.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-04 17:26:56 -07:00
parent fe3b063790
commit c8736b7f72
4 changed files with 1 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+1 -19
View File
@@ -23,7 +23,6 @@ import com.google.android.apps.mytracks.fragments.CheckPermissionFragment.CheckP
import com.google.android.apps.mytracks.fragments.ChooseAccountDialogFragment;
import com.google.android.apps.mytracks.fragments.ChooseAccountDialogFragment.ChooseAccountCaller;
import com.google.android.apps.mytracks.fragments.ChooseActivityDialogFragment;
import com.google.android.apps.mytracks.fragments.ChooseActivityDialogFragment.ChooseActivityCaller;
import com.google.android.apps.mytracks.fragments.ConfirmDialogFragment;
import com.google.android.apps.mytracks.fragments.ConfirmDialogFragment.ConfirmCaller;
import com.google.android.apps.mytracks.fragments.InstallEarthDialogFragment;
@@ -67,8 +66,7 @@ import java.io.IOException;
* @author Jimmy Shih
*/
public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActivity implements
ChooseAccountCaller, CheckPermissionCaller, AddEmailsCaller, ChooseActivityCaller,
ConfirmCaller {
ChooseAccountCaller, CheckPermissionCaller, AddEmailsCaller, ConfirmCaller {
private static final String TAG = AbstractMyTracksActivity.class.getSimpleName();
private static final String SEND_REQUEST_KEY = "send_request_key";
@@ -193,17 +191,6 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
}
}
@Override
public void onChooseActivityDone(String packageName, String className) {
if (packageName != null && className != null) {
sendRequest.setMapsSharePackageName(packageName);
sendRequest.setMapsShareClassName(className);
Intent intent = IntentUtils.newIntent(this, SendMapsActivity.class)
.putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
startActivity(intent);
}
}
private void onDrivePermissionSuccess() {
// Check Maps permission
if (sendRequest.isSendMaps()) {
@@ -312,11 +299,6 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
next = SendDriveActivity.class;
}
} else if (sendRequest.isSendMaps()) {
if (sendRequest.isMapsShare()) {
new ChooseActivityDialogFragment().show(
getSupportFragmentManager(), ChooseActivityDialogFragment.CHOOSE_ACTIVITY_DIALOG_TAG);
return;
}
next = SendMapsActivity.class;
} else if (sendRequest.isSendFusionTables()) {
next = SendFusionTablesActivity.class;
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequest.java
-34
View File
@@ -40,10 +40,6 @@ public class SendRequest implements Parcelable {
private boolean driveShare = false;
private String driveShareEmails = null;
private boolean mapsShare = false;
private String mapsSharePackageName = null;
private String mapsShareClassName = null;
private Account account = null;
private boolean driveSuccess = false;
@@ -120,30 +116,6 @@ public class SendRequest implements Parcelable {
this.driveShareEmails = driveShareEmails;
}
public boolean isMapsShare() {
return mapsShare;
}
public void setMapsShare(boolean mapsShare) {
this.mapsShare = mapsShare;
}
public String getMapsSharePackageName() {
return mapsSharePackageName;
}
public void setMapsSharePackageName(String mapsSharePackageName) {
this.mapsSharePackageName = mapsSharePackageName;
}
public String getMapsShareClassName() {
return mapsShareClassName;
}
public void setMapsShareClassName(String mapsShareClassName) {
this.mapsShareClassName = mapsShareClassName;
}
public Account getAccount() {
return account;
}
@@ -193,9 +165,6 @@ public class SendRequest implements Parcelable {
driveEnableSync = in.readByte() == 1;
driveShare = in.readByte() == 1;
driveShareEmails = in.readString();
mapsShare = in.readByte() == 1;
mapsSharePackageName = in.readString();
mapsShareClassName = in.readString();
account = in.readParcelable(null);
driveSuccess = in.readByte() == 1;
mapsSuccess = in.readByte() == 1;
@@ -218,9 +187,6 @@ public class SendRequest implements Parcelable {
out.writeByte((byte) (driveEnableSync ? 1 : 0));
out.writeByte((byte) (driveShare ? 1 : 0));
out.writeString(driveShareEmails);
out.writeByte((byte) (mapsShare ? 1 : 0));
out.writeString(mapsSharePackageName);
out.writeString(mapsShareClassName);
out.writeParcelable(account, 0);
out.writeByte((byte) (driveSuccess ? 1 : 0));
out.writeByte((byte) (mapsSuccess ? 1 : 0));
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
-7
View File
@@ -71,13 +71,6 @@ public class UploadResultActivity extends FragmentActivity implements ChooseActi
if (sendRequest.isSendMaps() && sendRequest.isMapsSuccess()) {
shareUrl = SendMapsUtils.getMapUrl(track);
if (sendRequest.getMapsSharePackageName() != null) {
Intent intent = IntentUtils.newShareUrlIntent(this, sendRequest.getTrackId(), shareUrl,
sendRequest.getMapsSharePackageName(), sendRequest.getMapsShareClassName());
startActivity(intent);
finish();
return;
}
}
if (shareUrl == null && sendRequest.isSendFusionTables()
&& sendRequest.isFusionTablesSuccess()) {
MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java
-29
View File
@@ -29,8 +29,6 @@ public class SendRequestTest extends AndroidTestCase {
private SendRequest sendRequest;
private static final String MAPS_SHARE_PACKAGE_NAME = "package";
private static final String MAPS_SHARE_CLASS_NAME = "class";
private final static String ACCOUNTNAME = "testAccount1";
private final static String ACCOUNTYPE = "testType1";
private final static String DRIVE_SHARE_EMAILS = "foo@foo.com";
@@ -130,9 +128,6 @@ public class SendRequestTest extends AndroidTestCase {
parcel.writeByte((byte) 1);
parcel.writeByte((byte) 1);
parcel.writeString(DRIVE_SHARE_EMAILS);
parcel.writeByte((byte) 1);
parcel.writeString("");
parcel.writeString("");
Account account = new Account(ACCOUNTNAME, ACCOUNTYPE);
parcel.writeParcelable(account, 0);
parcel.writeByte((byte) 1);
@@ -149,9 +144,6 @@ public class SendRequestTest extends AndroidTestCase {
assertTrue(sendRequest.isDriveEnableSync());
assertTrue(sendRequest.isDriveShare());
assertEquals(DRIVE_SHARE_EMAILS, sendRequest.getDriveShareEmails());
assertTrue(sendRequest.isMapsShare());
assertEquals("", sendRequest.getMapsSharePackageName());
assertEquals("", sendRequest.getMapsShareClassName());
assertEquals(account, sendRequest.getAccount());
assertTrue(sendRequest.isDriveSuccess());
assertTrue(sendRequest.isMapsSuccess());
@@ -173,9 +165,6 @@ public class SendRequestTest extends AndroidTestCase {
parcel.writeByte((byte) 0);
parcel.writeByte((byte) 0);
parcel.writeString(null);
parcel.writeByte((byte) 0);
parcel.writeString(null);
parcel.writeString(null);
Account account = new Account(ACCOUNTNAME, ACCOUNTYPE);
parcel.writeParcelable(account, 0);
parcel.writeByte((byte) 0);
@@ -192,9 +181,6 @@ public class SendRequestTest extends AndroidTestCase {
assertFalse(sendRequest.isDriveEnableSync());
assertFalse(sendRequest.isDriveShare());
assertNull(sendRequest.getDriveShareEmails());
assertFalse(sendRequest.isMapsShare());
assertNull(sendRequest.getMapsSharePackageName());
assertNull(sendRequest.getMapsShareClassName());
assertEquals(account, sendRequest.getAccount());
assertFalse(sendRequest.isDriveSuccess());
assertFalse(sendRequest.isMapsSuccess());
@@ -219,9 +205,6 @@ public class SendRequestTest extends AndroidTestCase {
boolean driveEnableSync = parcel.readByte() == 1;
boolean driveShare = parcel.readByte() == 1;
String dirveShareEmails = parcel.readString();
boolean mapsShare = parcel.readByte() == 1;
String mapsSharePackageName = parcel.readString();
String mapsShareClassName = parcel.readString();
Parcelable account = parcel.readParcelable(null);
boolean driveSuccess = parcel.readByte() == 1;
boolean mapsSuccess = parcel.readByte() == 1;
@@ -235,9 +218,6 @@ public class SendRequestTest extends AndroidTestCase {
assertFalse(driveEnableSync);
assertFalse(driveShare);
assertNull(dirveShareEmails);
assertFalse(mapsShare);
assertNull(mapsSharePackageName);
assertNull(mapsShareClassName);
assertNull(account);
assertFalse(driveSuccess);
assertFalse(mapsSuccess);
@@ -257,9 +237,6 @@ public class SendRequestTest extends AndroidTestCase {
sendRequest.setDriveEnableSync(true);
sendRequest.setDriveShare(true);
sendRequest.setDriveShareEmails(DRIVE_SHARE_EMAILS);
sendRequest.setMapsShare(true);
sendRequest.setMapsSharePackageName(MAPS_SHARE_PACKAGE_NAME);
sendRequest.setMapsShareClassName(MAPS_SHARE_CLASS_NAME);
Account accountNew = new Account(ACCOUNTNAME + "2", ACCOUNTYPE + "2");
sendRequest.setAccount(accountNew);
sendRequest.setMapsSuccess(true);
@@ -278,9 +255,6 @@ public class SendRequestTest extends AndroidTestCase {
boolean driveEnableSync = parcel.readByte() == 1;
boolean driveShare = parcel.readByte() == 1;
String driveShareEmails = parcel.readString();
boolean mapsShare = parcel.readByte() == 1;
String mapsSharePackageName = parcel.readString();
String mapsShareClassName = parcel.readString();
Parcelable account = parcel.readParcelable(null);
boolean driveSuccess = parcel.readByte() == 1;
boolean mapsSuccess = parcel.readByte() == 1;
@@ -294,9 +268,6 @@ public class SendRequestTest extends AndroidTestCase {
assertTrue(driveEnableSync);
assertTrue(driveShare);
assertEquals(DRIVE_SHARE_EMAILS, driveShareEmails);
assertTrue(mapsShare);
assertEquals(MAPS_SHARE_PACKAGE_NAME, mapsSharePackageName);
assertEquals(MAPS_SHARE_CLASS_NAME, mapsShareClassName);
assertEquals(accountNew, account);
assertTrue(driveSuccess);
assertTrue(mapsSuccess);