forked from upstream-mirrors/OpenTracks
More cleanups. Towards a working solution.
This commit is contained in:
leifhendrik
+2
-3
@@ -6,9 +6,8 @@
|
||||
<classpathentry kind="lib" path="libs/accounts.jar"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
|
||||
<classpathentry kind="lib" path="libs/google-api-client-1.2.1-alpha.jar"/>
|
||||
<classpathentry kind="src" path="MyTracksLib_src"/>
|
||||
<classpathentry kind="lib" path="/Users/leifhendrik/leifhendrik-xmas/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
|
||||
<classpathentry kind="lib" path="/Users/leifhendrik/leifhendrik-xmas/MyTracks/libs/google-api-client-1.2.1-alpha.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@@ -33,7 +33,7 @@ limitations under the License.
|
||||
<!-- Error messages -->
|
||||
<string name="error_no_location_manager">Es wurde kein \'Location Manager\' auf diesem Gerät gefunden.</string>
|
||||
<string name="error_no_gps_location_provider">Konnte keinen GPS-Empfänger auf diesem Gerät finden.</string>
|
||||
<string name="error_sending_to_mymap">Beim Senden Ihres Tracks an Google My Maps ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
|
||||
<string name="error_sending_to_fusiontables">Beim Senden Ihres Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
|
||||
<string name="error_sending_to_docs">Beim Senden Ihres Tracks an Google Docs ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
|
||||
<string name="error_unable_to_start_recording">Aufzeichnen fehlgeschlagen. Bitte versuchen Sie es nochmal.</string>
|
||||
<string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuchen Sie es nochmal.</string>
|
||||
@@ -48,7 +48,7 @@ limitations under the License.
|
||||
<string name="wait_for_fix">Warten auf ein besseres GPS-Signal. Bitte stellen Sie sicher, dass der Himmel sichtbar ist.</string>
|
||||
<string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
|
||||
<string name="status_stopped_recording">Die Aufzeichnung wurde beendet.</string>
|
||||
<string name="status_new_mymap_has_been_created">Eine neue Karte wurde auf maps.google.com erstellt.</string>
|
||||
<string name="status_new_fusiontable_has_been_created">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
|
||||
<string name="status_tracks_have_been_uploaded">Ihr Track wurde auf maps.google.com gespeichert.</string>
|
||||
<string name="status_tracks_have_been_uploaded_to_new_doc">Ihr Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
|
||||
<string name="status_tracks_have_been_uploaded_to_docs">Ihr Track wurde an docs.google.com gesendet.</string>
|
||||
@@ -63,11 +63,11 @@ limitations under the License.
|
||||
<string name="progress_message">Ihr GPS-Track wird an Google gesendet.</string>
|
||||
<string name="progress_message_reading_track">Lese Track</string>
|
||||
<string name="progress_message_preparing_track">Bereite Track vor</string>
|
||||
<string name="progress_message_authenticating_mymaps">Anmelden bei Google Maps</string>
|
||||
<string name="progress_message_authenticating_fusiontables">Anmelden bei Google Fusion Tables</string>
|
||||
<string name="progress_message_authenticating_docs">Anmelden bei Google Docs</string>
|
||||
<string name="progress_message_sending_docs">Track an Google Docs senden</string>
|
||||
<string name="progress_message_sending_mymaps">Track an Google Maps senden</string>
|
||||
<string name="progress_message_creating_map">Neue \'Meine Karte\' erstellen</string>
|
||||
<string name="progress_message_sending_fusiontables">Track an Google Fusion Tables senden</string>
|
||||
<string name="progress_message_creating_fusiontable">Neue \'Fusion Tabelle\' erstellen</string>
|
||||
<string name="import_progress_message">Importiere GPS-Track. Das dauert ein wenig.</string>
|
||||
<string name="write_progress_message">Schreibe Datei auf SD-Karte. Das dauert ein wenig.</string>
|
||||
<string name="progress_message_updating_track">Aktualisiere Trackstatistik</string>
|
||||
@@ -78,8 +78,7 @@ limitations under the License.
|
||||
<string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
|
||||
<string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
|
||||
|
||||
<!-- Text and links when uploading to Google MyMaps -->
|
||||
<string name="new_map_title">Neue Karte</string>
|
||||
<!-- Text and links when uploading to Google Fusion Tables -->
|
||||
|
||||
<!-- Formatting of track and marker descriptions -->
|
||||
<string name="points">Punkte</string>
|
||||
@@ -120,7 +119,7 @@ limitations under the License.
|
||||
<string name="tracklist_all_tracks">Alle Tracks:</string>
|
||||
<string name="tracklist_this_track">Dieser Track</string>
|
||||
<string name="tracklist_share_track">Mit Freunden teilen…</string>
|
||||
<string name="tracklist_share_link">Ein Link zur Google MyMaps-Karte</string>
|
||||
<string name="tracklist_share_linkfusion">Ein Link zur Google Fusion Tables-Karte</string>
|
||||
<string name="tracklist_share_gpx_file">Eine GPX-Datei</string>
|
||||
<string name="tracklist_share_kml_file">Eine KML-Datei</string>
|
||||
<string name="tracklist_clear_map">Karte zurücksetzen.</string>
|
||||
@@ -202,9 +201,6 @@ limitations under the License.
|
||||
|
||||
%s.</string>
|
||||
<string name="share_track">Track mit Freunden teilen</string>
|
||||
<string name="public_map">Öffentlich</string>
|
||||
<string name="unlisted_map">Nicht in Suchergebnissen enthalten.</string>
|
||||
<string name="mapslist_no_maps_available">Du hast noch keine Karten.</string>
|
||||
|
||||
<!-- Statistics View -->
|
||||
<!-- Average Moving -->
|
||||
@@ -289,8 +285,6 @@ limitations under the License.
|
||||
<!-- Send to Google -->
|
||||
<string name="sendtogoogle_title">Senden an…</string>
|
||||
<string name="sendtogoogle_send_now">Jetzt senden</string>
|
||||
<string name="sendtogoogle_create_new_map">Neue Karte erstellen</string>
|
||||
<string name="sendtogoogle_pick_existing_map">Eine Karte auswählen</string>
|
||||
<string name="sendtogoogle_send_stats">Trackstatistik senden</string>
|
||||
<string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string>
|
||||
|
||||
|
||||
@@ -193,29 +193,10 @@ limitations under the License.
|
||||
|
||||
<!-- MyTracksSky -->
|
||||
<string name="mytracks_sky">Satélites GPS</string>
|
||||
|
||||
<!-- My Maps -->
|
||||
<string name="select_map_message">Elija un mapa de su cuenta:</string>
|
||||
<string name="create_new_map">Crear mapa nuevo...</string>
|
||||
<string name="map_list_title">Enviar a Google My Maps</string>
|
||||
<string name="maps_list_loading">Cargando mapas...</string>
|
||||
<string name="maps_list_failed">Sus mapas no pudieron ser cargados en este momento!</string>
|
||||
<string name="open_map">Seleccione este mapa</string>
|
||||
<string name="edit_map_details">Editar detalles del mapa</string>
|
||||
<string name="share_map">Compartir mapa con amigos</string>
|
||||
<string name="share_track">Compartir recorrido con amigos</string>
|
||||
<string name="delete_map">Borrar mapa de su cuenta</string>
|
||||
<string name="map_title">Título del mapa:</string>
|
||||
<string name="map_description">Descripción del mapa:</string>
|
||||
<string name="map_searchable_edit">Permitir que este mapa y su contenido sean mostrados en resultados de búsqueda</string>
|
||||
<string name="map_not_searchable_edit">No permitir que este mapa y su contenido sean mostrados en resultados de búsqueda, pero permitir acceso directo mediante su URL</string>
|
||||
<string name="map_searchable">Este mapa y su contenido serán mostrados en resultados de búsqueda</string>
|
||||
<string name="map_not_searchable">No mostrar ni este mapa ni sus contenidos en resultados de búsqueda, pero permitir acceso directo mediante su URL</string>
|
||||
<string name="close">Cerrar</string>
|
||||
<string name="edit">Editar</string>
|
||||
<string name="save">Guardar</string>
|
||||
|
||||
<!-- Sharing -->
|
||||
<string name="share_map">Compartir mapa con amigos</string>
|
||||
<string name="share_map_subject">Me gustaría compartir un mapa contigo</string>
|
||||
<string name="share_map_body_format">Creo que este mapa pudiera interesarte:
|
||||
|
||||
@@ -224,11 +205,8 @@ limitations under the License.
|
||||
<string name="send_track_body_format">Creo que este recorrido pudiera interesarte.
|
||||
|
||||
Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
|
||||
<string name="share_track">Compartir recorrido con amigos</string>
|
||||
|
||||
<!-- Visibility -->
|
||||
<string name="public_map">Público</string>
|
||||
<string name="unlisted_map">No listado</string>
|
||||
<string name="mapslist_no_maps_available">Aún no tienes ningún mapa.</string>
|
||||
|
||||
<!-- Statistics View -->
|
||||
<!-- Average Moving -->
|
||||
@@ -314,8 +292,6 @@ limitations under the License.
|
||||
<!-- Send to Google -->
|
||||
<string name="sendtogoogle_title">Enviar a...</string>
|
||||
<string name="sendtogoogle_send_now">Enviar ahora</string>
|
||||
<string name="sendtogoogle_create_new_map">Crear un nuevo mapa</string>
|
||||
<string name="sendtogoogle_pick_existing_map">Escoja un mapa existente</string>
|
||||
<string name="sendtogoogle_send_stats">Enviar estadísticas de recorrido</string>
|
||||
<string name="sendtogoogle_send_stats_and_points">Enviar estadísticas y puntos</string>
|
||||
|
||||
|
||||
@@ -86,7 +86,6 @@ limitations under the License.
|
||||
<!-- Text and links when uploading to Google Fusion Tables -->
|
||||
<string name="new_map_description">Created by My Tracks on Android.</string>
|
||||
<string name="fusiontable_link">Created by <a href=\'http://mytracks.appspot.com\'>My Tracks</a> on Android.</string>
|
||||
<string name="new_table_title">New table</string>
|
||||
|
||||
<!-- Formatting of track and marker descriptions -->
|
||||
<string name="points">Points</string>
|
||||
@@ -134,7 +133,7 @@ limitations under the License.
|
||||
<string name="tracklist_all_tracks">All Tracks:</string>
|
||||
<string name="tracklist_this_track">This Track</string>
|
||||
<string name="tracklist_share_track">Share with Friends...</string>
|
||||
<string name="tracklist_share_link">A link to Google Fusion Tables</string>
|
||||
<string name="tracklist_share_linkfusion">A link to Google Fusion Tables</string>
|
||||
<string name="tracklist_share_gpx_file">A GPX file</string>
|
||||
<string name="tracklist_share_kml_file">A KML file</string>
|
||||
<string name="tracklist_share_csv_file">A CSV file</string>
|
||||
@@ -250,8 +249,8 @@ limitations under the License.
|
||||
<string name="share_map_body_format">I think you might be interested in this track:
|
||||
|
||||
%s</string>
|
||||
<string name="send_map_subject">I would like to share a track with you</string>
|
||||
<string name="send_map_body_format">I think you might be interested in this track.
|
||||
<string name="send_track_subject">I would like to share a track with you</string>
|
||||
<string name="send_track_body_format">I think you might be interested in this track.
|
||||
|
||||
To view this track use Google Earth or other mapping software.</string>
|
||||
<string name="share_track">Share track with friends</string>
|
||||
|
||||
@@ -20,6 +20,7 @@ import com.google.android.maps.mytracks.R;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
@@ -84,6 +85,13 @@ public class DialogManager {
|
||||
builder.setTitle("Title");
|
||||
builder.setMessage("Message");
|
||||
builder.setPositiveButton(activity.getString(R.string.ok), null);
|
||||
builder.setNeutralButton(activity.getString(R.string.share_map),
|
||||
new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
activity.shareLinkToFusionTable(activity.sendToTrackId);
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
sendToGoogleResultDialog = builder.create();
|
||||
return sendToGoogleResultDialog;
|
||||
case DIALOG_WRITE_PROGRESS:
|
||||
|
||||
@@ -126,6 +126,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
* Used by SendToGoogleResultDialog.
|
||||
*/
|
||||
|
||||
public long sendToTrackId = -1;
|
||||
public boolean sendToFusionTablesSuccess = false;
|
||||
public boolean sendToDocsSuccess = false;
|
||||
public String sendToFusionTablesTableId;
|
||||
@@ -150,6 +151,11 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
*/
|
||||
private long selectedTrackId = -1;
|
||||
|
||||
/**
|
||||
* Does the user want to share the current track.
|
||||
*/
|
||||
private boolean shareRequested = false;
|
||||
|
||||
/**
|
||||
* Utilities to deal with the database.
|
||||
*/
|
||||
@@ -549,6 +555,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
setProgressValue(50);
|
||||
setProgressMessage(R.string.progress_message_sending_docs);
|
||||
final long trackId = results.getLongExtra("trackid", selectedTrackId);
|
||||
sendToTrackId = trackId;
|
||||
final SendToDocs sender = new SendToDocs(this, authMap.get("wise"),
|
||||
authMap.get("writely"), trackId);
|
||||
Runnable onCompletion = new Runnable() {
|
||||
@@ -559,7 +566,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
public void run() {
|
||||
sendToDocsMessage = sender.getStatusMessage();
|
||||
sendToDocsSuccess = sender.wasSuccess();
|
||||
handleFusionTablesFinish();
|
||||
handleFusionTablesFinish(trackId);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -572,6 +579,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
break;
|
||||
}
|
||||
case MyTracksConstants.SEND_TO_GOOGLE_DIALOG: {
|
||||
shareRequested = false;
|
||||
dialogManager.showDialogSafely(DIALOG_SEND_TO_GOOGLE);
|
||||
break;
|
||||
}
|
||||
@@ -609,12 +617,13 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
dialogManager.dismissDialogSafely(DIALOG_PROGRESS);
|
||||
runOnUiThread(new Runnable() {
|
||||
public void run() {
|
||||
handleFusionTablesFinish();
|
||||
handleFusionTablesFinish(trackId);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
sendToTrackId = trackId;
|
||||
final SendToFusionTables sender = new SendToFusionTables(this, auth,
|
||||
trackId, this/*progressIndicator*/, onCompletion);
|
||||
|
||||
@@ -650,8 +659,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
Track selectedTrack = providerUtils.getTrack(selectedTrackId);
|
||||
if (selectedTrack != null) {
|
||||
if (selectedTrack.getTableId().length() > 0) {
|
||||
shareLinkToFusionTable(selectedTrack);
|
||||
shareLinkToFusionTable(selectedTrackId);
|
||||
} else {
|
||||
shareRequested = true;
|
||||
dialogManager.showDialogSafely(DIALOG_SEND_TO_GOOGLE);
|
||||
}
|
||||
}
|
||||
@@ -793,7 +803,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
* Shares a link to a fusion table via external app (email, gmail, ...)
|
||||
* A chooser with apps that support text/plain will be shown to the user.
|
||||
*/
|
||||
public void shareLinkToFusionTable(Track track) {
|
||||
public void shareLinkToFusionTable(long trackId) {
|
||||
Intent shareIntent = new Intent(Intent.ACTION_SEND);
|
||||
shareIntent.setType("text/plain");
|
||||
shareIntent.putExtra(Intent.EXTRA_SUBJECT,
|
||||
@@ -805,12 +815,13 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
getString(R.string.share_url_only_key), false);
|
||||
}
|
||||
|
||||
Track track = providerUtils.getTrack(trackId);
|
||||
String url = SendToFusionTables.getMapVisualizationUrl(track);
|
||||
String msg = shareUrlOnly ? url : String.format(
|
||||
getResources().getText(R.string.share_map_body_format).toString(), url);
|
||||
shareIntent.putExtra(Intent.EXTRA_TEXT, msg);
|
||||
startActivity(Intent.createChooser(shareIntent,
|
||||
getResources().getText(R.string.share_map_subject).toString()));
|
||||
getResources().getText(R.string.share_map).toString()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1223,9 +1234,14 @@ public class MyTracks extends TabActivity implements OnTouchListener,
|
||||
/**
|
||||
* Notifies that uploading to fusion tables is finished.
|
||||
*/
|
||||
private void handleFusionTablesFinish() {
|
||||
dialogManager.showDialogSafely(
|
||||
DialogManager.DIALOG_SEND_TO_GOOGLE_RESULT);
|
||||
private void handleFusionTablesFinish(long trackId) {
|
||||
if (shareRequested && sendToFusionTablesSuccess) {
|
||||
// Just share
|
||||
Toast.makeText(this, getFusionTablesResultMessage(), Toast.LENGTH_LONG).show();
|
||||
shareLinkToFusionTable(trackId);
|
||||
} else {
|
||||
dialogManager.showDialogSafely(DialogManager.DIALOG_SEND_TO_GOOGLE_RESULT);
|
||||
}
|
||||
}
|
||||
|
||||
public String getFusionTablesResultMessage() {
|
||||
|
||||
@@ -789,7 +789,7 @@ public class MyTracksMap extends MapActivity
|
||||
SubMenu share = menu.addSubMenu(0, MyTracksConstants.MENU_SHARE, 0,
|
||||
R.string.tracklist_share_track);
|
||||
share.add(0, MyTracksConstants.MENU_SHARE_LINK, 0,
|
||||
R.string.tracklist_share_link);
|
||||
R.string.tracklist_share_linkfusion);
|
||||
share.add(0, MyTracksConstants.MENU_SHARE_GPX_FILE, 0,
|
||||
R.string.tracklist_share_gpx_file);
|
||||
share.add(0, MyTracksConstants.MENU_SHARE_KML_FILE, 0,
|
||||
|
||||
@@ -29,7 +29,6 @@ import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
import android.widget.RadioButton;
|
||||
import android.widget.RadioGroup;
|
||||
|
||||
/**
|
||||
* A dialog where the user can choose where to send the tracks to, i.e.
|
||||
|
||||
@@ -19,11 +19,7 @@ import com.google.android.maps.mytracks.R;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
|
||||
@@ -36,6 +36,7 @@ import com.google.api.client.http.GenericUrl;
|
||||
import com.google.api.client.http.HttpRequest;
|
||||
import com.google.api.client.http.HttpResponse;
|
||||
import com.google.api.client.http.HttpTransport;
|
||||
import com.google.api.client.http.InputStreamContent;
|
||||
import com.google.api.client.util.Strings;
|
||||
|
||||
import android.app.Activity;
|
||||
@@ -44,6 +45,7 @@ import android.database.Cursor;
|
||||
import android.location.Location;
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.ArrayList;
|
||||
@@ -65,9 +67,6 @@ public class SendToFusionTables implements Runnable {
|
||||
/** The GData service id for Fusion Tables. */
|
||||
public static final String SERVICE_ID = "fusiontables";
|
||||
|
||||
/** The base url for viewing a fusion table. */
|
||||
public static final String FUSIONTABLES_TABLE_URL = "http://www.google.com/fusiontables";
|
||||
|
||||
/** The path for viewing a map visualization of a table. */
|
||||
private static final String FUSIONTABLES_MAP =
|
||||
"http://www.google.com/fusiontables/embedviz?" +
|
||||
@@ -121,12 +120,12 @@ public class SendToFusionTables implements Runnable {
|
||||
}
|
||||
|
||||
public static String getMapVisualizationUrl(Track track) {
|
||||
// TODO(leifhendrik): Determine correct bounding box and zoom level.
|
||||
Location start = track.getLocations().get(0);
|
||||
double lat = start != null ? start.getLatitude() : 37.0;
|
||||
double lng = start != null ? start.getLongitude() : -121.0;
|
||||
// TODO(leifhendrik): Determine correct bounding box and zoom level that will show the entire track.
|
||||
TripStatistics stats = track.getStatistics();
|
||||
double latE6 = stats.getBottom() + (stats.getTop() - stats.getBottom()) / 2;
|
||||
double lonE6 = stats.getLeft() + (stats.getRight() - stats.getLeft()) / 2;
|
||||
int z = 15;
|
||||
return String.format(FUSIONTABLES_MAP, track.getTableId(), lat, lng, z);
|
||||
return String.format(FUSIONTABLES_MAP, track.getTableId(), latE6 / 1.E6, lonE6 / 1.E6, z);
|
||||
}
|
||||
|
||||
private void doUpload() {
|
||||
@@ -281,7 +280,8 @@ public class SendToFusionTables implements Runnable {
|
||||
|
||||
if (totalLocationsRead == 0) {
|
||||
// Put a marker at the first point of the first valid segment:
|
||||
createNewPoint(track.getName(), track.getDescription(), loc, "large_green");
|
||||
String name = track.getName() + " " + context.getString(R.string.start);
|
||||
createNewPoint(name, "", loc, "large_green");
|
||||
}
|
||||
|
||||
// Add to the elevation profile.
|
||||
@@ -328,9 +328,10 @@ public class SendToFusionTables implements Runnable {
|
||||
+ stringUtils.generateTrackDescription(
|
||||
track, distances, elevations)
|
||||
+ "</p>");
|
||||
return createNewPoint(track.getName(), track.getDescription(), lastLocation, "large_red");
|
||||
String name = track.getName() + " " + context.getString(R.string.end);
|
||||
return createNewPoint(name, track.getDescription(), lastLocation, "large_red");
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
} finally {
|
||||
locationsCursor.close();
|
||||
@@ -600,14 +601,13 @@ public class SendToFusionTables implements Runnable {
|
||||
throws IOException, GDataWrapper.ParseException, GDataWrapper.HttpException {
|
||||
HttpRequest request = transport.buildPostRequest();
|
||||
request.headers.contentType = "application/x-www-form-urlencoded";
|
||||
String sql = "sql=" + URLEncoder.encode(query, "UTF-8");
|
||||
GenericUrl url = new GenericUrl(FUSIONTABLES_BASE_FEED_URL + "?" + sql);
|
||||
GenericUrl url = new GenericUrl(FUSIONTABLES_BASE_FEED_URL);
|
||||
request.url = url;
|
||||
//OutputStream outputStream = new ByteArrayOutputStream();
|
||||
//outputStream.write(Strings.toBytesUtf8(sql));
|
||||
//outputStream.flush();
|
||||
//request.content.writeTo(outputStream);
|
||||
Log.d(MyTracksConstants.TAG, "Running update query: " + url.toString());
|
||||
InputStreamContent isc = new InputStreamContent();
|
||||
String sql = "sql=" + URLEncoder.encode(query, "UTF-8");
|
||||
isc.inputStream = new ByteArrayInputStream(Strings.toBytesUtf8(sql));
|
||||
request.content = isc;
|
||||
Log.d(MyTracksConstants.TAG, "Running update query " + url.toString() + ": " + sql);
|
||||
HttpResponse response = request.execute();
|
||||
boolean success = response.isSuccessStatusCode;
|
||||
if (success) {
|
||||
|
||||
Reference in New Issue
Block a user