karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Remove share track setting.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-04 16:36:55 -07:00
parent 2e81f981ca
commit 864129488f
10 changed files with 4 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+4 -48
View File
@@ -42,7 +42,6 @@ import com.google.android.apps.mytracks.util.AnalyticsUtils;
import com.google.android.apps.mytracks.util.GoogleEarthUtils;
import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import android.accounts.Account;
@@ -361,27 +360,10 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
* @param trackId the track id
*/
protected void confirmShare(long trackId) {
String shareTrack = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
String driveValue = getString(R.string.settings_sharing_share_track_drive_value);
String mapsValue = getString(R.string.settings_sharing_share_track_maps_value);
if (shareTrack.equals(driveValue)) {
ConfirmDialogFragment.newInstance(R.string.confirm_share_drive_key,
PreferencesUtils.CONFIRM_SHARE_DRIVE_DEFAULT,
getString(R.string.share_track_drive_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
} else if (shareTrack.equals(mapsValue)) {
ConfirmDialogFragment.newInstance(R.string.confirm_share_maps_key,
PreferencesUtils.CONFIRM_SHARE_MAPS_DEFAULT, StringUtils.getHtml(
this, R.string.share_track_maps_confirm_message, R.string.maps_public_unlisted_url),
new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
} else {
ConfirmDialogFragment.newInstance(R.string.confirm_share_file_key,
PreferencesUtils.CONFIRM_SHARE_FILE_DEFAULT,
getString(R.string.share_track_file_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
}
ConfirmDialogFragment.newInstance(R.string.confirm_share_drive_key,
PreferencesUtils.CONFIRM_SHARE_DRIVE_DEFAULT,
getString(R.string.share_track_drive_confirm_message), new long[] { trackId })
.show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
}
@Override
@@ -405,32 +387,6 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
newRequest.setDriveShare(true);
sendToGoogle(newRequest);
break;
case R.string.confirm_share_maps_key:
AnalyticsUtils.sendPageViews(this, "/action/share_maps");
newRequest = new SendRequest(trackIds[0]);
newRequest.setSendMaps(true);
newRequest.setMapsShare(true);
sendToGoogle(newRequest);
break;
case R.string.confirm_share_file_key:
String shareTrack = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
TrackFileFormat trackFileFormat;
if (shareTrack.equals(TrackFileFormat.GPX.name())) {
trackFileFormat = TrackFileFormat.GPX;
} else if (shareTrack.equals(TrackFileFormat.KML.name())) {
trackFileFormat = TrackFileFormat.KML;
} else if (shareTrack.equals(TrackFileFormat.CSV.name())) {
trackFileFormat = TrackFileFormat.CSV;
} else {
trackFileFormat = TrackFileFormat.TCX;
}
intent = IntentUtils.newIntent(this, SaveActivity.class)
.putExtra(SaveActivity.EXTRA_TRACK_IDS, trackIds)
.putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat)
.putExtra(SaveActivity.EXTRA_SHARE_TRACK, true);
startActivity(intent);
break;
default:
}
}
MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
-2
View File
@@ -53,8 +53,6 @@ public class PreferenceBackupHelper {
doNotBackup.add(context.getString(R.string.bluetooth_sensor_key));
doNotBackup.add(context.getString(R.string.confirm_play_earth_key));
doNotBackup.add(context.getString(R.string.confirm_share_drive_key));
doNotBackup.add(context.getString(R.string.confirm_share_file_key));
doNotBackup.add(context.getString(R.string.confirm_share_maps_key));
doNotBackup.add(context.getString(R.string.drive_deleted_list_key));
doNotBackup.add(context.getString(R.string.drive_largest_change_id_key));
doNotBackup.add(context.getString(R.string.drive_sync_key));
MyTracks/src/com/google/android/apps/mytracks/settings/SharingSettingsActivity.java
-27
View File
@@ -17,20 +17,15 @@
package com.google.android.apps.mytracks.settings;
import com.google.android.apps.mytracks.util.DialogUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
/**
* An activity for accessing the sharing settings.
*
@@ -40,7 +35,6 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
private static final int DIALOG_CONFIRM_ALLOW_ACCESS_ID = 0;
private ListPreference shareTrackListPreference;
private CheckBoxPreference allowAccessCheckBoxPreference;
@SuppressWarnings("deprecation")
@@ -49,27 +43,6 @@ public class SharingSettingsActivity extends AbstractSettingsActivity {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.sharing_settings);
shareTrackListPreference = (ListPreference) findPreference(getString(R.string.share_track_key));
String value = PreferencesUtils.getString(
this, R.string.share_track_key, PreferencesUtils.SHARE_TRACK_DEFAULT);
String fileTypes[] = getResources().getStringArray(R.array.file_types);
ArrayList<String> shareTrackValues = new ArrayList<String>(
Arrays.asList(getResources().getStringArray(R.array.share_track_values)));
for (String fileType : fileTypes) {
shareTrackValues.add(fileType);
}
String[] values = shareTrackValues.toArray(new String[shareTrackValues.size()]);
ArrayList<String> shareTrackOptions = new ArrayList<String>(
Arrays.asList(getResources().getStringArray(R.array.share_track_options)));
for (String fileType : fileTypes) {
shareTrackOptions.add(getString(R.string.settings_sharing_share_track_file, fileType));
}
String[] options = shareTrackOptions.toArray(new String[shareTrackOptions.size()]);
configureListPreference(shareTrackListPreference, options, options, values, value, null);
allowAccessCheckBoxPreference = (CheckBoxPreference) findPreference(
getString(R.string.allow_access_key));
allowAccessCheckBoxPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
-3
View File
@@ -57,8 +57,6 @@ public class PreferencesUtils {
public static final boolean CONFIRM_PLAY_EARTH_DEFAULT = true;
public static final boolean CONFIRM_SHARE_DRIVE_DEFAULT = true;
public static final boolean CONFIRM_SHARE_FILE_DEFAULT = true;
public static final boolean CONFIRM_SHARE_MAPS_DEFAULT = true;
public static final String DEFAULT_ACTIVITY_DEFAULT = "";
public static final String DRIVE_DELETED_LIST_DEFAULT = "";
@@ -97,7 +95,6 @@ public class PreferencesUtils {
public static final long SELECTED_TRACK_ID_DEFAULT = -1L;
public static final String SENSOR_TYPE_DEFAULT = "NONE";
public static final String SHARE_TRACK_DEFAULT = "DRIVE";
public static final int SPLIT_FREQUENCY_DEFAULT = 0;
public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
public static final boolean STATS_SHOW_GRADE_ELEVATION_DEFAULT = false;