diff --git a/.hgignore b/.hgignore index b82e105b7..8372fdde3 100644 --- a/.hgignore +++ b/.hgignore @@ -2,3 +2,4 @@ syntax:glob */bin */gen/** +.metadata diff --git a/MyTracks/.settings/org.eclipse.jdt.core.prefs b/MyTracks/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..dec15e80b --- /dev/null +++ b/MyTracks/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Thu Aug 12 18:54:52 BRT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 241ac239d..9cad9f4d6 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="17" + android:versionName="1.0.16"> @@ -72,7 +72,8 @@ android:process=":trackrecord" android:label="Track Recording Service" android:icon="@drawable/arrow_320" - android:enabled="true" /> + android:enabled="true" + android:exported="true" /> diff --git a/MyTracks/default.properties b/MyTracks/default.properties index 089c57d48..c4fb0851b 100644 --- a/MyTracks/default.properties +++ b/MyTracks/default.properties @@ -10,4 +10,4 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=Google Inc.:Google APIs:7 +target=Google Inc.:Google APIs:8 diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml index e3fe3cfb8..51f432b90 100644 --- a/MyTracks/res/layout/about.xml +++ b/MyTracks/res/layout/about.xml @@ -95,8 +95,9 @@ limitations under the License. android:textSize="20sp" /> diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml new file mode 100644 index 000000000..9acffc9b3 --- /dev/null +++ b/MyTracks/res/menu/main.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + diff --git a/MyTracks/res/values-ja/arrays.xml b/MyTracks/res/values-ja/arrays.xml new file mode 100644 index 000000000..3b469da0b --- /dev/null +++ b/MyTracks/res/values-ja/arrays.xml @@ -0,0 +1,282 @@ + + + + + + 不使用 + 1 分 + 2 分 + 5 分 + 10 分 + 15 分 + 30 分 + 60 分 + + + + + 1 m + 2 m + 3 m + 4 m + 5 m (推奨) + 10 m + 100 m + + + + 3 ft + 6 ft + 10 ft + 13 ft + 16 ft (推奨) + 33 ft + 328 ft + + + + + + 50 m + 100 m + 200 m (推奨) + 500 m + 1000 m + 5000 m + + + + 164 ft + 328 ft + 656 ft (推奨) + 1640 ft + 0.6 mi + 3.1 mi + + + + + + 電源節約 (動的制御) + 高精度 (動的制御) + 最高 (推奨) + 2 秒 + 3 秒 + 4 秒 + 5 秒 + 10 秒 + 20 秒 + 30 秒 + 1 分 + 2 分 + 5 分 + 10 分 + 15 分 + 30 分 + + + + + + 10 m (GPS信号強度良好) + 20 m + 50 m + 100 m + 200 m (推奨) + 500 m + 1000 m + 2000 m + 5000 m (GPS信号強度不良) + + + + 33 ft (GPS信号強度良好) + 66 ft + 165 ft + 328 ft + 656 ft (推奨) + 1640 ft + 0.6 mi + 1.2 mi + 3.1 mi (GPS信号強度不良) + + + + + + 分割なし + 100 km + 50 km + 25 km + 10 km + 5 km + 1 km + 60 分 + 30 分 + 15 分 + 10 分 + 5 分 + 2 分 + 1 分 + + + + 分割なし + 100 mi + 50 mi + 25 mi + 10 mi + 5 mi + 1 mi + 60 分 + 30 分 + 15 分 + 10 分 + 5 分 + 2 分 + 1 分 + + + + + + 不明 + 混合タイプ + その他 + + 実行中 + 市街地ランニング + トラックランニング + 山道ランニング + 徒歩 + 早歩き + ハイキング + 山道ハイキング + 原野ハイキング + 登山 + + サイクリング + ロードバイク + マウンテンバイク + トラック自転車 + + スケート + インラインスケート + スケートボード + + スノーシュー + スキー + スノーボード + ソリ + アイスセーリング + + 帆走 + パドリング + カヤック + 漕艇 + モーターボート + フェリー + ラジコンボート + サーフィン + ウィンドサーフィン + カイトサーフィン + 水上スキー + ウェークボード + + 飛行機 + 水上機 + 商用航空機 + ヘリコプター + 熱気球 + 飛行船 + ラジコン飛行機 + ラジコンヘリコプター + スカイダイビング + グライダー + ハンググライダー + パラグライダー + + 騎乗 + 乗馬 + ロバ騎乗 + + 自動車運転 + バス運転 + 鉄道 + オートバイ + オフロードバイク + 四輪バギー + + ランドセーリング + フリスビー + アルティメットフリスビー + + + + ATM + 銀行 + 飲み屋 + バーベキュー + 建物 + バス停 + カフェ + キャンプファイアー + キャンプ場 + 教会 + コーヒーハウス + コンビニ + 水飲み場 + がけ崩れ + フェリー + 火事場 + 消防署 + 釣り場 + ガソリンスタンド + ゴルフ場 + 雑貨店 + 美容室 + 散髪屋 + ハイキング道 + ホテル + 家 + 情報 + 交差 + メールボックス + 市場 + 集合場所 + 歌劇場 + 駐車場 + 郵便局 + 洞穴 + 警察署 + 踏切 + レストラン + ショッピング + 名所 + 店 + プール + 電話 + 劇場 + トイレ + 観光案内 + トンネル + 樹木 + 滝 + 噴水 + ウェイポイント + + diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml new file mode 100644 index 000000000..447a48540 --- /dev/null +++ b/MyTracks/res/values-ja/strings.xml @@ -0,0 +1,395 @@ + + + + + トラック記録 + 記録停止 + 衛星モード + 地図モード + 現在地 + トラック + マーカ + 全トラック消去 + 設定 + 標高 + 表示するトラックを選択して下さい + 現在のトラック + 最終セグメント + + + この端末でロケーションマネージャを発見できませんでした + この端末でGPSロケーションプロバイダを発見できました + Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい． + Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい． + 記録作成開始できません．もう一度試して下さい． + 記録停止できません．もう一度試して下さい． + ファイルからの読み込みができません． + ファイルは正しいGPX書式ではありませんでした． + エラーが発生しました．もう一度試して下さい． + トラックが存在しません． + 大きなファイルです(500KB未満でなければなりません)．終了します． + マーカの挿入ができません．位置決定ができません． + + + GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい． + 新しいトラックを記録中です． + トラック記録を停止しました． + 新しいGoogleマイマップを maps.google.com に作成しました． + トラックを maps.google.com に送信しました． + トラックを docs.google.com の新しいスプレッドシートに送信しました． + トラックを docs.google.com に送信しました． + 新しいトラックが見えるようになるまで数分程度かかります． + ここをタップして，セキュリティ &位置情報 を開いて，「GPS機能をONにする」にチェックして下さい．バックボタンで戻ってください． + ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します． + 現在位置決定ができません．位置取得源を増やし(セキュリティ&位置情報をご覧ください)，空が見えるようにして下さい．もう一度試して下さい． + ウェイポイントマーカを挿入しました． + 統計マーカを挿入しました． + + + お待ちください... + トラックをGoogleに送信しました． + トラックを読んでいます... + トラックを準備しています... + Googleマップの認証しています... + Google Docsへの認証を行っています... + トラックをGoogle Docsに送信しています... + トラックをGoogleマップに送信しています... + 新しいマイマップを生成しています... + GPSトラックをインポートしています．若干時間がかかります． + SDカードにデータを書き込んでいます．若干時間がかかります． + トラック統計情報を更新しています... + + + よろしいですか? + 全てのトラックとマーカをこの端末から削除しました． + トラックとマーカをこの端末から完全に削除しました． + マーカをこの端末から完全に削除しました． + + + Android用My Tracksで作成 + Android用<a href=\'http://mytracks.appspot.com\'>My Tracks</a>で作成しました． + 新規マップ + + + ポイント + 記録 + 活動タイプ + マーカタイプ + (Part %d) + + + トラックを保存中... + トラック %d + + + いいえ + はい + OK + エラー + 成功 + ウェイポイント + + + (開始) + (終了) + + + 表示 + Google My Mapsへ送信 + 新規Googleマイマップへ送信 + Google Docsへ送信 + Googleへ送信... + 端末から削除... + 詳細編集 + SDへの書き込み... + GPXファイルの保存 + KMLファイルの保存 + CVSファイルの保存 + Googleマイマップへの送信 + 全てのトラックの削除 + + 全てのトラックのエクスポート + エクスポート終了 + トラックを選択します．オプションを表示するには長押しして下さい． + 全てのトラック: + このトラック + 共有... + Googleマイマップへのリンク + GPXファイル + KMLファイル + CSVファイル + マップの消去 + + + 全てのマーカの削除 + このマーカ + 削除 + 詳細編集 + マップに表示 + ウェイポイントの挿入 + 統計情報の挿入 + マーカを選択します．オプションを表示するには長押しして下さい． + + + トラック詳細 + トラック名 + トラック説明 + 活動タイプ(ハイキング, サイクリング,　ランニング, 登山...) + + + マーカ詳細 + マーカ名 + マーカ説明 + マーカタイプ(建物, 洞穴, 名所...) + + + My Tracks設定 + 表示 + 記録 + 共有 + + 定期通知 + 音声通知間隔の最小時間 + お使いのAndroidの版では音声読み上げ機能がありません + + ポイント間の最短距離 + 位置記録間の最短距離 + + ポイント間の最長距離 + これより間隔が長い場合はトラックは分割されます + + ポイント間の最小時間間隔 + 位置記録の最短インターバル + + 最低精度 + この精度以上でないと記録を休止します + + メートル法を使用 + 全ての距離をメートル法で表示します + 全ての距離をヤード・ポンド法で表示します + + マップの公開 + アップロードされたマップはmaps.google.comで誰でも閲覧できます + アップロードされたマップはmaps.google.comのリストに公開されません． + + 速度表示 + 速度が表示されます + ペースが表示されます + + URLのみ共有 + 共有時にマップのURLのみ送信します + 共有時にトラックのコンテントが含まれます + + 信号サンプリング周波数 + 端末の信号強度記録の時間間隔 + + 分割頻度 + 分割マーカを挿入する時間または距離の間隔 + ペース + + + GPS衛星 + + + ご使用のアカウントからのマップ選択: + 新規マップ... + Googleマイマップへの送信 + マップの読み込み中... + マップを読み込めませんでした! + このマップを選択 + マップ詳細の編集 + マップの共有 + トラックの共有 + アカウントからマップの削除 + マップタイトル: + マップ説明: + + + このマップとコンテンツを検索結果に表示させる + このマップとコンテンツはどちらも検索結果に表示させない(直接URLで他の方が見ることは可能) + このマップとコンテンツは検索結果に表示されます + このマップとコンテンツはどちらも検索結果に表示されませんが，直接リンクで他の方が見ることができます． + 閉じる + 編集 + キャンセル + 保存 + + + マップを共有したいと思います + このマップに興味を持って頂けると思います: + + %s + トラックを共有したいと思います + このトラックに興味を持って頂けると思います． + + このトラックを閲覧するには，Google Earthまたは他のマッピングソフトウェアが必要です． + + + 公開 + リストに出さない + まだ地図がありません． + + + + 平均移動速度 + 平均移動ペース + + + 平均速度 + 平均ペース + + 標高チャート + 標高差 + 標高 + 緯度 + 経度 + + + 最小標高 + 最小勾配 + 最小ペース + + + 最大標高 + 最大勾配 + 最大速度 + + トラックの読み込み中... + + + チャート設定 + + X軸 + 距離ベース + 時間ベース + + + Y軸 + + + + 時 + 時 + 時 + 分 + 分 + 分 + 秒 + 秒 + + + m + km + キロメータ + ft + mi + マイル + + + km/h + キロメータ毎時 + min/km + 毎キロメータ + mi/h + マイル毎時 + min/mi + 毎マイル + + + 移動時間 + 合計時間 + 時間 + SD が発見できません + 速度 + 移動して下さい． + 統計 + 合計距離 + 距離 + - + 待機中... + + + エンドユーザライセンス契約書 + 同意する + 拒否する + + + このアプリケーションについて + ヘルプ + チーム: + バージョン: + サポート + サポート: + + + 送信... + Googleマイマップ + Google Docs + 今すぐ送信 + 新規マップ作成 + 既存マップ選択 + トラック統計情報送信 + 統計情報とポイント送信 + + + アカウントを発見できませんでした． + トラックをアップロードするためのアカウントを発見できませんでした． + アカウント選択 + + + 外部ストレージを発見できませんでした．SDカードが刺さっているか，端末がコンピュータにマウントされているか確認してください． + ファイルへの書き込みができません． + SDカードにディレクトリを作成できません． + SDカードへの書き込み終了． + + + アップグレードチェック + 今すぐアップデート + アップグレードせずに続行 + お使いの版では，確実には動作せず，サポートもされません．ご使用を続けるには %1$s のアップグレードしてください． + お使いの版では，確実には動作しません．すぐにアップグレードすることをお勧めします．アップグレードされない場合は問題発生の可能性があることをご認識ください． サーバ同期するような機能の中には，アップグレードされるまで機能しないものがあります． + %1$s の新しい版が出ています．現版で問題なくご使用になれますが，アップグレードするまで最新の機能をお使いになれません． + + + ようこそ + Ok + My Tracksについて + + + My Tracks 移動していません + + My Tracks %1$s %2$.2f %3$s 時間 %4$s 速度/ペース %5$s %6$s + + + 計測単位についてのご注意 + デフォルトの単位はメートルです．設定を変更しますか? + + + 誤り率: %1$d + S/N比: %1$d + Ec/Io比: %1$.1f dB + GSM 強度: %1$d + CDMA 強度: %1$d dBm + EVDO 強度: %1$d dBm + diff --git a/MyTracks/res/values/arrays.xml b/MyTracks/res/values/arrays.xml index d1be00be5..78075af5f 100644 --- a/MyTracks/res/values/arrays.xml +++ b/MyTracks/res/values/arrays.xml @@ -370,5 +370,6 @@ limitations under the License. GPX KML CSV + TCX diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml new file mode 100644 index 000000000..d982f7dd0 --- /dev/null +++ b/MyTracks/res/values/keys.xml @@ -0,0 +1,42 @@ + + + + + announcementFrequency + bluetoothDevice + bluetoothPairing + bluetoothSensor + defaultMapPublic + maxRecordingDistance + metricUnits + minRecordingDistance + minRecordingInterval + minRequiredAccuracy + modularStatsDisplay + pickExistingMap + recordingTrack + reportSpeed + selectedTrack + sendStatsAndPoints + sendToDocs + sendToMyMaps + sensorId + sensorType + shareUrlOnly + signalSamplingFrequency + splitFrequency + \ No newline at end of file diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 8c4ff6719..6e7bc366d 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -123,6 +123,7 @@ limitations under the License. Save a GPX file Save a KML file Save a CSV file + Save a TCX file Send to Google My Maps Delete all tracks @@ -136,6 +137,7 @@ limitations under the License. A GPX file A KML file A CSV file + A TCX file Clear map @@ -205,6 +207,21 @@ limitations under the License. Maximum time or distance after which a new split marker will be inserted Pace + Only supported in Android 2.0 or above + Sensor Type + The type of sensor to connect to. + + Sensor Id + The Id sent to sensors. + The Id must be an integer value. + + Bluetooth sensor + The bluetooth sensor to connect to. + + Modular Stats Display + The stats screen is split in various modes. + Display all stats on one screen + GPS Satellites @@ -292,6 +309,7 @@ limitations under the License. minutes second seconds + ms m @@ -311,6 +329,12 @@ limitations under the License. min/mi per mile + + W + + rpm + bpm + Moving Time Total Time @@ -321,6 +345,10 @@ limitations under the License. Statistics Total Distance Distance + Power + Cadence + Heart Rate + Max Heart Rate - Waiting... @@ -338,7 +366,6 @@ limitations under the License. Support: - 1.0.14 mytracks@googlegroups.com mytracks.appspot.com Copyright 2009 Google Inc. @@ -404,4 +431,29 @@ limitations under the License. GSM Strength: %1$d CDMA Strength: %1$d dBm EVDO Strength: %1$d dBm + + + Bluetooth + Bluetooth options + Device pairing + Open Android\'s bluetooth settings to pair a device + bluetoothSensorsEnabled + Sensor Options + + + NONE + ANT + SRM + ATHLOSOFT + + + Connected to %s + Bluetooth sensor connecting ... + Bluetooth sensor not connected + + + Sensor Data Time + Power meter enabled + Heart rate monitor enabled + diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml index 77f1abcf7..c39a33b02 100644 --- a/MyTracks/res/xml/preferences.xml +++ b/MyTracks/res/xml/preferences.xml @@ -18,26 +18,26 @@ limitations under the License. xmlns:android="http://schemas.android.com/apk/res/android"> - + - + - + - + - + - + diff --git a/MyTracks/src/com/google/android/apps/mymaps/MyMapsGDataWrapper.java b/MyTracks/src/com/google/android/apps/mymaps/MyMapsGDataWrapper.java index de4e0f069..365edb94f 100644 --- a/MyTracks/src/com/google/android/apps/mymaps/MyMapsGDataWrapper.java +++ b/MyTracks/src/com/google/android/apps/mymaps/MyMapsGDataWrapper.java @@ -114,7 +114,7 @@ public class MyMapsGDataWrapper { } catch (HttpException e) { Log.e(MyTracksConstants.TAG, "HttpException", e); errorMessage = e.getMessage(); - if (errorMessage.contains("401")) { + if (errorMessage != null && errorMessage.contains("401")) { errorType = ERROR_AUTH; } else { errorType = ERROR_CONNECTION; @@ -122,7 +122,7 @@ public class MyMapsGDataWrapper { } catch (IOException e) { Log.e(MyTracksConstants.TAG, "Exception", e); errorMessage = e.getMessage(); - if (errorMessage.contains("503")) { + if (errorMessage != null && errorMessage.contains("503")) { errorType = ERROR_INTERNAL; } else { errorType = ERROR_CONNECTION; diff --git a/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java b/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java index 6a47a7879..cfc1f8a3d 100644 --- a/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java +++ b/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java @@ -29,6 +29,9 @@ import android.app.Dialog; import android.app.TabActivity; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.Intent; import android.net.Uri; import android.util.Log; @@ -80,7 +83,17 @@ public class VersionChecker { final boolean newVersion; // Returned new version available final boolean newVersionRecommended; // Returned new version recommended final boolean newVersionRequired; // Returned new version required - String currentVersion = parentActivity.getString(R.string.version); + String currentVersion = ""; + try { + PackageInfo pi = + parentActivity.getPackageManager().getPackageInfo( + "com.google.android.maps.mytracks", + PackageManager.GET_META_DATA); + currentVersion = pi.versionName; + } catch (NameNotFoundException e) { + Log.w(MyTracksConstants.TAG, "Failed to get version info.", e); + return; + } GDataParser parser = client.getParserForFeed( Entry.class, diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java index 80cf399dc..c0f95242a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java @@ -44,9 +44,9 @@ public class AggregatedStatsActivity extends Activity implements Log.d(MyTracksConstants.TAG, "StatsActivity: onSharedPreferences changed " + key); if (key != null) { - if (key.equals(MyTracksSettings.METRIC_UNITS)) { + if (key.equals(R.string.metric_units_key)) { metricUnits = sharedPreferences.getBoolean( - MyTracksSettings.METRIC_UNITS, true); + getString(R.string.metric_units_key), true); utils.setMetricUnits(metricUnits); utils.updateUnits(); loadAggregatedStats(); @@ -68,7 +68,7 @@ public class AggregatedStatsActivity extends Activity implements SharedPreferences preferences = getSharedPreferences( MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true); preferences.registerOnSharedPreferenceChangeListener(this); } utils.setMetricUnits(metricUnits); diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java index f31539bee..14e3edc6b 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java @@ -1,12 +1,12 @@ /* * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -49,7 +49,7 @@ import java.util.ArrayList; /** * An activity that displays a chart from the track point provider. - * + * * @author Sandor Dornbush */ public class ChartActivity extends Activity implements @@ -204,23 +204,27 @@ public class ChartActivity extends Activity implements public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (key != null) { - if (key.equals(MyTracksSettings.SELECTED_TRACK)) { + if (key.equals(getString(R.string.selected_track_key))) { selectedTrackId = - sharedPreferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + sharedPreferences.getLong(getString(R.string.selected_track_key), + -1); readProfileAsync(); - } else if (key.equals(MyTracksSettings.METRIC_UNITS)) { + } else if (key.equals(getString(R.string.metric_units_key))) { metricUnits = - sharedPreferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + sharedPreferences.getBoolean(getString(R.string.metric_units_key), + true); cv.setMetricUnits(metricUnits); readProfileAsync(); - } else if (key.equals(MyTracksSettings.REPORT_SPEED)) { + } else if (key.equals(getString(R.string.report_speed_key))) { reportSpeed = - sharedPreferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + sharedPreferences.getBoolean(getString(R.string.report_speed_key), + true); cv.setReportSpeed(reportSpeed, this); readProfileAsync(); - } else if (key.equals(MyTracksSettings.RECORDING_TRACK)) { + } else if (key.equals(getString(R.string.recording_track_key))) { recordingTrackId = - sharedPreferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + sharedPreferences.getLong(getString(R.string.recording_track_key), + -1); runOnUiThread(updateChart); } } @@ -246,12 +250,14 @@ public class ChartActivity extends Activity implements getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { selectedTrackId = - preferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + preferences.getLong(getString(R.string.selected_track_key), -1); recordingTrackId = - preferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + preferences.getLong(getString(R.string.recording_track_key), -1); + metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), + true); cv.setMetricUnits(metricUnits); - reportSpeed = preferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key), + true); cv.setReportSpeed(reportSpeed, this); preferences.registerOnSharedPreferenceChangeListener(this); } @@ -450,7 +456,7 @@ public class ChartActivity extends Activity implements * data[0] = the time or distance * data[1] = the elevation * data[2] = the speed - * + * * @param location a location * @return the data point */ diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java index 07311fca2..cb582f089 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java @@ -109,7 +109,8 @@ public class ExportAllTracks { context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); long recordingTrackId = -1; if (prefs != null) { - recordingTrackId = prefs.getLong(MyTracksSettings.RECORDING_TRACK, -1); + recordingTrackId = + prefs.getLong(context.getString(R.string.recording_track_key), -1); } if (recordingTrackId != -1) { acquireWakeLock(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java new file mode 100644 index 000000000..784f835d1 --- /dev/null +++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java @@ -0,0 +1,98 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks; + +import com.google.android.maps.mytracks.R; + +import android.content.Intent; +import android.view.Menu; +import android.view.MenuItem; + +/** + * Manage the application menus. + * + * @author Sandor Dornbush + */ +class MenuManager { + + private MyTracks activity; + + public MenuManager(MyTracks activity) { + this.activity = activity; + } + + public boolean onCreateOptionsMenu(Menu menu) { + activity.getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + public void onPrepareOptionsMenu(Menu menu, boolean hasRecorded, + boolean isRecording, boolean hasSelectedTrack) { + menu.findItem(R.id.menu_list_tracks).setEnabled(hasRecorded); + menu.findItem(R.id.menu_list_markers) + .setEnabled(hasRecorded && hasSelectedTrack); + MenuItem startRecording = menu.findItem(R.id.menu_start_recording); + startRecording.setEnabled(!isRecording); + startRecording.setVisible(!isRecording); + MenuItem stopRecording = menu.findItem(R.id.menu_stop_recording); + stopRecording.setEnabled(isRecording); + stopRecording.setVisible(isRecording); + } + + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_start_recording: { + activity.startRecording(); + return true; + } + case R.id.menu_stop_recording: { + activity.stopRecording(); + return true; + } + case R.id.menu_list_tracks: { + Intent startIntent = new Intent(activity, MyTracksList.class); + activity.startActivityForResult(startIntent, MyTracksConstants.SHOW_TRACK); + return true; + } + case R.id.menu_list_markers: { + Intent startIntent = new Intent(activity, MyTracksWaypointsList.class); + startIntent.putExtra("trackid", activity.getSelectedTrack()); + activity.startActivityForResult(startIntent, MyTracksConstants.SHOW_WAYPOINT); + return true; + } + case R.id.menu_settings: { + Intent startIntent = new Intent(activity, MyTracksSettings.class); + activity.startActivity(startIntent); + return true; + } + case R.id.menu_aggregated_stats: { + Intent startIntent = new Intent(activity, AggregatedStatsActivity.class); + activity.startActivity(startIntent); + return true; + } + case R.id.menu_help: { + Intent startIntent = new Intent(activity, WelcomeActivity.class); + activity.startActivity(startIntent); + return true; + } + case MyTracksConstants.MENU_CLEAR_MAP: { + activity.setSelectedTrack(-1); + return true; + } + } + return false; + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java index 1ba326910..a60e537a9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java @@ -1,1581 +1,1520 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.android.apps.mytracks; - -import com.google.android.accounts.Account; -import com.google.android.apps.mymaps.MyMapsConstants; -import com.google.android.apps.mymaps.MyMapsList; -import com.google.android.apps.mymaps.VersionChecker; -import com.google.android.apps.mytracks.content.MyTracksProviderUtils; -import com.google.android.apps.mytracks.content.Track; -import com.google.android.apps.mytracks.content.Waypoint; -import com.google.android.apps.mytracks.io.AuthManager; -import com.google.android.apps.mytracks.io.AuthManagerFactory; -import com.google.android.apps.mytracks.io.GpxImport; -import com.google.android.apps.mytracks.io.SendToDocs; -import com.google.android.apps.mytracks.io.SendToMyMaps; -import com.google.android.apps.mytracks.io.TrackWriter; -import com.google.android.apps.mytracks.io.TrackWriterFactory; -import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; -import com.google.android.apps.mytracks.services.ITrackRecordingService; -import com.google.android.apps.mytracks.services.TrackRecordingService; -import com.google.android.maps.mytracks.R; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.ProgressDialog; -import android.app.TabActivity; -import android.content.ComponentName; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.ServiceConnection; -import android.content.SharedPreferences; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.database.Cursor; -import android.location.Location; -import android.location.LocationManager; -import android.net.Uri; -import android.os.Bundle; -import android.os.Environment; -import android.os.IBinder; -import android.os.RemoteException; -import android.speech.tts.TextToSpeech; -import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnTouchListener; -import android.view.ViewGroup.LayoutParams; -import android.view.Window; -import android.view.WindowManager.BadTokenException; -import android.widget.RelativeLayout; -import android.widget.TabHost; -import android.widget.Toast; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Random; - -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; - -/** - * The super activity that embeds our sub activities. - * - * @author Leif Hendrik Wilden - */ -public class MyTracks extends TabActivity implements OnTouchListener, - OnSharedPreferenceChangeListener, ProgressIndicator { - - private static final String WAYPOINT_ICON_URL = - "http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png"; - - /** - * Singleton instance - */ - private static MyTracks instance = null; - private ChartActivity chartActivity = null; - - public ChartActivity getChartActivity() { - return chartActivity; - } - - public void setChartActivity(ChartActivity chartActivity) { - this.chartActivity = chartActivity; - } - - /* - * Authentication: - */ - - private AuthManager auth; - private final HashMap authMap = - new HashMap(); - private AccountChooser accountChooser = new AccountChooser(); - - /* - * Dialogs: - */ - - public static final int DIALOG_PROGRESS = 1; - public static final int DIALOG_IMPORT_PROGRESS = 2; - public static final int DIALOG_WRITE_PROGRESS = 3; - public static final int DIALOG_SEND_TO_GOOGLE = 4; - public static final int DIALOG_SEND_TO_GOOGLE_RESULT = 5; - public static final int DIALOG_CHART_SETTINGS = 6; - - private ProgressDialog progressDialog; - private ProgressDialog importProgressDialog; - private ProgressDialog writeProgressDialog; - private SendToGoogleDialog sendToGoogleDialog; - private AlertDialog sendToGoogleResultDialog; - private ChartSettingsDialog chartSettingsDialog; - - /* - * Menu items: - */ - - private MenuItem startRecording; - private MenuItem stopRecording; - private MenuItem listTracks; - private MenuItem listMarkers; - private MenuItem settings; - private MenuItem aggregatedStats; - private MenuItem help; - - - /* - * Information on upload success to MyMaps/Docs. - * Used by SendToGoogleResultDialog. - */ - - public boolean sendToMyMapsSuccess = false; - public boolean sendToDocsSuccess = false; - public String sendToMyMapsMapId = null; - public String sendToMyMapsMessage = ""; - public String sendToDocsMessage = ""; - - /** - * True if a new track should be created after the track recording service - * binds. - */ - private boolean startNewTrackRequested = false; - - private ITrackRecordingService trackRecordingService; - - /** - * The id of the currently recording track. - */ - private long recordingTrackId = -1; - - /** - * The id of the currently selected track. - */ - private long selectedTrackId = -1; - - /** - * Does the user want to share the current track. - */ - private boolean shareRequested = false; - - /** - * Utilities to deal with the database. - */ - private MyTracksProviderUtils providerUtils; - - /** - * The connection to the track recording service. - */ - private final ServiceConnection serviceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName className, IBinder service) { - Log.d(MyTracksConstants.TAG, "MyTracks: Service now connected."); - trackRecordingService = ITrackRecordingService.Stub.asInterface(service); - if (startNewTrackRequested) { - startNewTrackRequested = false; - try { - recordingTrackId = trackRecordingService.startNewTrack(); - Toast.makeText(MyTracks.this, - R.string.status_now_recording, Toast.LENGTH_SHORT).show(); - setSelectedAndRecordingTrack(recordingTrackId, recordingTrackId); - } catch (RemoteException e) { - Toast.makeText(MyTracks.this, - R.string.error_unable_to_start_recording, Toast.LENGTH_SHORT) - .show(); - Log.w(MyTracksConstants.TAG, "Unable to start recording.", e); - } - } - } - - @Override - public void onServiceDisconnected(ComponentName className) { - Log.d(MyTracksConstants.TAG, "MyTracks: Service now disconnected."); - trackRecordingService = null; - } - }; - - /* - * Tabs/View navigation: - */ - - private static final int NUM_TABS = 3; - private int currentTab = 0; - - private NavControls navControls; - - private final int icons[] = - { R.drawable.arrow_grey, R.drawable.menu_by_time, - R.drawable.menu_elevation }; - - private final Runnable nextActivity = new Runnable() { - public void run() { - currentTab = (currentTab + 1) % NUM_TABS; - navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); - navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); - getTabHost().setCurrentTab(currentTab); - navControls.show(); - } - }; - - private final Runnable prevActivity = new Runnable() { - public void run() { - currentTab--; - if (currentTab < 0) { - currentTab = NUM_TABS - 1; - } - navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); - navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); - getTabHost().setCurrentTab(currentTab); - navControls.show(); - } - }; - - private final Random random = new Random(); - - public static MyTracks getInstance() { - return instance; - } - - /** - * @return true if the activity is bound to the track recording service and - * the service is recording a track. - */ - public boolean isRecording() { - if (trackRecordingService == null) { - return false; - } - try { - return trackRecordingService.isRecording(); - } catch (RemoteException e) { - Log.e(MyTracksConstants.TAG, "MyTracks: Remote exception.", e); - return false; - } - } - - /* - * Application lifetime events: - * ============================ - */ - - @Override - protected void onCreate(Bundle savedInstanceState) { - Log.d(MyTracksConstants.TAG, "MyTracks.onCreate"); - super.onCreate(savedInstanceState); - instance = this; - providerUtils = MyTracksProviderUtils.Factory.get(this); - - // The volume we want to control is the Text-To-Speech volume - setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); - - // We don't need a window title bar: - requestWindowFeature(Window.FEATURE_NO_TITLE); - - final Resources res = getResources(); - final TabHost tabHost = getTabHost(); - tabHost.addTab(tabHost.newTabSpec("tab1") - .setIndicator("Map", res.getDrawable( - android.R.drawable.ic_menu_mapmode)) - .setContent(new Intent(this, MyTracksMap.class))); - tabHost.addTab(tabHost.newTabSpec("tab2") - .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats)) - .setContent(new Intent(this, StatsActivity.class))); - tabHost.addTab(tabHost.newTabSpec("tab3") - .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation)) - .setContent(new Intent(this, ChartActivity.class))); - - // Hide the tab widget itself. We'll use overlayed prev/next buttons to - // switch between the tabs: - tabHost.getTabWidget().setVisibility(View.GONE); - - RelativeLayout layout = new RelativeLayout(this); - LayoutParams params = - new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); - layout.setLayoutParams(params); - navControls = new NavControls(this, layout, prevActivity, nextActivity); - navControls.setLeftIcon(icons[NUM_TABS - 1]); - navControls.setRightIcon(icons[1]); - navControls.show(); - tabHost.addView(layout); - layout.setOnTouchListener(this); - - SharedPreferences prefs = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - if (prefs != null) { - selectedTrackId = prefs.getLong(MyTracksSettings.SELECTED_TRACK, -1); - recordingTrackId = prefs.getLong(MyTracksSettings.RECORDING_TRACK, -1); - prefs.registerOnSharedPreferenceChangeListener(this); - } - - // This will show the eula until the user accepts or quits the app. - Eula.showEula(this); - - // Check if new version is available and prompt user with update options: - new VersionChecker(this); - - // Check if we got invoked via the VIEW intent: - Intent intent = getIntent(); - if (intent != null && intent.getAction() != null) { - if (intent.getAction().equals(Intent.ACTION_VIEW)) { - if (intent.getScheme() != null && intent.getScheme().equals("file")) { - Log.w(MyTracksConstants.TAG, - "Received a VIEW intent with file scheme. Importing."); - importGpxFile(intent.getData().getPath()); - } else { - Log.w(MyTracksConstants.TAG, - "Received a VIEW intent with unsupported scheme " - + intent.getScheme()); - } - } else { - Log.w(MyTracksConstants.TAG, - "Received an intent with unsupported action " + intent.getAction()); - } - } else { - Log.d(MyTracksConstants.TAG, "Received an intent with no action."); - } - } - - @Override - protected void onPause() { - // Called when activity is going into the background, but has not (yet) been - // killed. Shouldn't block longer than approx. 2 seconds. - Log.d(MyTracksConstants.TAG, "MyTracks.onPause"); - super.onPause(); - tryUnbindTrackRecordingService(); - } - - @Override - protected void onResume() { - // Called when the current activity is being displayed or re-displayed - // to the user. - Log.d(MyTracksConstants.TAG, "MyTracks.onResume"); - super.onResume(); - tryBindTrackRecordingService(); - navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); - navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); - } - - @Override - protected void onStop() { - super.onStop(); - // Clean up any temporary GPX and KML files. - cleanTmpDirectory("gpx"); - cleanTmpDirectory("kml"); - } - - private void cleanTmpDirectory(String name) { - if (!Environment.getExternalStorageState().equals( - Environment.MEDIA_MOUNTED)) { - return; // Can't do anything now. - } - String sep = System.getProperty("file.separator"); - File dir = new File( - Environment.getExternalStorageDirectory() + sep + name + sep + "tmp"); - if (!dir.exists()) { - return; - } - File[] list = dir.listFiles(); - long now = System.currentTimeMillis(); - long oldest = now - 1000 * 3600; - for (File f : list) { - if (f.lastModified() < oldest) { - f.delete(); - } - } - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - } - - /* - * Menu events: - * ============ - */ - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - startRecording = menu.add(0, MyTracksConstants.MENU_START_RECORDING, 0, - R.string.start_recording); - startRecording.setIcon(R.drawable.menu_record); - stopRecording = menu.add(0, MyTracksConstants.MENU_STOP_RECORDING, 0, - R.string.stop_recording); - stopRecording.setIcon(R.drawable.menu_stop); - listTracks = menu.add(0, MyTracksConstants.MENU_LIST_TRACKS, 0, - R.string.list_tracks); - listTracks.setIcon(R.drawable.menu_list_tracks); - listMarkers = menu.add(0, MyTracksConstants.MENU_LIST_MARKERS, 0, - R.string.list_markers); - listMarkers.setIcon(R.drawable.menu_marker); - settings = menu.add(0, MyTracksConstants.MENU_SETTINGS, 10001, - R.string.settings); - settings.setIcon(android.R.drawable.ic_menu_preferences); - aggregatedStats = menu.add(0, MyTracksConstants.MENU_AGGREGATED_STATS, - 10002, R.string.aggregated_stats); - help = menu.add(0, MyTracksConstants.MENU_HELP, 10003, R.string.help); - help.setIcon(android.R.drawable.ic_menu_info_details); - return true; - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - boolean hasRecorded = providerUtils.getLastTrack() != null; - boolean isRecording = isRecording(); - listTracks = menu.findItem(MyTracksConstants.MENU_LIST_TRACKS); - listTracks.setEnabled(hasRecorded); - listMarkers = menu.findItem(MyTracksConstants.MENU_LIST_MARKERS); - listMarkers.setEnabled(hasRecorded && selectedTrackId >= 0); - startRecording = menu.findItem(MyTracksConstants.MENU_START_RECORDING); - startRecording.setEnabled(!isRecording); - startRecording.setVisible(!isRecording); - stopRecording = menu.findItem(MyTracksConstants.MENU_STOP_RECORDING); - stopRecording.setEnabled(isRecording); - stopRecording.setVisible(isRecording); - return super.onPrepareOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case MyTracksConstants.MENU_START_RECORDING: { - startRecording(); - return true; - } - case MyTracksConstants.MENU_STOP_RECORDING: { - stopRecording(); - return true; - } - case MyTracksConstants.MENU_LIST_TRACKS: { - Intent startIntent = new Intent(this, MyTracksList.class); - startActivityForResult(startIntent, MyTracksConstants.SHOW_TRACK); - return true; - } - case MyTracksConstants.MENU_LIST_MARKERS: { - Intent startIntent = new Intent(this, MyTracksWaypointsList.class); - startIntent.putExtra("trackid", selectedTrackId); - startActivityForResult(startIntent, MyTracksConstants.SHOW_WAYPOINT); - return true; - } - case MyTracksConstants.MENU_SETTINGS: { - Intent startIntent = new Intent(this, MyTracksSettings.class); - startActivity(startIntent); - return true; - } - case MyTracksConstants.MENU_HELP: { - Intent startIntent = new Intent(this, WelcomeActivity.class); - startActivity(startIntent); - return true; - } - case MyTracksConstants.MENU_CLEAR_MAP: { - setSelectedTrack(-1); - return true; - } - case MyTracksConstants.MENU_AGGREGATED_STATS: { - Intent startIntent = new Intent(this, AggregatedStatsActivity.class); - startActivity(startIntent); - return true; - } - } - return super.onOptionsItemSelected(item); - } - - /* - * Dialog events: - * ============== - */ - - @Override - protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_PROGRESS: - progressDialog = new ProgressDialog(this); - progressDialog.setIcon(android.R.drawable.ic_dialog_info); - progressDialog.setTitle(getString(R.string.progress_title)); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setMessage(""); - progressDialog.setMax(100); - progressDialog.setProgress(10); - return progressDialog; - case DIALOG_IMPORT_PROGRESS: - importProgressDialog = new ProgressDialog(this); - importProgressDialog.setIcon(android.R.drawable.ic_dialog_info); - importProgressDialog.setTitle(getString(R.string.progress_title)); - importProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - importProgressDialog.setMessage( - getString(R.string.import_progress_message)); - return importProgressDialog; - case DIALOG_WRITE_PROGRESS: - writeProgressDialog = new ProgressDialog(this); - writeProgressDialog.setIcon(android.R.drawable.ic_dialog_info); - writeProgressDialog.setTitle(getString(R.string.progress_title)); - writeProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - writeProgressDialog.setMessage( - getString(R.string.write_progress_message)); - return writeProgressDialog; - case DIALOG_SEND_TO_GOOGLE: - sendToGoogleDialog = new SendToGoogleDialog(this); - return sendToGoogleDialog; - case DIALOG_SEND_TO_GOOGLE_RESULT: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setIcon(android.R.drawable.ic_dialog_info); - builder.setTitle("Title"); - builder.setMessage("Message"); - builder.setPositiveButton(getString(R.string.ok), null); - builder.setNeutralButton(getString(R.string.share_map), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - shareLinkToMyMap(sendToMyMapsMapId); - dialog.dismiss(); - } - }); - sendToGoogleResultDialog = builder.create(); - return sendToGoogleResultDialog; - case DIALOG_CHART_SETTINGS: - chartSettingsDialog = new ChartSettingsDialog(this); - return chartSettingsDialog; - } - return null; - } - - @Override - protected void onPrepareDialog(int id, Dialog dialog) { - super.onPrepareDialog(id, dialog); - Log.d(MyTracksConstants.TAG, "MyTracks.onPrepareDialog: " + id); - switch (id) { - case DIALOG_SEND_TO_GOOGLE: - resetSendToGoogleStatus(); - break; - case DIALOG_SEND_TO_GOOGLE_RESULT: - boolean success = sendToMyMapsSuccess && sendToDocsSuccess; - sendToGoogleResultDialog.setTitle( - success ? R.string.success : R.string.error); - sendToGoogleResultDialog.setIcon(success - ? android.R.drawable.ic_dialog_info - : android.R.drawable.ic_dialog_alert); - sendToGoogleResultDialog.setMessage(getMapsResultMessage()); - - boolean canShare = sendToMyMapsMapId != null; - View share = - sendToGoogleResultDialog.findViewById(android.R.id.button3); - if (share != null) { - share.setVisibility(canShare ? View.VISIBLE : View.GONE); - } - break; - case DIALOG_CHART_SETTINGS: - Log.d(MyTracksConstants.TAG, "MyTracks.onPrepare chart dialog"); - chartSettingsDialog.setup(chartActivity); - break; - } - } - - /* - * Key events: - * =========== - */ - - @Override - public boolean onTrackballEvent(MotionEvent event) { - if (isRecording()) { - if (event.getAction() == MotionEvent.ACTION_DOWN) { - insertStatisticsMarker(); - return true; - } - } - return super.onTrackballEvent(event); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, - final Intent results) { - TrackFileFormat exportFormat = null; - switch (requestCode) { - case MyTracksConstants.GET_MAP: { - if (resultCode == RESULT_OK) { - results.putExtra("trackid", selectedTrackId); - if (results.hasExtra("mapid")) { - sendToMyMapsMapId = results.getStringExtra("mapid"); - } - setProgressMessage(getString( - R.string.progress_message_authenticating_mymaps)); - authenticate(results, MyTracksConstants.SEND_TO_GOOGLE, - MyMapsConstants.MAPSHOP_SERVICE); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.GET_LOGIN: { - if (resultCode == RESULT_OK && auth != null) { - if (!auth.authResult(resultCode, results)) { - dismissDialogSafely(DIALOG_PROGRESS); - } - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.SHOW_TRACK: { - if (results != null) { - final long trackId = results.getLongExtra("trackid", -1); - if (trackId >= 0) { - setSelectedTrack(trackId); - // The track list passed the requested action as result code. Hand - // it off to the onAcitivtyResult for further processing: - if (resultCode != MyTracksConstants.SHOW_TRACK) { - onActivityResult(resultCode, Activity.RESULT_OK, results); - } - } - } - break; - } - case MyTracksConstants.SHOW_WAYPOINT: { - if (results != null) { - final long waypointId = results.getLongExtra("waypointid", -1); - if (waypointId >= 0) { - MyTracksMap map = - (MyTracksMap) getLocalActivityManager().getActivity("tab1"); - if (map != null) { - getTabHost().setCurrentTab(0); - map.showWaypoint(waypointId); - } - } - } - break; - } - case MyTracksConstants.DELETE_TRACK: { - if (results != null && resultCode == RESULT_OK) { - final long trackId = results.getLongExtra("trackid", selectedTrackId); - deleteTrack(trackId); - } - break; - } - case MyTracksConstants.EDIT_DETAILS: { - if (results != null && resultCode == RESULT_OK) { - final long trackId = results.getLongExtra("trackid", selectedTrackId); - Intent intent = new Intent(this, MyTracksDetails.class); - intent.putExtra("trackid", trackId); - startActivity(intent); - } - break; - } - case MyTracksConstants.AUTHENTICATE_TO_DOCS: { - if (resultCode == RESULT_OK) { - setProgressValue(0); - setProgressMessage( - getString(R.string.progress_message_authenticating_docs)); - authenticate(results, - MyTracksConstants.AUTHENTICATE_TO_TRIX, "writely"); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.AUTHENTICATE_TO_TRIX: { - if (resultCode == RESULT_OK) { - setProgressValue(30); - setProgressMessage( - getString(R.string.progress_message_authenticating_docs)); - authenticate(results, MyTracksConstants.SEND_TO_DOCS, "wise"); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.SEND_TO_DOCS: { - if (results != null && resultCode == RESULT_OK) { - Log.d(MyTracksConstants.TAG, "Sending to Docs...."); - setProgressValue(50); - setProgressMessage(getString(R.string.progress_message_sending_docs)); - final long trackId = results.getLongExtra("trackid", selectedTrackId); - final SendToDocs sender = new SendToDocs(this, authMap.get("wise"), - authMap.get("writely"), trackId); - Runnable onCompletion = new Runnable() { - public void run() { - setProgressValue(100); - dismissDialogSafely(DIALOG_PROGRESS); - runOnUiThread(new Runnable() { - public void run() { - sendToDocsMessage = sender.getStatusMessage(); - sendToDocsSuccess = sender.wasSuccess(); - handleMapsFinish(); - } - }); - } - }; - sender.setOnCompletion(onCompletion); - sender.run(); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.SEND_TO_GOOGLE_DIALOG: { - shareRequested = false; - showDialogSafely(DIALOG_SEND_TO_GOOGLE); - break; - } - case MyTracksConstants.SEND_TO_GOOGLE: { - if (results != null && resultCode == RESULT_OK) { - final String mapid; - final long trackId; - if (results.hasExtra("mapid")) { - mapid = results.getStringExtra("mapid"); - } else { - mapid = "new"; - } - if (results.hasExtra("trackid")) { - trackId = results.getLongExtra("trackid", -1); - } else { - trackId = selectedTrackId; - } - final SendToMyMaps sender = new SendToMyMaps(this, mapid, auth, - trackId, this/*progressIndicator*/); - Runnable onCompletion = new Runnable() { - public void run() { - sendToMyMapsMessage = sender.getStatusMessage(); - sendToMyMapsSuccess = sender.wasSuccess(); - if (sendToMyMapsSuccess) { - sendToMyMapsMapId = sender.getMapId(); - // Update the map id for this track: - try { - Track track = providerUtils.getTrack(trackId); - track.setMapId(sender.getMapId()); - providerUtils.updateTrack(track); - } catch (RuntimeException e) { - // If that fails whatever reasons we'll just log an error, but - // continue. - Log.w(MyTracksConstants.TAG, "Updating map id failed.", e); - } - } - if (sendToGoogleDialog.getSendToDocs()) { - onActivityResult(MyTracksConstants.AUTHENTICATE_TO_DOCS, - RESULT_OK, new Intent()); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - runOnUiThread(new Runnable() { - public void run() { - handleMapsFinish(); - } - }); - } - } - }; - sender.setOnCompletion(onCompletion); - sender.run(); - } else { - dismissDialogSafely(DIALOG_PROGRESS); - } - break; - } - case MyTracksConstants.SAVE_GPX_FILE: - if (exportFormat == null) { exportFormat = TrackFileFormat.GPX; } - //$FALL-THROUGH$ - case MyTracksConstants.SAVE_KML_FILE: - if (exportFormat == null) { exportFormat = TrackFileFormat.KML; } - //$FALL-THROUGH$ - case MyTracksConstants.SAVE_CSV_FILE: { - if (exportFormat == null) { exportFormat = TrackFileFormat.CSV; } - - if (results != null && resultCode == Activity.RESULT_OK) { - final long trackId = results.getLongExtra("trackid", selectedTrackId); - if (trackId >= 0) { - saveTrack(trackId, exportFormat); - } - } - break; - } - case MyTracksConstants.SHARE_LINK: { - Track selectedTrack = providerUtils.getTrack(selectedTrackId); - if (selectedTrack != null) { - if (selectedTrack.getMapId().length() > 0) { - shareLinkToMyMap(selectedTrack.getMapId()); - } else { - shareRequested = true; - showDialogSafely(DIALOG_SEND_TO_GOOGLE); - } - } - break; - } - case MyTracksConstants.SHARE_GPX_FILE: - case MyTracksConstants.SHARE_KML_FILE: { - if (results != null && resultCode == RESULT_OK) { - long trackId = results.getLongExtra("trackid", selectedTrackId); - if (trackId >= 0) { - TrackFileFormat format = - (requestCode == MyTracksConstants.SHARE_GPX_FILE) - ? TrackFileFormat.GPX - : TrackFileFormat.KML; - sendTrack(trackId, format); - } - } - break; - } - case MyTracksConstants.CLEAR_MAP: { - setSelectedTrack(-1); - break; - } - case MyTracksConstants.WELCOME: { - CheckUnits.check(this); - break; - } - - default: { - Log.w(MyTracksConstants.TAG, - "Warning unhandled request code: " + requestCode); - } - } - } - - @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_DOWN) { - navControls.show(); - } - return false; - } - - @Override - public void onSharedPreferenceChanged( - SharedPreferences sharedPreferences, String key) { - // The service itself cannot listen to changes (not supported by Android for - // services that run in a separate process). So we'll notify it manually: - if (key != null && trackRecordingService != null) { - try { - trackRecordingService.sharedPreferenceChanged(key); - } catch (RemoteException e) { - Log.w(MyTracksConstants.TAG, - "MyTracks: Cannot notify track recording service of changes " - + "to shared preferences: ", e); - } - } - if (key != null && key.equals(MyTracksSettings.SELECTED_TRACK)) { - selectedTrackId = - sharedPreferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); - } - } - - /** - * Simulates the recording of a random location. - * This is for debugging and testing only. Useful if there is no GPS signal - * available. - */ - public void recordRandomLocation() { - if (trackRecordingService != null) { - Location loc = new Location("gps"); - double latitude = 37.5 + random.nextDouble() / 1000; - double longitude = -120.0 + random.nextDouble() / 1000; - loc.setLatitude(latitude); - loc.setLongitude(longitude); - loc.setAltitude(random.nextDouble() * 100); - loc.setTime(System.currentTimeMillis()); - loc.setSpeed(random.nextFloat()); - MyTracksMap map = - (MyTracksMap) getLocalActivityManager().getActivity("tab1"); - if (map != null) { - map.onLocationChanged(loc); - } - StatsActivity stats = - (StatsActivity) getLocalActivityManager().getActivity("tab2"); - if (stats != null) { - stats.onLocationChanged(loc); - } - try { - trackRecordingService.recordLocation(loc); - } catch (RemoteException e) { - Log.e(MyTracksConstants.TAG, "MyTracks", e); - } - } - } - - /** - * Resets status information for sending to MyMaps/Docs. - */ - private void resetSendToGoogleStatus() { - sendToMyMapsMessage = ""; - sendToMyMapsSuccess = true; - sendToDocsMessage = ""; - sendToDocsSuccess = true; - sendToMyMapsMapId = null; - } - - /** - * Reads data from a provider, for example gmail attachment preview. Currently - * fails (due to permissions?!). This is currently dead code not invoked from - * anywhere. - */ - protected String getContent(Uri uri) { - Cursor cursor = null; - try { - cursor = managedQuery(uri, - null /*projection*/, null /*selection*/, null /*selectionArgs*/, - null /*sortOrder*/); - if (cursor == null) { - Toast.makeText(this, - R.string.error_unable_to_read_file, Toast.LENGTH_LONG).show(); - return null; - } - if (cursor.moveToFirst()) { - String cols[] = cursor.getColumnNames(); - String s = "Cols:"; - for (String c : cols) { s += c + ","; } - Toast.makeText(this, s, Toast.LENGTH_LONG).show(); - return ""; - } else { - Toast.makeText(this, R.string.error_generic, Toast.LENGTH_LONG).show(); - return null; - } - } finally { - if (cursor != null) { - stopManagingCursor(cursor); - cursor.close(); - } - } - } - - private void importGpxFile(final String fileName) { - showDialogSafely(DIALOG_IMPORT_PROGRESS); - Thread t = new Thread() { - @Override - public void run() { - boolean success = false; - ArrayList tracks = new ArrayList(); - int message = R.string.success; - try { - try { - GpxImport.importGPXFile(fileName, tracks); - success = true; - } catch (SAXException e) { - Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); - message = R.string.error_generic; - } catch (ParserConfigurationException e) { - Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); - message = R.string.error_generic; - } catch (IOException e) { - Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); - message = R.string.error_unable_to_read_file; - } catch (NullPointerException e) { - Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); - message = R.string.error_invalid_gpx_format; - } catch (OutOfMemoryError e) { - Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); - message = R.string.error_out_of_memory; - } - if (success) { - long trackId = -1; - for (Track track : tracks) { - Uri uri = providerUtils.insertTrackAndTrackPoints(track); - trackId = Long.parseLong(uri.getLastPathSegment()); - } - setSelectedTrack(trackId); - } else { - MyTracks.this.showMessageDialog(message, false/*success*/); - } - } finally { - runOnUiThread(new Runnable() { - public void run() { - dismissDialog(DIALOG_IMPORT_PROGRESS); - } - }); - } - } - }; - t.start(); - } - - /** - * Just like showDialog, but will catch a BadTokenException that sometimes - * (very rarely) gets thrown. This might happen if the user hits the "back" - * button immediately after sending tracks to google. - * - * @param id the dialog id - */ - public void showDialogSafely(final int id) { - runOnUiThread(new Runnable() { - public void run() { - try { - showDialog(id); - } catch (BadTokenException e) { - Log.w(MyTracksConstants.TAG, - "Could not display dialog with id " + id, e); - } catch (IllegalStateException e) { - Log.w(MyTracksConstants.TAG, - "Could not display dialog with id " + id, e); - } - } - }); - } - - /** - * Dismisses the progress dialog if it is showing. Executed on the UI thread. - */ - public void dismissDialogSafely(final int id) { - runOnUiThread(new Runnable() { - public void run() { - try { - dismissDialog(id); - } catch (IllegalArgumentException e) { - // This will be thrown if this dialog was not shown before. - } - } - }); - } - - public void setProgressMessage(final String text) { - runOnUiThread(new Runnable() { - public void run() { - synchronized (this) { - if (progressDialog != null) { - progressDialog.setMessage(text); - } - } - } - }); - } - - public void setProgressValue(final int percent) { - runOnUiThread(new Runnable() { - public void run() { - synchronized (this) { - if (progressDialog != null) { - progressDialog.setProgress(percent); - } - } - } - }); - } - - /** - * Shares a link to a My Map via external app (email, gmail, ...) - * A chooser with apps that support text/plain will be shown to the user. - */ - private void shareLinkToMyMap(String mapId) { - Intent shareIntent = new Intent(Intent.ACTION_SEND); - shareIntent.setType("text/plain"); - shareIntent.putExtra(Intent.EXTRA_SUBJECT, - getResources().getText(R.string.share_map_subject).toString()); - - SharedPreferences prefs = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - boolean shareUrlOnly = true; - if (prefs != null) { - shareUrlOnly = prefs.getBoolean(MyTracksSettings.SHARE_URL_ONLY, false); - } - - String url = MyMapsConstants.MAPSHOP_BASE_URL + "?msa=0&msid=" + mapId; - 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).toString())); - } - - /** - * Deletes the track with the given id. - * Prompts the user if he want to really delete the track first. - * If the selected track is deleted, the selection will be removed. - */ - public void deleteTrack(final long trackId) { - AlertDialog dialog = null; - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(getString(R.string.track_will_be_permanently_deleted)); - builder.setTitle(getString(R.string.are_you_sure_question)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setPositiveButton(getString(R.string.yes), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int i) { - dialog.dismiss(); - providerUtils.deleteTrack(trackId); - if (trackId == selectedTrackId) { - setSelectedTrack(-1); - } - }}); - builder.setNegativeButton(getString(R.string.no), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int i) { - dialog.dismiss(); - } - }); - dialog = builder.create(); - dialog.show(); - } - - public Location getCurrentLocation() { - // TODO: Let's look at more advanced algorithms to determine the best - // current location. - LocationManager locationManager = - (LocationManager) getSystemService(Context.LOCATION_SERVICE); - if (locationManager == null) { - return null; - } - final long maxAgeMilliSeconds = 1000 * 60 * 1; // 1 minute - final long maxAgeNetworkMilliSeconds = 1000 * 60 * 10; // 10 minutes - final long now = System.currentTimeMillis(); - Location loc = locationManager.getLastKnownLocation( - MyTracksConstants.GPS_PROVIDER); - if (loc == null || loc.getTime() < now - maxAgeMilliSeconds) { - // We don't have a recent GPS fix, just use cell towers if available - loc = locationManager.getLastKnownLocation( - LocationManager.NETWORK_PROVIDER); - if (loc == null || loc.getTime() < now - maxAgeNetworkMilliSeconds) { - // We don't have a recent cell tower location, let the user know: - Toast.makeText(this, getString(R.string.status_no_location), - Toast.LENGTH_LONG).show(); - return null; - } else { - // Let the user know we have only an approximate location: - Toast.makeText(this, getString(R.string.status_approximate_location), - Toast.LENGTH_LONG).show(); - } - } - return loc; - } - - public Location getLastLocation() { - if (providerUtils.getLastLocationId(recordingTrackId) < 0) { - return null; - } - LocationManager locationManager = - (LocationManager) getSystemService(Context.LOCATION_SERVICE); - return locationManager.getLastKnownLocation(MyTracksConstants.GPS_PROVIDER); - } - - /** - * Inserts a waypoint marker. - * - * @return the id of the inserted statistics marker, or - * -1 unable to find location - * -2 track recording service is not running? - * -3 remote exception when contacting track recording service - * -4 inserting marker into provider failed - */ - public long insertWaypointMarker() { - Location location = getCurrentLocation(); - if (location == null) { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - return -1; - } - if (trackRecordingService != null) { - try { - Waypoint wpt = new Waypoint(); - wpt.setName(getString(R.string.waypoint)); - wpt.setType(Waypoint.TYPE_WAYPOINT); - wpt.setTrackId(recordingTrackId); - wpt.setIcon(WAYPOINT_ICON_URL); - wpt.setLocation(location); - long waypointId = trackRecordingService.insertWaypointMarker(wpt); - if (waypointId >= 0) { - Toast.makeText(this, R.string.status_waypoint_inserted, - Toast.LENGTH_LONG).show(); - return waypointId; - } else { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker?"); - return -4; - } - } catch (RemoteException e) { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker.", e); - } - return -3; - } - return -2; - } - - /** - * Inserts a statistics marker. - * - * @return the id of the inserted statistics marker, or - * -1 unable to find location - * -2 track recording service is not running? - * -3 remote exception when contacting track recording service - * -4 inserting marker into provider failed - */ - public long insertStatisticsMarker() { - Location location = getLastLocation(); - if (location == null) { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - return -1; - } - if (trackRecordingService != null) { - try { - long waypointId = - trackRecordingService.insertStatisticsMarker(location); - if (waypointId >= 0) { - Toast.makeText(this, R.string.status_statistics_inserted, - Toast.LENGTH_LONG).show(); - return waypointId; - } else { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?"); - return -4; - } - } catch (RemoteException e) { - Toast.makeText(this, R.string.error_unable_to_insert_marker, - Toast.LENGTH_LONG).show(); - Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?", e); - } - return -3; - } - return -2; - } - - /** - * Initializes the authentication manager which obtains an authentication - * token, prompting the user for a login and password if needed. - */ - private void authenticate(final Intent results, final int requestCode, - final String service) { - auth = authMap.get(service); - if (auth == null) { - Log.i(MyTracksConstants.TAG, - "Creating a new authentication for service: " + service); - auth = AuthManagerFactory.getAuthManager(this, - MyTracksConstants.GET_LOGIN, - null, - true, - service); - authMap.put(service, auth); - } - Log.d(MyTracksConstants.TAG, "Loggin in to " + service + "..."); - if (AuthManagerFactory.useModernAuthManager()) { - runOnUiThread(new Runnable() { - @Override - public void run() { - accountChooser.chooseAccount(MyTracks.this, - new AccountChooser.AccountHandler() { - @Override - public void handleAccountSelected(Account account) { - if (account == null) { - dismissDialogSafely(DIALOG_PROGRESS); - return; - } - doLogin(results, requestCode, service, account); - } - }); - } - }); - } else { - doLogin(results, requestCode, service, null); - } - } - - private void doLogin(final Intent results, final int requestCode, - final String service, final Account account) { - auth.doLogin(new Runnable() { - public void run() { - Log.d(MyTracksConstants.TAG, "Loggin success for " + service + "!"); - onActivityResult(requestCode, RESULT_OK, results); - } - }, account); - } - - /** - * Starts the track recording service (if not already running) and binds to - * it. Starts recording a new track. - */ - private void startRecording() { - if (trackRecordingService == null) { - startNewTrackRequested = true; - Intent startIntent = new Intent(this, TrackRecordingService.class); - startService(startIntent); - tryBindTrackRecordingService(); - } else { - try { - recordingTrackId = trackRecordingService.startNewTrack(); - Toast.makeText(this, getString(R.string.status_now_recording), - Toast.LENGTH_SHORT).show(); - setSelectedAndRecordingTrack(recordingTrackId, recordingTrackId); - } catch (RemoteException e) { - Toast.makeText(this, - getString(R.string.error_unable_to_start_recording), - Toast.LENGTH_SHORT).show(); - Log.e(MyTracksConstants.TAG, - "Failed to start track recording service", e); - } - } - } - - /** - * Stops the track recording service and unbinds from it. Will display a toast - * "Stopped recording" and pop up the Track Details activity. - */ - private void stopRecording() { - if (trackRecordingService != null) { - try { - trackRecordingService.endCurrentTrack(); - } catch (RemoteException e) { - Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e); - } - setRecordingTrack(-1); - Intent intent = new Intent(MyTracks.this, MyTracksDetails.class); - intent.putExtra("trackid", recordingTrackId); - intent.putExtra("hasCancelButton", false); - recordingTrackId = -1; - startActivity(intent); - } - tryUnbindTrackRecordingService(); - try { - stopService(new Intent(MyTracks.this, TrackRecordingService.class)); - } catch (SecurityException e) { - Log.e(MyTracksConstants.TAG, - "Encountered a security exception when trying to stop service.", e); - } - trackRecordingService = null; - } - - /** - * Initiates the process to send tracks to google. - * This is called once the user has selected sending options via the - * SendToGoogleDialog. - */ - public void sendToGoogle() { - if (sendToGoogleDialog == null) { - return; - } - setProgressValue(0); - setProgressMessage(""); - showDialogSafely(DIALOG_PROGRESS); - if (sendToGoogleDialog.getSendToMyMaps()) { - if (!sendToGoogleDialog.getCreateNewMap()) { - Intent listIntent = new Intent(this, MyMapsList.class); - startActivityForResult(listIntent, MyTracksConstants.GET_MAP); - } else { - setProgressValue(0); - setProgressMessage(getString( - R.string.progress_message_authenticating_mymaps)); - authenticate(new Intent(), MyTracksConstants.SEND_TO_GOOGLE, - MyMapsConstants.MAPSHOP_SERVICE); - } - } else { - onActivityResult(MyTracksConstants.AUTHENTICATE_TO_DOCS, RESULT_OK, - new Intent()); - } - } - - /** - * Writes the selected track id to the shared preferences. - * Executed on the UI thread. - * - * @param trackId the id of the track - */ - private void setSelectedTrack(final long trackId) { - runOnUiThread(new Runnable() { - public void run() { - SharedPreferences prefs = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - SharedPreferences.Editor editor = prefs.edit(); - editor.putLong(MyTracksSettings.SELECTED_TRACK, trackId); - editor.commit(); - } - }); - } - - /** - * Writes the recording track id to the shared preferences. - * Executed on the UI thread. - * - * @param trackId the id of the track - */ - private void setRecordingTrack(final long trackId) { - runOnUiThread(new Runnable() { - public void run() { - SharedPreferences prefs = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - SharedPreferences.Editor editor = prefs.edit(); - editor.putLong(MyTracksSettings.RECORDING_TRACK, trackId); - editor.commit(); - } - }); - } - - /** - * Writes the selected and the recording track id to the shared preferences. - * Executed on UI thread. - */ - private void setSelectedAndRecordingTrack(final long theSelectedTrackId, - final long theRecordingTrackId) { - runOnUiThread(new Runnable() { - public void run() { - SharedPreferences prefs = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - if (prefs != null) { - SharedPreferences.Editor editor = prefs.edit(); - editor.putLong(MyTracksSettings.SELECTED_TRACK, theSelectedTrackId); - editor.putLong(MyTracksSettings.RECORDING_TRACK, theRecordingTrackId); - editor.commit(); - } - } - }); - } - - /** - * Binds to track recording service if it is running. - */ - private void tryBindTrackRecordingService() { - Log.d(MyTracksConstants.TAG, - "MyTracks: Trying to bind to track recording service..."); - bindService(new Intent(this, TrackRecordingService.class), - serviceConnection, 0); - } - - /** - * Tries to unbind the track recording service. Catches exception silently in - * case service is not registered anymore. - */ - private void tryUnbindTrackRecordingService() { - Log.d(MyTracksConstants.TAG, - "MyTracks: Trying to unbind from track recording service..."); - try { - unbindService(serviceConnection); - } catch (IllegalArgumentException e) { - Log.d(MyTracksConstants.TAG, - "MyTracks: Tried unbinding, but service was not registered.", e); - } - } - - /** - * Shows a dialog with the given message. - * Does it on the UI thread. - * - * @param success if true, displays an info icon/title, otherwise an error - * icon/title - * @param message resource string id - */ - public void showMessageDialog(final int message, final boolean success) { - runOnUiThread(new Runnable() { - public void run() { - AlertDialog dialog = null; - AlertDialog.Builder builder = new AlertDialog.Builder(MyTracks.this); - builder.setMessage(MyTracks.this.getString(message)); - builder.setNegativeButton(MyTracks.this.getString(R.string.ok), null); - builder.setIcon(success ? android.R.drawable.ic_dialog_info : - android.R.drawable.ic_dialog_alert); - builder.setTitle(success ? R.string.success : R.string.error); - dialog = builder.create(); - dialog.show(); - } - }); - } - - /** - * Saves the track with the given id to the SD card. - * - * @param trackId The id of the track to be sent - */ - public void saveTrack(long trackId, TrackFileFormat format) { - showDialogSafely(DIALOG_WRITE_PROGRESS); - final TrackWriter writer = - TrackWriterFactory.newWriter(this, providerUtils, trackId, format); - writer.setOnCompletion(new Runnable() { - public void run() { - dismissDialogSafely(DIALOG_WRITE_PROGRESS); - showMessageDialog(writer.getErrorMessage(), writer.wasSuccess()); - } - }); - writer.writeTrackAsync(); - } - - /** - * Sends the requested track as an email attachment. - * This will leave the gpx file on the SD card for at least one hour. - * Temporary gpx files will be deleted in onStop. - * - * @param trackId The id of the track to be sent - */ - public void sendTrack(long trackId, final TrackFileFormat format) { - showDialogSafely(DIALOG_WRITE_PROGRESS); - final TrackWriter writer = - TrackWriterFactory.newWriter(this, providerUtils, trackId, format); - String sep = System.getProperty("file.separator"); - String extension = format.getExtension(); - File dir = new File(Environment.getExternalStorageDirectory() - + sep + extension + sep + "tmp"); - writer.setDirectory(dir); - writer.setOnCompletion(new Runnable() { - public void run() { - dismissDialogSafely(DIALOG_WRITE_PROGRESS); - if (!writer.wasSuccess()) { - showMessageDialog(writer.getErrorMessage(), writer.wasSuccess()); - } else { - Intent shareIntent = new Intent(Intent.ACTION_SEND); - shareIntent.putExtra(Intent.EXTRA_SUBJECT, - getResources().getText(R.string.send_track_subject).toString()); - shareIntent.putExtra(Intent.EXTRA_TEXT, - getResources().getText(R.string.send_track_body_format) - .toString()); - shareIntent.setType(format.getMimeType()); - Uri u = Uri.fromFile(new File(writer.getAbsolutePath())); - shareIntent.putExtra(Intent.EXTRA_STREAM, u); - startActivity(Intent.createChooser(shareIntent, - getResources().getText(R.string.share_track).toString())); - } - } - }); - writer.writeTrackAsync(); - } - - /** - * Notifies that uploading to maps is finished. - */ - private void handleMapsFinish() { - if (shareRequested && sendToMyMapsSuccess) { - // Just share - Toast.makeText(this, getMapsResultMessage(), Toast.LENGTH_LONG).show(); - shareLinkToMyMap(sendToMyMapsMapId); - } else { - showDialogSafely(DIALOG_SEND_TO_GOOGLE_RESULT); - } - } - - private String getMapsResultMessage() { - StringBuilder message = new StringBuilder(); - if (sendToGoogleDialog.getSendToMyMaps()) { - message.append(sendToMyMapsMessage); - } - if (sendToGoogleDialog.getSendToDocs()) { - if (message.length() > 0) { - message.append(' '); - } - message.append(sendToDocsMessage); - } - if (sendToMyMapsSuccess && sendToDocsSuccess) { - message.append(' '); - message.append(getString(R.string.status_mymap_info)); - } - return message.toString(); - } - - public AccountChooser getAccountChooser() { - return accountChooser; - } -} +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks; + +import com.google.android.accounts.Account; +import com.google.android.apps.mymaps.MyMapsConstants; +import com.google.android.apps.mymaps.MyMapsList; +import com.google.android.apps.mymaps.VersionChecker; +import com.google.android.apps.mytracks.content.MyTracksProviderUtils; +import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.AuthManager; +import com.google.android.apps.mytracks.io.AuthManagerFactory; +import com.google.android.apps.mytracks.io.GpxImporter; +import com.google.android.apps.mytracks.io.SendToDocs; +import com.google.android.apps.mytracks.io.SendToMyMaps; +import com.google.android.apps.mytracks.io.TrackWriter; +import com.google.android.apps.mytracks.io.TrackWriterFactory; +import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; +import com.google.android.apps.mytracks.services.ITrackRecordingService; +import com.google.android.apps.mytracks.services.TrackRecordingService; +import com.google.android.maps.mytracks.R; + +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.ProgressDialog; +import android.app.TabActivity; +import android.content.ComponentName; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.ServiceConnection; +import android.content.SharedPreferences; +import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.database.Cursor; +import android.location.Location; +import android.location.LocationManager; +import android.net.Uri; +import android.os.Bundle; +import android.os.Environment; +import android.os.IBinder; +import android.os.RemoteException; +import android.speech.tts.TextToSpeech; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.Window; +import android.view.View.OnTouchListener; +import android.view.ViewGroup.LayoutParams; +import android.view.WindowManager.BadTokenException; +import android.widget.RelativeLayout; +import android.widget.TabHost; +import android.widget.Toast; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Random; + +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.SAXException; + +/** + * The super activity that embeds our sub activities. + * + * @author Leif Hendrik Wilden + */ +public class MyTracks extends TabActivity implements OnTouchListener, + OnSharedPreferenceChangeListener, ProgressIndicator { + + private static final String WAYPOINT_ICON_URL = + "http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png"; + + /** + * Singleton instance + */ + private static MyTracks instance = null; + private ChartActivity chartActivity = null; + + public ChartActivity getChartActivity() { + return chartActivity; + } + + public void setChartActivity(ChartActivity chartActivity) { + this.chartActivity = chartActivity; + } + + /* + * Authentication: + */ + + private AuthManager auth; + private final HashMap authMap = + new HashMap(); + private AccountChooser accountChooser = new AccountChooser(); + + /* + * Dialogs: + */ + + public static final int DIALOG_PROGRESS = 1; + public static final int DIALOG_IMPORT_PROGRESS = 2; + public static final int DIALOG_WRITE_PROGRESS = 3; + public static final int DIALOG_SEND_TO_GOOGLE = 4; + public static final int DIALOG_SEND_TO_GOOGLE_RESULT = 5; + public static final int DIALOG_CHART_SETTINGS = 6; + + private ProgressDialog progressDialog; + private ProgressDialog importProgressDialog; + private ProgressDialog writeProgressDialog; + private SendToGoogleDialog sendToGoogleDialog; + private AlertDialog sendToGoogleResultDialog; + private ChartSettingsDialog chartSettingsDialog; + + /* + * Menu manager. + */ + private MenuManager menuManager; + + /* + * Information on upload success to MyMaps/Docs. + * Used by SendToGoogleResultDialog. + */ + + public boolean sendToMyMapsSuccess = false; + public boolean sendToDocsSuccess = false; + public String sendToMyMapsMapId = null; + public String sendToMyMapsMessage = ""; + public String sendToDocsMessage = ""; + + /** + * True if a new track should be created after the track recording service + * binds. + */ + private boolean startNewTrackRequested = false; + + private ITrackRecordingService trackRecordingService; + + /** + * The id of the currently recording track. + */ + private long recordingTrackId = -1; + + /** + * The id of the currently selected track. + */ + private long selectedTrackId = -1; + + /** + * Does the user want to share the current track. + */ + private boolean shareRequested = false; + + /** + * Utilities to deal with the database. + */ + private MyTracksProviderUtils providerUtils; + + /** + * The connection to the track recording service. + */ + private final ServiceConnection serviceConnection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName className, IBinder service) { + Log.d(MyTracksConstants.TAG, "MyTracks: Service now connected."); + trackRecordingService = ITrackRecordingService.Stub.asInterface(service); + if (startNewTrackRequested) { + startNewTrackRequested = false; + try { + recordingTrackId = trackRecordingService.startNewTrack(); + Toast.makeText(MyTracks.this, + R.string.status_now_recording, Toast.LENGTH_SHORT).show(); + setSelectedAndRecordingTrack(recordingTrackId, recordingTrackId); + } catch (RemoteException e) { + Toast.makeText(MyTracks.this, + R.string.error_unable_to_start_recording, Toast.LENGTH_SHORT) + .show(); + Log.w(MyTracksConstants.TAG, "Unable to start recording.", e); + } + } + } + + @Override + public void onServiceDisconnected(ComponentName className) { + Log.d(MyTracksConstants.TAG, "MyTracks: Service now disconnected."); + trackRecordingService = null; + } + }; + + /* + * Tabs/View navigation: + */ + + private static final int NUM_TABS = 3; + private int currentTab = 0; + + private NavControls navControls; + + private final int icons[] = + { R.drawable.arrow_grey, R.drawable.menu_by_time, + R.drawable.menu_elevation }; + + private final Runnable nextActivity = new Runnable() { + public void run() { + currentTab = (currentTab + 1) % NUM_TABS; + navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); + navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); + getTabHost().setCurrentTab(currentTab); + navControls.show(); + } + }; + + private final Runnable prevActivity = new Runnable() { + public void run() { + currentTab--; + if (currentTab < 0) { + currentTab = NUM_TABS - 1; + } + navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); + navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); + getTabHost().setCurrentTab(currentTab); + navControls.show(); + } + }; + + private final Random random = new Random(); + + public static MyTracks getInstance() { + return instance; + } + + /** + * @return true if the activity is bound to the track recording service and + * the service is recording a track. + */ + public boolean isRecording() { + if (trackRecordingService == null) { + return false; + } + try { + return trackRecordingService.isRecording(); + } catch (RemoteException e) { + Log.e(MyTracksConstants.TAG, "MyTracks: Remote exception.", e); + return false; + } + } + + /* + * Application lifetime events: + * ============================ + */ + + @Override + protected void onCreate(Bundle savedInstanceState) { + Log.d(MyTracksConstants.TAG, "MyTracks.onCreate"); + super.onCreate(savedInstanceState); + instance = this; + providerUtils = MyTracksProviderUtils.Factory.get(this); + menuManager = new MenuManager(this); + + // The volume we want to control is the Text-To-Speech volume + setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); + + // We don't need a window title bar: + requestWindowFeature(Window.FEATURE_NO_TITLE); + + final Resources res = getResources(); + final TabHost tabHost = getTabHost(); + tabHost.addTab(tabHost.newTabSpec("tab1") + .setIndicator("Map", res.getDrawable( + android.R.drawable.ic_menu_mapmode)) + .setContent(new Intent(this, MyTracksMap.class))); + tabHost.addTab(tabHost.newTabSpec("tab2") + .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats)) + .setContent(new Intent(this, StatsActivity.class))); + tabHost.addTab(tabHost.newTabSpec("tab3") + .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation)) + .setContent(new Intent(this, ChartActivity.class))); + + // Hide the tab widget itself. We'll use overlayed prev/next buttons to + // switch between the tabs: + tabHost.getTabWidget().setVisibility(View.GONE); + + RelativeLayout layout = new RelativeLayout(this); + LayoutParams params = + new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + layout.setLayoutParams(params); + navControls = new NavControls(this, layout, prevActivity, nextActivity); + navControls.setLeftIcon(icons[NUM_TABS - 1]); + navControls.setRightIcon(icons[1]); + navControls.show(); + tabHost.addView(layout); + layout.setOnTouchListener(this); + + SharedPreferences prefs = + getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + if (prefs != null) { + selectedTrackId = + prefs.getLong(getString(R.string.selected_track_key), -1); + recordingTrackId = + prefs.getLong(getString(R.string.recording_track_key), -1); + prefs.registerOnSharedPreferenceChangeListener(this); + } + + // This will show the eula until the user accepts or quits the app. + Eula.showEula(this); + + // Check if new version is available and prompt user with update options: + new VersionChecker(this); + + // Check if we got invoked via the VIEW intent: + Intent intent = getIntent(); + if (intent != null && intent.getAction() != null) { + if (intent.getAction().equals(Intent.ACTION_VIEW)) { + if (intent.getScheme() != null && intent.getScheme().equals("file")) { + Log.w(MyTracksConstants.TAG, + "Received a VIEW intent with file scheme. Importing."); + importGpxFile(intent.getData().getPath()); + } else { + Log.w(MyTracksConstants.TAG, + "Received a VIEW intent with unsupported scheme " + + intent.getScheme()); + } + } else { + Log.w(MyTracksConstants.TAG, + "Received an intent with unsupported action " + intent.getAction()); + } + } else { + Log.d(MyTracksConstants.TAG, "Received an intent with no action."); + } + } + + @Override + protected void onPause() { + // Called when activity is going into the background, but has not (yet) been + // killed. Shouldn't block longer than approx. 2 seconds. + Log.d(MyTracksConstants.TAG, "MyTracks.onPause"); + super.onPause(); + tryUnbindTrackRecordingService(); + } + + @Override + protected void onResume() { + // Called when the current activity is being displayed or re-displayed + // to the user. + Log.d(MyTracksConstants.TAG, "MyTracks.onResume"); + super.onResume(); + tryBindTrackRecordingService(); + navControls.setLeftIcon(icons[(currentTab + NUM_TABS - 1) % NUM_TABS]); + navControls.setRightIcon(icons[(currentTab + NUM_TABS + 1) % NUM_TABS]); + } + + @Override + protected void onStop() { + super.onStop(); + // Clean up any temporary GPX and KML files. + cleanTmpDirectory("gpx"); + cleanTmpDirectory("kml"); + } + + private void cleanTmpDirectory(String name) { + if (!Environment.getExternalStorageState().equals( + Environment.MEDIA_MOUNTED)) { + return; // Can't do anything now. + } + String sep = System.getProperty("file.separator"); + File dir = new File( + Environment.getExternalStorageDirectory() + sep + name + sep + "tmp"); + if (!dir.exists()) { + return; + } + File[] list = dir.listFiles(); + long now = System.currentTimeMillis(); + long oldest = now - 1000 * 3600; + for (File f : list) { + if (f.lastModified() < oldest) { + f.delete(); + } + } + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + } + + /* + * Menu events: + * ============ + */ + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + return menuManager.onCreateOptionsMenu(menu); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + menuManager.onPrepareOptionsMenu(menu, providerUtils.getLastTrack() != null, + isRecording(), selectedTrackId >= 0); + return super.onPrepareOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + return (menuManager.onOptionsItemSelected(item) + ? true + : super.onOptionsItemSelected(item)); + } + + /* + * Dialog events: + * ============== + */ + + @Override + protected Dialog onCreateDialog(int id) { + switch (id) { + case DIALOG_PROGRESS: + progressDialog = new ProgressDialog(this); + progressDialog.setIcon(android.R.drawable.ic_dialog_info); + progressDialog.setTitle(getString(R.string.progress_title)); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setMessage(""); + progressDialog.setMax(100); + progressDialog.setProgress(10); + return progressDialog; + case DIALOG_IMPORT_PROGRESS: + importProgressDialog = new ProgressDialog(this); + importProgressDialog.setIcon(android.R.drawable.ic_dialog_info); + importProgressDialog.setTitle(getString(R.string.progress_title)); + importProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + importProgressDialog.setMessage( + getString(R.string.import_progress_message)); + return importProgressDialog; + case DIALOG_WRITE_PROGRESS: + writeProgressDialog = new ProgressDialog(this); + writeProgressDialog.setIcon(android.R.drawable.ic_dialog_info); + writeProgressDialog.setTitle(getString(R.string.progress_title)); + writeProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + writeProgressDialog.setMessage( + getString(R.string.write_progress_message)); + return writeProgressDialog; + case DIALOG_SEND_TO_GOOGLE: + sendToGoogleDialog = new SendToGoogleDialog(this); + return sendToGoogleDialog; + case DIALOG_SEND_TO_GOOGLE_RESULT: + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setIcon(android.R.drawable.ic_dialog_info); + builder.setTitle("Title"); + builder.setMessage("Message"); + builder.setPositiveButton(getString(R.string.ok), null); + builder.setNeutralButton(getString(R.string.share_map), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + shareLinkToMyMap(sendToMyMapsMapId); + dialog.dismiss(); + } + }); + sendToGoogleResultDialog = builder.create(); + return sendToGoogleResultDialog; + case DIALOG_CHART_SETTINGS: + chartSettingsDialog = new ChartSettingsDialog(this); + return chartSettingsDialog; + } + return null; + } + + @Override + protected void onPrepareDialog(int id, Dialog dialog) { + super.onPrepareDialog(id, dialog); + Log.d(MyTracksConstants.TAG, "MyTracks.onPrepareDialog: " + id); + switch (id) { + case DIALOG_SEND_TO_GOOGLE: + resetSendToGoogleStatus(); + break; + case DIALOG_SEND_TO_GOOGLE_RESULT: + boolean success = sendToMyMapsSuccess && sendToDocsSuccess; + sendToGoogleResultDialog.setTitle( + success ? R.string.success : R.string.error); + sendToGoogleResultDialog.setIcon(success + ? android.R.drawable.ic_dialog_info + : android.R.drawable.ic_dialog_alert); + sendToGoogleResultDialog.setMessage(getMapsResultMessage()); + + boolean canShare = sendToMyMapsMapId != null; + View share = + sendToGoogleResultDialog.findViewById(android.R.id.button3); + if (share != null) { + share.setVisibility(canShare ? View.VISIBLE : View.GONE); + } + break; + case DIALOG_CHART_SETTINGS: + Log.d(MyTracksConstants.TAG, "MyTracks.onPrepare chart dialog"); + chartSettingsDialog.setup(chartActivity); + break; + } + } + + /* + * Key events: + * =========== + */ + + @Override + public boolean onTrackballEvent(MotionEvent event) { + if (isRecording()) { + if (event.getAction() == MotionEvent.ACTION_DOWN) { + insertStatisticsMarker(); + return true; + } + } + return super.onTrackballEvent(event); + } + + @Override + public void onActivityResult(int requestCode, int resultCode, + final Intent results) { + TrackFileFormat exportFormat = null; + switch (requestCode) { + case MyTracksConstants.GET_MAP: { + if (resultCode == RESULT_OK) { + results.putExtra("trackid", selectedTrackId); + if (results.hasExtra("mapid")) { + sendToMyMapsMapId = results.getStringExtra("mapid"); + } + setProgressMessage(getString( + R.string.progress_message_authenticating_mymaps)); + authenticate(results, MyTracksConstants.SEND_TO_GOOGLE, + MyMapsConstants.MAPSHOP_SERVICE); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.GET_LOGIN: { + if (resultCode == RESULT_OK && auth != null) { + if (!auth.authResult(resultCode, results)) { + dismissDialogSafely(DIALOG_PROGRESS); + } + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.SHOW_TRACK: { + if (results != null) { + final long trackId = results.getLongExtra("trackid", -1); + if (trackId >= 0) { + setSelectedTrack(trackId); + // The track list passed the requested action as result code. Hand + // it off to the onAcitivtyResult for further processing: + if (resultCode != MyTracksConstants.SHOW_TRACK) { + onActivityResult(resultCode, Activity.RESULT_OK, results); + } + } + } + break; + } + case MyTracksConstants.SHOW_WAYPOINT: { + if (results != null) { + final long waypointId = results.getLongExtra("waypointid", -1); + if (waypointId >= 0) { + MyTracksMap map = + (MyTracksMap) getLocalActivityManager().getActivity("tab1"); + if (map != null) { + getTabHost().setCurrentTab(0); + map.showWaypoint(waypointId); + } + } + } + break; + } + case MyTracksConstants.DELETE_TRACK: { + if (results != null && resultCode == RESULT_OK) { + final long trackId = results.getLongExtra("trackid", selectedTrackId); + deleteTrack(trackId); + } + break; + } + case MyTracksConstants.EDIT_DETAILS: { + if (results != null && resultCode == RESULT_OK) { + final long trackId = results.getLongExtra("trackid", selectedTrackId); + Intent intent = new Intent(this, MyTracksDetails.class); + intent.putExtra("trackid", trackId); + startActivity(intent); + } + break; + } + case MyTracksConstants.AUTHENTICATE_TO_DOCS: { + if (resultCode == RESULT_OK) { + setProgressValue(0); + setProgressMessage( + getString(R.string.progress_message_authenticating_docs)); + authenticate(results, + MyTracksConstants.AUTHENTICATE_TO_TRIX, "writely"); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.AUTHENTICATE_TO_TRIX: { + if (resultCode == RESULT_OK) { + setProgressValue(30); + setProgressMessage( + getString(R.string.progress_message_authenticating_docs)); + authenticate(results, MyTracksConstants.SEND_TO_DOCS, "wise"); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.SEND_TO_DOCS: { + if (results != null && resultCode == RESULT_OK) { + Log.d(MyTracksConstants.TAG, "Sending to Docs...."); + setProgressValue(50); + setProgressMessage(getString(R.string.progress_message_sending_docs)); + final long trackId = results.getLongExtra("trackid", selectedTrackId); + final SendToDocs sender = new SendToDocs(this, authMap.get("wise"), + authMap.get("writely"), trackId); + Runnable onCompletion = new Runnable() { + public void run() { + setProgressValue(100); + dismissDialogSafely(DIALOG_PROGRESS); + runOnUiThread(new Runnable() { + public void run() { + sendToDocsMessage = sender.getStatusMessage(); + sendToDocsSuccess = sender.wasSuccess(); + handleMapsFinish(); + } + }); + } + }; + sender.setOnCompletion(onCompletion); + sender.run(); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.SEND_TO_GOOGLE_DIALOG: { + shareRequested = false; + showDialogSafely(DIALOG_SEND_TO_GOOGLE); + break; + } + case MyTracksConstants.SEND_TO_GOOGLE: { + if (results != null && resultCode == RESULT_OK) { + final String mapid; + final long trackId; + if (results.hasExtra("mapid")) { + mapid = results.getStringExtra("mapid"); + } else { + mapid = "new"; + } + if (results.hasExtra("trackid")) { + trackId = results.getLongExtra("trackid", -1); + } else { + trackId = selectedTrackId; + } + final SendToMyMaps sender = new SendToMyMaps(this, mapid, auth, + trackId, this/*progressIndicator*/); + Runnable onCompletion = new Runnable() { + public void run() { + sendToMyMapsMessage = sender.getStatusMessage(); + sendToMyMapsSuccess = sender.wasSuccess(); + if (sendToMyMapsSuccess) { + sendToMyMapsMapId = sender.getMapId(); + // Update the map id for this track: + try { + Track track = providerUtils.getTrack(trackId); + track.setMapId(sender.getMapId()); + providerUtils.updateTrack(track); + } catch (RuntimeException e) { + // If that fails whatever reasons we'll just log an error, but + // continue. + Log.w(MyTracksConstants.TAG, "Updating map id failed.", e); + } + } + if (sendToGoogleDialog.getSendToDocs()) { + onActivityResult(MyTracksConstants.AUTHENTICATE_TO_DOCS, + RESULT_OK, new Intent()); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + runOnUiThread(new Runnable() { + public void run() { + handleMapsFinish(); + } + }); + } + } + }; + sender.setOnCompletion(onCompletion); + sender.run(); + } else { + dismissDialogSafely(DIALOG_PROGRESS); + } + break; + } + case MyTracksConstants.SAVE_GPX_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.GPX; } + //$FALL-THROUGH$ + case MyTracksConstants.SAVE_KML_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.KML; } + //$FALL-THROUGH$ + case MyTracksConstants.SAVE_CSV_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.CSV; } + //$FALL-THROUGH$ + case MyTracksConstants.SAVE_TCX_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.TCX; } + + if (results != null && resultCode == Activity.RESULT_OK) { + final long trackId = results.getLongExtra("trackid", selectedTrackId); + if (trackId >= 0) { + saveTrack(trackId, exportFormat); + } + } + break; + case MyTracksConstants.SHARE_LINK: { + Track selectedTrack = providerUtils.getTrack(selectedTrackId); + if (selectedTrack != null) { + if (selectedTrack.getMapId().length() > 0) { + shareLinkToMyMap(selectedTrack.getMapId()); + } else { + shareRequested = true; + showDialogSafely(DIALOG_SEND_TO_GOOGLE); + } + } + break; + } + case MyTracksConstants.SHARE_GPX_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.GPX; } + //$FALL-THROUGH$ + case MyTracksConstants.SHARE_KML_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.KML; } + //$FALL-THROUGH$ + case MyTracksConstants.SHARE_CSV_FILE: + if (exportFormat == null) { exportFormat = TrackFileFormat.CSV; } + //$FALL-THROUGH$ + case MyTracksConstants.SHARE_TCX_FILE: { + if (exportFormat == null) { exportFormat = TrackFileFormat.TCX; } + + if (results != null && resultCode == Activity.RESULT_OK) { + final long trackId = results.getLongExtra("trackid", selectedTrackId); + if (trackId >= 0) { + sendTrack(trackId, exportFormat); + } + } + break; + } + case MyTracksConstants.CLEAR_MAP: { + setSelectedTrack(-1); + break; + } + case MyTracksConstants.WELCOME: { + CheckUnits.check(this); + break; + } + + default: { + Log.w(MyTracksConstants.TAG, + "Warning unhandled request code: " + requestCode); + } + } + } + + @Override + public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_DOWN) { + navControls.show(); + } + return false; + } + + @Override + public void onSharedPreferenceChanged( + SharedPreferences sharedPreferences, String key) { + // The service itself cannot listen to changes (not supported by Android for + // services that run in a separate process). So we'll notify it manually: + if (key != null && trackRecordingService != null) { + try { + trackRecordingService.sharedPreferenceChanged(key); + } catch (RemoteException e) { + Log.w(MyTracksConstants.TAG, + "MyTracks: Cannot notify track recording service of changes " + + "to shared preferences: ", e); + } + } + if (key != null && key.equals(getString(R.string.selected_track_key))) { + selectedTrackId = + sharedPreferences.getLong(getString(R.string.selected_track_key), -1); + } + } + + /** + * Simulates the recording of a random location. + * This is for debugging and testing only. Useful if there is no GPS signal + * available. + */ + public void recordRandomLocation() { + if (trackRecordingService != null) { + Location loc = new Location("gps"); + double latitude = 37.5 + random.nextDouble() / 1000; + double longitude = -120.0 + random.nextDouble() / 1000; + loc.setLatitude(latitude); + loc.setLongitude(longitude); + loc.setAltitude(random.nextDouble() * 100); + loc.setTime(System.currentTimeMillis()); + loc.setSpeed(random.nextFloat()); + MyTracksMap map = + (MyTracksMap) getLocalActivityManager().getActivity("tab1"); + if (map != null) { + map.onLocationChanged(loc); + } + StatsActivity stats = + (StatsActivity) getLocalActivityManager().getActivity("tab2"); + if (stats != null) { + stats.onLocationChanged(loc); + } + try { + trackRecordingService.recordLocation(loc); + } catch (RemoteException e) { + Log.e(MyTracksConstants.TAG, "MyTracks", e); + } + } + } + + /** + * Resets status information for sending to MyMaps/Docs. + */ + private void resetSendToGoogleStatus() { + sendToMyMapsMessage = ""; + sendToMyMapsSuccess = true; + sendToDocsMessage = ""; + sendToDocsSuccess = true; + sendToMyMapsMapId = null; + } + + /** + * Reads data from a provider, for example gmail attachment preview. Currently + * fails (due to permissions?!). This is currently dead code not invoked from + * anywhere. + */ + protected String getContent(Uri uri) { + Cursor cursor = null; + try { + cursor = managedQuery(uri, + null /*projection*/, null /*selection*/, null /*selectionArgs*/, + null /*sortOrder*/); + if (cursor == null) { + Toast.makeText(this, + R.string.error_unable_to_read_file, Toast.LENGTH_LONG).show(); + return null; + } + if (cursor.moveToFirst()) { + String cols[] = cursor.getColumnNames(); + String s = "Cols:"; + for (String c : cols) { s += c + ","; } + Toast.makeText(this, s, Toast.LENGTH_LONG).show(); + return ""; + } else { + Toast.makeText(this, R.string.error_generic, Toast.LENGTH_LONG).show(); + return null; + } + } finally { + if (cursor != null) { + stopManagingCursor(cursor); + cursor.close(); + } + } + } + + private void importGpxFile(final String fileName) { + showDialogSafely(DIALOG_IMPORT_PROGRESS); + Thread t = new Thread() { + @Override + public void run() { + int message = R.string.success; + + long[] trackIdsImported = null; + + try { + try { + InputStream is = new FileInputStream(fileName); + trackIdsImported = GpxImporter.importGPXFile(is, providerUtils); + } catch (SAXException e) { + Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); + message = R.string.error_generic; + } catch (ParserConfigurationException e) { + Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); + message = R.string.error_generic; + } catch (IOException e) { + Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); + message = R.string.error_unable_to_read_file; + } catch (NullPointerException e) { + Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); + message = R.string.error_invalid_gpx_format; + } catch (OutOfMemoryError e) { + Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e); + message = R.string.error_out_of_memory; + } + if (trackIdsImported != null && trackIdsImported.length > 0) { + // select last track from import file + setSelectedTrack(trackIdsImported[trackIdsImported.length - 1]); + } else { + MyTracks.this.showMessageDialog(message, false/* success */); + } + } finally { + runOnUiThread(new Runnable() { + public void run() { + dismissDialog(DIALOG_IMPORT_PROGRESS); + } + }); + } + } + }; + t.start(); + } + + /** + * Just like showDialog, but will catch a BadTokenException that sometimes + * (very rarely) gets thrown. This might happen if the user hits the "back" + * button immediately after sending tracks to google. + * + * @param id the dialog id + */ + public void showDialogSafely(final int id) { + runOnUiThread(new Runnable() { + public void run() { + try { + showDialog(id); + } catch (BadTokenException e) { + Log.w(MyTracksConstants.TAG, + "Could not display dialog with id " + id, e); + } catch (IllegalStateException e) { + Log.w(MyTracksConstants.TAG, + "Could not display dialog with id " + id, e); + } + } + }); + } + + /** + * Dismisses the progress dialog if it is showing. Executed on the UI thread. + */ + public void dismissDialogSafely(final int id) { + runOnUiThread(new Runnable() { + public void run() { + try { + dismissDialog(id); + } catch (IllegalArgumentException e) { + // This will be thrown if this dialog was not shown before. + } + } + }); + } + + public void setProgressMessage(final String text) { + runOnUiThread(new Runnable() { + public void run() { + synchronized (this) { + if (progressDialog != null) { + progressDialog.setMessage(text); + } + } + } + }); + } + + public void setProgressValue(final int percent) { + runOnUiThread(new Runnable() { + public void run() { + synchronized (this) { + if (progressDialog != null) { + progressDialog.setProgress(percent); + } + } + } + }); + } + + /** + * Shares a link to a My Map via external app (email, gmail, ...) + * A chooser with apps that support text/plain will be shown to the user. + */ + private void shareLinkToMyMap(String mapId) { + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.setType("text/plain"); + shareIntent.putExtra(Intent.EXTRA_SUBJECT, + getResources().getText(R.string.share_map_subject).toString()); + + SharedPreferences prefs = + getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + boolean shareUrlOnly = true; + if (prefs != null) { + shareUrlOnly = + prefs.getBoolean(getString(R.string.share_url_only_key), false); + } + + String url = MyMapsConstants.MAPSHOP_BASE_URL + "?msa=0&msid=" + mapId; + 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).toString())); + } + + /** + * Deletes the track with the given id. + * Prompts the user if he want to really delete the track first. + * If the selected track is deleted, the selection will be removed. + */ + public void deleteTrack(final long trackId) { + AlertDialog dialog = null; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(getString(R.string.track_will_be_permanently_deleted)); + builder.setTitle(getString(R.string.are_you_sure_question)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setPositiveButton(getString(R.string.yes), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int i) { + dialog.dismiss(); + providerUtils.deleteTrack(trackId); + if (trackId == selectedTrackId) { + setSelectedTrack(-1); + } + }}); + builder.setNegativeButton(getString(R.string.no), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int i) { + dialog.dismiss(); + } + }); + dialog = builder.create(); + dialog.show(); + } + + public Location getCurrentLocation() { + // TODO: Let's look at more advanced algorithms to determine the best + // current location. + LocationManager locationManager = + (LocationManager) getSystemService(Context.LOCATION_SERVICE); + if (locationManager == null) { + return null; + } + final long maxAgeMilliSeconds = 1000 * 60 * 1; // 1 minute + final long maxAgeNetworkMilliSeconds = 1000 * 60 * 10; // 10 minutes + final long now = System.currentTimeMillis(); + Location loc = locationManager.getLastKnownLocation( + MyTracksConstants.GPS_PROVIDER); + if (loc == null || loc.getTime() < now - maxAgeMilliSeconds) { + // We don't have a recent GPS fix, just use cell towers if available + loc = locationManager.getLastKnownLocation( + LocationManager.NETWORK_PROVIDER); + if (loc == null || loc.getTime() < now - maxAgeNetworkMilliSeconds) { + // We don't have a recent cell tower location, let the user know: + Toast.makeText(this, getString(R.string.status_no_location), + Toast.LENGTH_LONG).show(); + return null; + } else { + // Let the user know we have only an approximate location: + Toast.makeText(this, getString(R.string.status_approximate_location), + Toast.LENGTH_LONG).show(); + } + } + return loc; + } + + public Location getLastLocation() { + if (providerUtils.getLastLocationId(recordingTrackId) < 0) { + return null; + } + LocationManager locationManager = + (LocationManager) getSystemService(Context.LOCATION_SERVICE); + return locationManager.getLastKnownLocation(MyTracksConstants.GPS_PROVIDER); + } + + /** + * Inserts a waypoint marker. + * + * @return the id of the inserted statistics marker, or + * -1 unable to find location + * -2 track recording service is not running? + * -3 remote exception when contacting track recording service + * -4 inserting marker into provider failed + */ + public long insertWaypointMarker() { + Location location = getCurrentLocation(); + if (location == null) { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + return -1; + } + if (trackRecordingService != null) { + try { + Waypoint wpt = new Waypoint(); + wpt.setName(getString(R.string.waypoint)); + wpt.setType(Waypoint.TYPE_WAYPOINT); + wpt.setTrackId(recordingTrackId); + wpt.setIcon(WAYPOINT_ICON_URL); + wpt.setLocation(location); + long waypointId = trackRecordingService.insertWaypointMarker(wpt); + if (waypointId >= 0) { + Toast.makeText(this, R.string.status_waypoint_inserted, + Toast.LENGTH_LONG).show(); + return waypointId; + } else { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker?"); + return -4; + } + } catch (RemoteException e) { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker.", e); + } + return -3; + } + return -2; + } + + /** + * Inserts a statistics marker. + * + * @return the id of the inserted statistics marker, or + * -1 unable to find location + * -2 track recording service is not running? + * -3 remote exception when contacting track recording service + * -4 inserting marker into provider failed + */ + public long insertStatisticsMarker() { + Location location = getLastLocation(); + if (location == null) { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + return -1; + } + if (trackRecordingService != null) { + try { + long waypointId = + trackRecordingService.insertStatisticsMarker(location); + if (waypointId >= 0) { + Toast.makeText(this, R.string.status_statistics_inserted, + Toast.LENGTH_LONG).show(); + return waypointId; + } else { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?"); + return -4; + } + } catch (RemoteException e) { + Toast.makeText(this, R.string.error_unable_to_insert_marker, + Toast.LENGTH_LONG).show(); + Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?", e); + } + return -3; + } + return -2; + } + + /** + * Initializes the authentication manager which obtains an authentication + * token, prompting the user for a login and password if needed. + */ + private void authenticate(final Intent results, final int requestCode, + final String service) { + auth = authMap.get(service); + if (auth == null) { + Log.i(MyTracksConstants.TAG, + "Creating a new authentication for service: " + service); + auth = AuthManagerFactory.getAuthManager(this, + MyTracksConstants.GET_LOGIN, + null, + true, + service); + authMap.put(service, auth); + } + Log.d(MyTracksConstants.TAG, "Loggin in to " + service + "..."); + if (AuthManagerFactory.useModernAuthManager()) { + runOnUiThread(new Runnable() { + @Override + public void run() { + accountChooser.chooseAccount(MyTracks.this, + new AccountChooser.AccountHandler() { + @Override + public void handleAccountSelected(Account account) { + if (account == null) { + dismissDialogSafely(DIALOG_PROGRESS); + return; + } + doLogin(results, requestCode, service, account); + } + }); + } + }); + } else { + doLogin(results, requestCode, service, null); + } + } + + private void doLogin(final Intent results, final int requestCode, + final String service, final Account account) { + auth.doLogin(new Runnable() { + public void run() { + Log.d(MyTracksConstants.TAG, "Loggin success for " + service + "!"); + onActivityResult(requestCode, RESULT_OK, results); + } + }, account); + } + + /** + * Starts the track recording service (if not already running) and binds to + * it. Starts recording a new track. + */ + public void startRecording() { + if (trackRecordingService == null) { + startNewTrackRequested = true; + Intent startIntent = new Intent(this, TrackRecordingService.class); + startService(startIntent); + tryBindTrackRecordingService(); + } else { + try { + recordingTrackId = trackRecordingService.startNewTrack(); + Toast.makeText(this, getString(R.string.status_now_recording), + Toast.LENGTH_SHORT).show(); + setSelectedAndRecordingTrack(recordingTrackId, recordingTrackId); + } catch (RemoteException e) { + Toast.makeText(this, + getString(R.string.error_unable_to_start_recording), + Toast.LENGTH_SHORT).show(); + Log.e(MyTracksConstants.TAG, + "Failed to start track recording service", e); + } + } + } + + /** + * Stops the track recording service and unbinds from it. Will display a toast + * "Stopped recording" and pop up the Track Details activity. + */ + public void stopRecording() { + if (trackRecordingService != null) { + try { + trackRecordingService.endCurrentTrack(); + } catch (RemoteException e) { + Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e); + } + setRecordingTrack(-1); + Intent intent = new Intent(MyTracks.this, MyTracksDetails.class); + intent.putExtra("trackid", recordingTrackId); + intent.putExtra("hasCancelButton", false); + recordingTrackId = -1; + startActivity(intent); + } + tryUnbindTrackRecordingService(); + try { + stopService(new Intent(MyTracks.this, TrackRecordingService.class)); + } catch (SecurityException e) { + Log.e(MyTracksConstants.TAG, + "Encountered a security exception when trying to stop service.", e); + } + trackRecordingService = null; + } + + /** + * Initiates the process to send tracks to google. + * This is called once the user has selected sending options via the + * SendToGoogleDialog. + */ + public void sendToGoogle() { + if (sendToGoogleDialog == null) { + return; + } + setProgressValue(0); + setProgressMessage(""); + showDialogSafely(DIALOG_PROGRESS); + if (sendToGoogleDialog.getSendToMyMaps()) { + if (!sendToGoogleDialog.getCreateNewMap()) { + Intent listIntent = new Intent(this, MyMapsList.class); + startActivityForResult(listIntent, MyTracksConstants.GET_MAP); + } else { + setProgressValue(0); + setProgressMessage(getString( + R.string.progress_message_authenticating_mymaps)); + authenticate(new Intent(), MyTracksConstants.SEND_TO_GOOGLE, + MyMapsConstants.MAPSHOP_SERVICE); + } + } else { + onActivityResult(MyTracksConstants.AUTHENTICATE_TO_DOCS, RESULT_OK, + new Intent()); + } + } + + /** + * Writes the selected track id to the shared preferences. + * Executed on the UI thread. + * + * @param trackId the id of the track + */ + public void setSelectedTrack(final long trackId) { + runOnUiThread(new Runnable() { + public void run() { + SharedPreferences prefs = + getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + SharedPreferences.Editor editor = prefs.edit(); + editor.putLong(getString(R.string.selected_track_key), trackId); + editor.commit(); + } + }); + } + + protected long getSelectedTrack() { + return selectedTrackId; + } + + /** + * Writes the recording track id to the shared preferences. + * Executed on the UI thread. + * + * @param trackId the id of the track + */ + private void setRecordingTrack(final long trackId) { + runOnUiThread(new Runnable() { + public void run() { + SharedPreferences prefs = + getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + SharedPreferences.Editor editor = prefs.edit(); + editor.putLong(getString(R.string.recording_track_key), trackId); + editor.commit(); + } + }); + } + + /** + * Writes the selected and the recording track id to the shared preferences. + * Executed on UI thread. + */ + private void setSelectedAndRecordingTrack(final long theSelectedTrackId, + final long theRecordingTrackId) { + runOnUiThread(new Runnable() { + public void run() { + SharedPreferences prefs = + getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + if (prefs != null) { + SharedPreferences.Editor editor = prefs.edit(); + editor.putLong(getString(R.string.selected_track_key), theSelectedTrackId); + editor.putLong(getString(R.string.recording_track_key), theRecordingTrackId); + editor.commit(); + } + } + }); + } + + /** + * Binds to track recording service if it is running. + */ + private void tryBindTrackRecordingService() { + Log.d(MyTracksConstants.TAG, + "MyTracks: Trying to bind to track recording service..."); + bindService(new Intent(this, TrackRecordingService.class), + serviceConnection, 0); + } + + /** + * Tries to unbind the track recording service. Catches exception silently in + * case service is not registered anymore. + */ + private void tryUnbindTrackRecordingService() { + Log.d(MyTracksConstants.TAG, + "MyTracks: Trying to unbind from track recording service..."); + try { + unbindService(serviceConnection); + } catch (IllegalArgumentException e) { + Log.d(MyTracksConstants.TAG, + "MyTracks: Tried unbinding, but service was not registered.", e); + } + } + + /** + * Shows a dialog with the given message. + * Does it on the UI thread. + * + * @param success if true, displays an info icon/title, otherwise an error + * icon/title + * @param message resource string id + */ + public void showMessageDialog(final int message, final boolean success) { + runOnUiThread(new Runnable() { + public void run() { + AlertDialog dialog = null; + AlertDialog.Builder builder = new AlertDialog.Builder(MyTracks.this); + builder.setMessage(MyTracks.this.getString(message)); + builder.setNegativeButton(MyTracks.this.getString(R.string.ok), null); + builder.setIcon(success ? android.R.drawable.ic_dialog_info : + android.R.drawable.ic_dialog_alert); + builder.setTitle(success ? R.string.success : R.string.error); + dialog = builder.create(); + dialog.show(); + } + }); + } + + /** + * Saves the track with the given id to the SD card. + * + * @param trackId The id of the track to be sent + */ + public void saveTrack(long trackId, TrackFileFormat format) { + showDialogSafely(DIALOG_WRITE_PROGRESS); + final TrackWriter writer = + TrackWriterFactory.newWriter(this, providerUtils, trackId, format); + writer.setOnCompletion(new Runnable() { + public void run() { + dismissDialogSafely(DIALOG_WRITE_PROGRESS); + showMessageDialog(writer.getErrorMessage(), writer.wasSuccess()); + } + }); + writer.writeTrackAsync(); + } + + /** + * Sends the requested track as an email attachment. + * This will leave the gpx file on the SD card for at least one hour. + * Temporary gpx files will be deleted in onStop. + * + * @param trackId The id of the track to be sent + */ + public void sendTrack(long trackId, final TrackFileFormat format) { + showDialogSafely(DIALOG_WRITE_PROGRESS); + final TrackWriter writer = + TrackWriterFactory.newWriter(this, providerUtils, trackId, format); + String sep = System.getProperty("file.separator"); + String extension = format.getExtension(); + File dir = new File(Environment.getExternalStorageDirectory() + + sep + extension + sep + "tmp"); + writer.setDirectory(dir); + writer.setOnCompletion(new Runnable() { + public void run() { + dismissDialogSafely(DIALOG_WRITE_PROGRESS); + if (!writer.wasSuccess()) { + showMessageDialog(writer.getErrorMessage(), writer.wasSuccess()); + } else { + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_SUBJECT, + getResources().getText(R.string.send_track_subject).toString()); + shareIntent.putExtra(Intent.EXTRA_TEXT, + getResources().getText(R.string.send_track_body_format) + .toString()); + shareIntent.setType(format.getMimeType()); + Uri u = Uri.fromFile(new File(writer.getAbsolutePath())); + shareIntent.putExtra(Intent.EXTRA_STREAM, u); + startActivity(Intent.createChooser(shareIntent, + getResources().getText(R.string.share_track).toString())); + } + } + }); + writer.writeTrackAsync(); + } + + /** + * Notifies that uploading to maps is finished. + */ + private void handleMapsFinish() { + if (shareRequested && sendToMyMapsSuccess) { + // Just share + Toast.makeText(this, getMapsResultMessage(), Toast.LENGTH_LONG).show(); + shareLinkToMyMap(sendToMyMapsMapId); + } else { + showDialogSafely(DIALOG_SEND_TO_GOOGLE_RESULT); + } + } + + private String getMapsResultMessage() { + StringBuilder message = new StringBuilder(); + if (sendToGoogleDialog.getSendToMyMaps()) { + message.append(sendToMyMapsMessage); + } + if (sendToGoogleDialog.getSendToDocs()) { + if (message.length() > 0) { + message.append(' '); + } + message.append(sendToDocsMessage); + } + if (sendToMyMapsSuccess && sendToDocsSuccess) { + message.append(' '); + message.append(getString(R.string.status_mymap_info)); + } + return message.toString(); + } + + public AccountChooser getAccountChooser() { + return accountChooser; + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java index 7dfd50932..600bafbce 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java @@ -1,200 +1,207 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.android.apps.mytracks; - -/** - * Constants used by the MyTracks application. - * - * @author Leif Hendrik Wilden - */ -public abstract class MyTracksConstants { - - /** - * Should be used by all log statements - */ - public static final String TAG = "MyTracks"; - - /** - * Name of the gps location provider: - */ - public static final String GPS_PROVIDER = "gps"; - - /* - * onActivityResult request codes: - */ - - public static final int GET_LOGIN = 0; - public static final int GET_MAP = 1; - public static final int CREATE_MAP = 2; - public static final int SHOW_TRACK = 3; - public static final int ADD_LIST = 4; - public static final int FEATURE_DETAILS = 5; - public static final int START_RECORDING = 6; - public static final int STOP_RECORDING = 7; - public static final int AUTHENTICATE_TO_DOCS = 8; - public static final int AUTHENTICATE_TO_TRIX = 9; - public static final int SEND_TO_DOCS = 10; - public static final int DELETE_TRACK = 11; - public static final int SEND_TO_GOOGLE = 12; - public static final int SEND_TO_GOOGLE_DIALOG = 13; - public static final int SHARE_LINK = 14; - public static final int SHARE_GPX_FILE = 15; - public static final int SHARE_KML_FILE = 16; - public static final int SHARE_CSV_FILE = 17; - public static final int EDIT_DETAILS = 18; - public static final int SAVE_GPX_FILE = 19; - public static final int SAVE_KML_FILE = 20; - public static final int SAVE_CSV_FILE = 21; - public static final int CLEAR_MAP = 22; - public static final int SHOW_WAYPOINT = 23; - public static final int EDIT_WAYPOINT = 24; - public static final int WELCOME = 25; - - /* - * Menu ids: - */ - - public static final int MENU_START_RECORDING = 1; - public static final int MENU_STOP_RECORDING = 2; - public static final int MENU_LIST_TRACKS = 3; - public static final int MENU_LIST_MARKERS = 4; - public static final int MENU_SETTINGS = 5; - public static final int MENU_MY_LOCATION = 6; - public static final int MENU_TOGGLE_LAYERS = 7; - public static final int MENU_CHART_SETTINGS = 8; - public static final int MENU_HELP = 9; - public static final int MENU_CURRENT_SEGMENT = 10; - public static final int MENU_AGGREGATED_STATS = 11; - - /* - * Context menu ids: - */ - - public static final int MENU_EDIT = 100; - public static final int MENU_DELETE = 101; - public static final int MENU_SEND_TO_GOOGLE = 102; - public static final int MENU_SHARE = 103; - public static final int MENU_SHOW = 104; - public static final int MENU_SHARE_LINK = 200; - public static final int MENU_SHARE_GPX_FILE = 201; - public static final int MENU_SHARE_KML_FILE = 202; - public static final int MENU_SHARE_CSV_FILE = 203; - public static final int MENU_WRITE_TO_SD_CARD = 204; - public static final int MENU_SAVE_GPX_FILE = 205; - public static final int MENU_SAVE_KML_FILE = 206; - public static final int MENU_SAVE_CSV_FILE = 207; - public static final int MENU_CLEAR_MAP = 208; - - /** - * The number of distance readings to smooth to get a stable signal. - */ - public static final int DISTANCE_SMOOTHING_FACTOR = 25; - - /** - * The number of elevation readings to smooth to get a somewhat accurate - * signal. - */ - public static final int ELEVATION_SMOOTHING_FACTOR = 25; - - /** - * The number of grade readings to smooth to get a somewhat accurate signal. - */ - public static final int GRADE_SMOOTHING_FACTOR = 5; - - /** - * The number of speed reading to smooth to get a somewhat accurate signal. - */ - public static final int SPEED_SMOOTHING_FACTOR = 25; - - /** - * Maximum number of track points displayed by the map overlay. - */ - public static final int MAX_DISPLAYED_TRACK_POINTS = 10000; - - /** - * Maximum number of track points ever loaded at once from the provider into - * memory. - * With a recording frequency of 2 seconds, 15000 corresponds to 8.3 hours. - */ - public static final int MAX_LOADED_TRACK_POINTS = 20000; - - /** - * Maximum number of way points displayed by the map overlay. - */ - public static final int MAX_DISPLAYED_WAYPOINTS_POINTS = 128; - - /** - * Maximum number of way points that will be loaded at one time. - */ - public static final int MAX_LOADED_WAYPOINTS_POINTS = 10000; - - /** - * Any time segment where the distance traveled is less than this value will - * not be considered moving. - */ - public static final double MAX_NO_MOVEMENT_DISTANCE = 2; - - /** - * Anything faster than that (in meters per second) will be considered moving. - */ - public static final double MAX_NO_MOVEMENT_SPEED = 0.224; - - /** - * Ignore any acceleration faster than this. - * Will ignore any speeds that imply accelaration greater than 2g's - * 2g = 19.6 m/s^2 = 0.0002 m/ms^2 = 0.02 m/(m*ms) - */ - public static final double MAX_ACCELERATION = 0.02; - - /** - * The type of account that we can use for gdata uploads. - */ - public static final String ACCOUNT_TYPE = "com.google"; - - public static int getActionFromMenuId(int menuId) { - switch (menuId) { - case MyTracksConstants.MENU_SEND_TO_GOOGLE: - return MyTracksConstants.SEND_TO_GOOGLE_DIALOG; - case MyTracksConstants.MENU_EDIT: - return MyTracksConstants.EDIT_DETAILS; - case MyTracksConstants.MENU_DELETE: - return MyTracksConstants.DELETE_TRACK; - case MyTracksConstants.MENU_SHARE_LINK: - return MyTracksConstants.SHARE_LINK; - case MyTracksConstants.MENU_SHARE_KML_FILE: - return MyTracksConstants.SHARE_KML_FILE; - case MyTracksConstants.MENU_SHARE_GPX_FILE: - return MyTracksConstants.SHARE_GPX_FILE; - case MyTracksConstants.MENU_SHARE_CSV_FILE: - return MyTracksConstants.SHARE_CSV_FILE; - case MyTracksConstants.MENU_SAVE_GPX_FILE: - return MyTracksConstants.SAVE_GPX_FILE; - case MyTracksConstants.MENU_SAVE_KML_FILE: - return MyTracksConstants.SAVE_KML_FILE; - case MyTracksConstants.MENU_SAVE_CSV_FILE: - return MyTracksConstants.SAVE_CSV_FILE; - case MyTracksConstants.MENU_CLEAR_MAP: - return MyTracksConstants.CLEAR_MAP; - default: - return -1; - } - } - - /** - * This is an abstract utility class. - */ - protected MyTracksConstants() { } -} +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks; + +/** + * Constants used by the MyTracks application. + * + * @author Leif Hendrik Wilden + */ +public abstract class MyTracksConstants { + + /** + * Should be used by all log statements + */ + public static final String TAG = "MyTracks"; + + /** + * Name of the gps location provider: + */ + public static final String GPS_PROVIDER = "gps"; + + /* + * onActivityResult request codes: + */ + + public static final int GET_LOGIN = 0; + public static final int GET_MAP = 1; + public static final int CREATE_MAP = 2; + public static final int SHOW_TRACK = 3; + public static final int ADD_LIST = 4; + public static final int FEATURE_DETAILS = 5; + public static final int START_RECORDING = 6; + public static final int STOP_RECORDING = 7; + public static final int AUTHENTICATE_TO_DOCS = 8; + public static final int AUTHENTICATE_TO_TRIX = 9; + public static final int SEND_TO_DOCS = 10; + public static final int DELETE_TRACK = 11; + public static final int SEND_TO_GOOGLE = 12; + public static final int SEND_TO_GOOGLE_DIALOG = 13; + public static final int SHARE_LINK = 14; + public static final int SHARE_GPX_FILE = 15; + public static final int SHARE_KML_FILE = 16; + public static final int SHARE_CSV_FILE = 17; + public static final int SHARE_TCX_FILE = 18; + public static final int EDIT_DETAILS = 19; + public static final int SAVE_GPX_FILE = 20; + public static final int SAVE_KML_FILE = 21; + public static final int SAVE_CSV_FILE = 22; + public static final int SAVE_TCX_FILE = 23; + public static final int CLEAR_MAP = 24; + public static final int SHOW_WAYPOINT = 25; + public static final int EDIT_WAYPOINT = 26; + public static final int WELCOME = 27; + + /* + * Menu ids: + */ + + public static final int MENU_MY_LOCATION = 1; + public static final int MENU_TOGGLE_LAYERS = 2; + public static final int MENU_CHART_SETTINGS = 3; + public static final int MENU_CURRENT_SEGMENT = 4; + + /* + * Context menu ids: + */ + + public static final int MENU_EDIT = 100; + public static final int MENU_DELETE = 101; + public static final int MENU_SEND_TO_GOOGLE = 102; + public static final int MENU_SHARE = 103; + public static final int MENU_SHOW = 104; + public static final int MENU_SHARE_LINK = 200; + public static final int MENU_SHARE_GPX_FILE = 201; + public static final int MENU_SHARE_KML_FILE = 202; + public static final int MENU_SHARE_CSV_FILE = 203; + public static final int MENU_SHARE_TCX_FILE = 204; + public static final int MENU_WRITE_TO_SD_CARD = 205; + public static final int MENU_SAVE_GPX_FILE = 206; + public static final int MENU_SAVE_KML_FILE = 207; + public static final int MENU_SAVE_CSV_FILE = 208; + public static final int MENU_SAVE_TCX_FILE = 209; + public static final int MENU_CLEAR_MAP = 210; + + /** + * The number of distance readings to smooth to get a stable signal. + */ + public static final int DISTANCE_SMOOTHING_FACTOR = 25; + + /** + * The number of elevation readings to smooth to get a somewhat accurate + * signal. + */ + public static final int ELEVATION_SMOOTHING_FACTOR = 25; + + /** + * The number of grade readings to smooth to get a somewhat accurate signal. + */ + public static final int GRADE_SMOOTHING_FACTOR = 5; + + /** + * The number of speed reading to smooth to get a somewhat accurate signal. + */ + public static final int SPEED_SMOOTHING_FACTOR = 25; + + /** + * Maximum number of track points displayed by the map overlay. + */ + public static final int MAX_DISPLAYED_TRACK_POINTS = 10000; + + /** + * Target number of track points displayed by the map overlay. + * We may display more than this number of points. + */ + public static final int TARGET_DISPLAYED_TRACK_POINTS = 5000; + + /** + * Maximum number of track points ever loaded at once from the provider into + * memory. + * With a recording frequency of 2 seconds, 15000 corresponds to 8.3 hours. + */ + public static final int MAX_LOADED_TRACK_POINTS = 20000; + + /** + * Maximum number of way points displayed by the map overlay. + */ + public static final int MAX_DISPLAYED_WAYPOINTS_POINTS = 128; + + /** + * Maximum number of way points that will be loaded at one time. + */ + public static final int MAX_LOADED_WAYPOINTS_POINTS = 10000; + + /** + * Any time segment where the distance traveled is less than this value will + * not be considered moving. + */ + public static final double MAX_NO_MOVEMENT_DISTANCE = 2; + + /** + * Anything faster than that (in meters per second) will be considered moving. + */ + public static final double MAX_NO_MOVEMENT_SPEED = 0.224; + + /** + * Ignore any acceleration faster than this. + * Will ignore any speeds that imply accelaration greater than 2g's + * 2g = 19.6 m/s^2 = 0.0002 m/ms^2 = 0.02 m/(m*ms) + */ + public static final double MAX_ACCELERATION = 0.02; + + /** + * The type of account that we can use for gdata uploads. + */ + public static final String ACCOUNT_TYPE = "com.google"; + + public static int getActionFromMenuId(int menuId) { + switch (menuId) { + case MyTracksConstants.MENU_SEND_TO_GOOGLE: + return MyTracksConstants.SEND_TO_GOOGLE_DIALOG; + case MyTracksConstants.MENU_EDIT: + return MyTracksConstants.EDIT_DETAILS; + case MyTracksConstants.MENU_DELETE: + return MyTracksConstants.DELETE_TRACK; + case MyTracksConstants.MENU_SHARE_LINK: + return MyTracksConstants.SHARE_LINK; + case MyTracksConstants.MENU_SHARE_KML_FILE: + return MyTracksConstants.SHARE_KML_FILE; + case MyTracksConstants.MENU_SHARE_GPX_FILE: + return MyTracksConstants.SHARE_GPX_FILE; + case MyTracksConstants.MENU_SHARE_CSV_FILE: + return MyTracksConstants.SHARE_CSV_FILE; + case MyTracksConstants.MENU_SHARE_TCX_FILE: + return MyTracksConstants.SHARE_TCX_FILE; + case MyTracksConstants.MENU_SAVE_GPX_FILE: + return MyTracksConstants.SAVE_GPX_FILE; + case MyTracksConstants.MENU_SAVE_KML_FILE: + return MyTracksConstants.SAVE_KML_FILE; + case MyTracksConstants.MENU_SAVE_CSV_FILE: + return MyTracksConstants.SAVE_CSV_FILE; + case MyTracksConstants.MENU_SAVE_TCX_FILE: + return MyTracksConstants.SAVE_TCX_FILE; + case MyTracksConstants.MENU_CLEAR_MAP: + return MyTracksConstants.CLEAR_MAP; + default: + return -1; + } + } + + /** + * This is an abstract utility class. + */ + protected MyTracksConstants() { } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksDeleteAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksDeleteAllTracks.java index 4762c840e..8a5f255f1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksDeleteAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksDeleteAllTracks.java @@ -62,7 +62,7 @@ public class MyTracksDeleteAllTracks extends Handler { SharedPreferences prefs = context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); SharedPreferences.Editor editor = prefs.edit(); - editor.putLong(MyTracksSettings.SELECTED_TRACK, -1); + editor.putLong(context.getString(R.string.selected_track_key), -1); editor.commit(); if (done != null) { Handler h = new Handler(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java index c2be23dce..f88421868 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java @@ -90,6 +90,8 @@ public class MyTracksList extends ListActivity R.string.tracklist_share_kml_file); share.add(0, MyTracksConstants.MENU_SHARE_CSV_FILE, 0, R.string.tracklist_share_csv_file); + share.add(0, MyTracksConstants.MENU_SHARE_TCX_FILE, 0, + R.string.tracklist_share_tcx_file); SubMenu save = menu.addSubMenu(0, MyTracksConstants.MENU_WRITE_TO_SD_CARD, 0, R.string.tracklist_write_to_sd); @@ -99,6 +101,8 @@ public class MyTracksList extends ListActivity R.string.tracklist_save_as_kml); save.add(0, MyTracksConstants.MENU_SAVE_CSV_FILE, 0, R.string.tracklist_save_as_csv); + save.add(0, MyTracksConstants.MENU_SAVE_TCX_FILE, 0, + R.string.tracklist_save_as_tcx); menu.add(0, MyTracksConstants.MENU_DELETE, 0, R.string.tracklist_delete_track); } @@ -111,14 +115,16 @@ public class MyTracksList extends ListActivity if (key == null) { return; } - if (key.equals(MyTracksSettings.METRIC_UNITS)) { - metricUnits = sharedPreferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + if (key.equals(getString(R.string.metric_units_key))) { + metricUnits = sharedPreferences.getBoolean( + getString(R.string.metric_units_key), true); if (tracksCursor != null && !tracksCursor.isClosed()) { tracksCursor.requery(); } } - if (key.equals(MyTracksSettings.RECORDING_TRACK)) { - recordingTrackId = sharedPreferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + if (key.equals(getString(R.string.recording_track_key))) { + recordingTrackId = sharedPreferences.getLong( + getString(R.string.recording_track_key), -1); } } @@ -193,9 +199,10 @@ public class MyTracksList extends ListActivity SharedPreferences preferences = getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); preferences.registerOnSharedPreferenceChangeListener(this); - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + metricUnits = + preferences.getBoolean(getString(R.string.metric_units_key), true); recordingTrackId = - preferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + preferences.getLong(getString(R.string.recording_track_key), -1); tracksCursor = getContentResolver().query( TracksColumns.CONTENT_URI, null, null, null, "_id DESC"); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java index c7b73f7d7..c60e9888e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java @@ -136,6 +136,11 @@ public class MyTracksMap extends MapActivity private Handler updateTrackHandler; private MyTracksProviderUtils providerUtils; + + /** + * This value is used to decide how many points to display. + */ + private int samplingFrequency = 1; /** * A runnable that updates the track from the provider (looking for points @@ -147,35 +152,7 @@ public class MyTracksMap extends MapActivity if (selectedTrack == null) { return; } - Cursor cursor = null; - try { - cursor = providerUtils.getLocationsCursor( - recordingTrackId, - lastSeenLocationId + 1, - MyTracksConstants.MAX_DISPLAYED_TRACK_POINTS - - selectedTrack.getLocations().size(), - true); - if (cursor != null) { - if (cursor.moveToLast()) { - final int idColumnIdx = - cursor.getColumnIndexOrThrow(TrackPointsColumns._ID); - do { - lastSeenLocationId = cursor.getLong(idColumnIdx); - Location location = providerUtils.createLocation(cursor); - if (location != null) { - selectedTrack.addLocation(location); - } - } while (cursor.moveToPrevious()); - } - } - } catch (RuntimeException e) { - Log.w(MyTracksConstants.TAG, "Caught an unexpected exception: ", e); - } finally { - if (cursor != null) { - cursor.close(); - } - mapView.postInvalidate(); - } + readAllNewTrackPoints(); } }; @@ -188,9 +165,9 @@ public class MyTracksMap extends MapActivity if (selectedTrack == null) { return; } - lastSeenLocationId = providerUtils.getTrackPoints(selectedTrack, - MyTracksConstants.MAX_DISPLAYED_TRACK_POINTS); - mapView.postInvalidate(); + mapOverlay.clearPoints(); + lastSeenLocationId = selectedTrack.getStartId(); + readAllNewTrackPoints(); } }; @@ -380,12 +357,12 @@ public class MyTracksMap extends MapActivity getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { minRequiredAccuracy = preferences.getInt( - MyTracksSettings.MIN_REQUIRED_ACCURACY, + getString(R.string.min_required_accuracy_key), MyTracksSettings.DEFAULT_MIN_REQUIRED_ACCURACY); recordingTrackId = - preferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + preferences.getLong(getString(R.string.recording_track_key), -1); long selectedTrackId = - preferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + preferences.getLong(getString(R.string.selected_track_key), -1); if (selectedTrackId >= 0) { setSelectedTrack(selectedTrackId); } @@ -783,6 +760,8 @@ public class MyTracksMap extends MapActivity R.string.tracklist_share_kml_file); share.add(0, MyTracksConstants.MENU_SHARE_CSV_FILE, 0, R.string.tracklist_share_csv_file); + share.add(0, MyTracksConstants.MENU_SHARE_TCX_FILE, 0, + R.string.tracklist_share_tcx_file); SubMenu save = menu.addSubMenu(0, MyTracksConstants.MENU_WRITE_TO_SD_CARD, 0, R.string.tracklist_write_to_sd); @@ -792,6 +771,8 @@ public class MyTracksMap extends MapActivity R.string.tracklist_save_as_kml); save.add(0, MyTracksConstants.MENU_SAVE_CSV_FILE, 0, R.string.tracklist_save_as_csv); + save.add(0, MyTracksConstants.MENU_SAVE_TCX_FILE, 0, + R.string.tracklist_save_as_tcx); menu.add(0, MyTracksConstants.MENU_CLEAR_MAP, 0, R.string.tracklist_clear_map); menu.add(0, MyTracksConstants.MENU_DELETE, 0, @@ -888,17 +869,19 @@ public class MyTracksMap extends MapActivity public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (key != null) { - if (key.equals(MyTracksSettings.MIN_REQUIRED_ACCURACY)) { + if (key.equals(getString(R.string.min_required_accuracy_key))) { minRequiredAccuracy = sharedPreferences.getInt( - MyTracksSettings.MIN_REQUIRED_ACCURACY, + getString(R.string.min_required_accuracy_key), MyTracksSettings.DEFAULT_MIN_REQUIRED_ACCURACY); - } else if (key.equals(MyTracksSettings.SELECTED_TRACK)) { + } else if (key.equals(getString(R.string.selected_track_key))) { long selectedTrackId = - sharedPreferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + sharedPreferences.getLong(getString(R.string.selected_track_key), + -1); setSelectedTrack(selectedTrackId); - } else if (key.equals(MyTracksSettings.RECORDING_TRACK)) { + } else if (key.equals(getString(R.string.recording_track_key))) { recordingTrackId = - sharedPreferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + sharedPreferences.getLong(getString(R.string.recording_track_key), + -1); if (selectedTrack != null) { mapOverlay.setShowEndMarker( selectedTrack.getId() != recordingTrackId); @@ -977,4 +960,63 @@ public class MyTracksMap extends MapActivity public void onAccuracyChanged(Sensor s, int accuracy) { // do nothing } + + /** + * Set the sampling frequency from the total number of points in the track. + * + * @param track The track to read the total number of points from. + */ + private void setSamplingFrequency(Track track) { + long totalLocations = track.getStopId() - track.getStartId(); + + // Limit the number of map points readings. + samplingFrequency = + (int) (1 + + totalLocations / MyTracksConstants.TARGET_DISPLAYED_TRACK_POINTS); + Log.i(MyTracksConstants.TAG, "Sampling locations: " + samplingFrequency); + } + + private void readAllNewTrackPoints() { + Cursor cursor = null; + // Refetch the track to get the latest StopId + selectedTrack = providerUtils.getTrack(selectedTrack.getId()); + long totalLocations = selectedTrack.getStopId() - + selectedTrack.getStartId(); + + setSamplingFrequency(selectedTrack); + int bufferSize = 1024; + int points = 0; + while (lastSeenLocationId < selectedTrack.getStopId()) { + cursor = providerUtils.getLocationsCursor( + selectedTrack.getId(), lastSeenLocationId, bufferSize, false); + if (cursor != null && cursor.moveToFirst()) { + final int idColumnIdx = cursor.getColumnIndexOrThrow( + TrackPointsColumns._ID); + while (cursor.moveToNext()) { + points++; + Location location = providerUtils.createLocation(cursor); + lastSeenLocationId = cursor.getLong(idColumnIdx); + // Include a point if it fits one of the following criteria: + // - Has the mod for the sampling frequency. + // - Is the first point. + // - Is the last point and we are not recording this track. + if (!MyTracksUtils.isValidLocation(location) || + points % samplingFrequency == 0 || + points == 0 || + (recordingTrackId != selectedTrack.getId() && + points == (totalLocations - 1))) { + mapOverlay.addLocation(location); + } + } + } else { + lastSeenLocationId += bufferSize; + } + cursor.close(); + cursor = null; + } + if (cursor != null) { + cursor.close(); + } + mapView.postInvalidate(); + } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java index fabd7555f..8441dabc7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java @@ -1,12 +1,12 @@ /* * Copyright 2008 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -55,6 +55,7 @@ public class MyTracksOverlay extends Overlay { private final Paint errorCirclePaint; private final Context context; private final ArrayList waypoints = new ArrayList(); + private final ArrayList points = new ArrayList(1024); private Track selectedTrack; private int lastHeading = 0; @@ -128,6 +129,17 @@ public class MyTracksOverlay extends Overlay { return selectedTrack; } + /** + * Add a location to the map overlay. + * + * NOTE: this method takes ownership of this location and may change it. + * + * @param l the location to add + */ + public void addLocation(Location l) { + points.add(l); + } + public void addWaypoint(Waypoint wpt) { waypoints.add(wpt); } @@ -136,6 +148,10 @@ public class MyTracksOverlay extends Overlay { waypoints.clear(); } + public void clearPoints() { + points.clear(); + } + public void setShowEndMarker(boolean showEndMarker) { this.showEndMarker = showEndMarker; } @@ -153,7 +169,11 @@ public class MyTracksOverlay extends Overlay { // Draw the waypoints: ArrayList currentWaypoints = waypoints; for (int i = 1; i < currentWaypoints.size(); i++) { - Location loc = currentWaypoints.get(i).getLocation(); + Waypoint wpt = currentWaypoints.get(i); + if (wpt == null) { + continue; + } + Location loc = wpt.getLocation(); if (loc == null) { continue; } @@ -162,7 +182,7 @@ public class MyTracksOverlay extends Overlay { mapView.getProjection().toPixels(geoPoint, pt); canvas.save(); canvas.translate(pt.x - (markerWidth / 2) + 3, pt.y - (markerHeight)); - if (currentWaypoints.get(i).getType() == Waypoint.TYPE_STATISTICS) { + if (wpt.getType() == Waypoint.TYPE_STATISTICS) { statsMarker.draw(canvas); } else { waypointMarker.draw(canvas); @@ -196,7 +216,6 @@ public class MyTracksOverlay extends Overlay { if (track == null) { return; } - ArrayList points = track.getLocations(); if (points.size() < 2) { return; } @@ -206,7 +225,7 @@ public class MyTracksOverlay extends Overlay { int h = mapView.getLatitudeSpan(); int cx = mapView.getMapCenter().getLongitudeE6(); int cy = mapView.getMapCenter().getLatitudeE6(); - Rect rect = new Rect(cx - w / 2, cy - h / 2, cx + w / 2, cy + h / 2); + Rect rect = new Rect(cx - w, cy - h, cx + w, cy + h); Point pt = new Point(); GeoPoint geoPoint; @@ -222,14 +241,6 @@ public class MyTracksOverlay extends Overlay { int lastLocLon = (int) (points.get(0).getLongitude() * 1E6); int lastLocLat = (int) (points.get(0).getLatitude() * 1E6); - // Line decimation for dummies: - // Skip di additional points, where di depends on zoom level: - int di = 0; - int dl = 17 - mapView.getZoomLevel(); - if (dl > 0) { - di += (dl * dl); - } - // Loop over track points: path = new Path(); for (int i = 1; i < points.size(); i++) { @@ -241,23 +252,6 @@ public class MyTracksOverlay extends Overlay { locLon = (int) (loc.getLongitude() * 1E6); locLat = (int) (loc.getLatitude() * 1E6); - // Skip to every n-th point (depends on zoom level, see above): - for (int j = 0; j < di && i < points.size() - 1; j++) { - // TODO Check the thread synchronization. - // There is no reason that points.get(i + 1) should be null but users - // have reported it causing null pointer exceptions. - if ((locLat > 90E6) || - (lastLocLat > 90E6) || - (points.get(i + 1) == null) || - (points.get(i + 1).getLatitude() > 90)) { - break; - } - i++; - loc = points.get(i); - locLon = (int) (loc.getLongitude() * 1E6); - locLat = (int) (loc.getLatitude() * 1E6); - } - // Draw a line segment if it's inside the viewing window: if (locLat < 90E6 && lastLocLat < 90E6) { lastValidLocation = loc; diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java index 776b5612f..8615ca83e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java @@ -1,12 +1,12 @@ /* * Copyright 2008 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -37,26 +37,6 @@ public class MyTracksSettings extends PreferenceActivity { public static final String SETTINGS_NAME = "MyTracksSettings"; - public static final String ANNOUNCEMENT_FREQUENCY = "announcementFrequency"; - public static final String DEFAULT_MAP_PUBLIC = "defaultMapPublic"; - public static final String MAX_RECORDING_DISTANCE = "maxRecordingDistance"; - public static final String METRIC_UNITS = "metricUnits"; - public static final String MIN_RECORDING_DISTANCE = "minRecordingDistance"; - public static final String MIN_RECORDING_INTERVAL = "minRecordingInterval"; - public static final String MIN_REQUIRED_ACCURACY = "minRequiredAccuracy"; - public static final String PICK_EXISTING_MAP = "pickExistingMap"; - public static final String RECORDING_TRACK = "recordingTrack"; - public static final String REPORT_SPEED = "reportSpeed"; - public static final String SELECTED_TRACK = "selectedTrack"; - public static final String SEND_STATS_AND_POINTS = "sendStatsAndPoints"; - public static final String SEND_TO_DOCS = "sendToDocs"; - public static final String SEND_TO_MYMAPS = "sendToMyMaps"; - public static final String SHARE_URL_ONLY = "shareUrlOnly"; - public static final String SIGNAL_SAMPLING_FREQUENCY = - "signalSamplingFrequency"; - public static final String SPLIT_FREQUENCY = "splitFrequency"; - public static final String WRITE_TO_SD_CARD = "writeToSdCard"; - /* * Default values - keep in sync with those in preferences.xml. */ @@ -96,7 +76,7 @@ public class MyTracksSettings extends PreferenceActivity { // Hook up switching of displayed list entries between metric and imperial // units CheckBoxPreference metricUnitsPreference = - (CheckBoxPreference) findPreference(METRIC_UNITS); + (CheckBoxPreference) findPreference(getString(R.string.metric_units_key)); metricUnitsPreference.setOnPreferenceChangeListener( new OnPreferenceChangeListener() { @Override @@ -112,7 +92,8 @@ public class MyTracksSettings extends PreferenceActivity { // Disable TTS announcement preference if not available if (!mTTSAvailable) { IntegerListPreference announcementFrequency = - (IntegerListPreference) findPreference(ANNOUNCEMENT_FREQUENCY); + (IntegerListPreference) findPreference( + getString(R.string.announcement_frequency_key)); announcementFrequency.setEnabled(false); announcementFrequency.setValue("-1"); announcementFrequency.setSummary( @@ -128,13 +109,17 @@ public class MyTracksSettings extends PreferenceActivity { */ private void updatePreferenceUnits(boolean isMetric) { final ListPreference minRecordingDistance = - (ListPreference) findPreference(MIN_RECORDING_DISTANCE); + (ListPreference) findPreference( + getString(R.string.min_recording_distance_key)); final ListPreference maxRecordingDistance = - (ListPreference) findPreference(MAX_RECORDING_DISTANCE); + (ListPreference) findPreference( + getString(R.string.max_recording_distance_key)); final ListPreference minRequiredAccuracy = - (ListPreference) findPreference(MIN_REQUIRED_ACCURACY); + (ListPreference) findPreference( + getString(R.string.min_required_accuracy_key)); final ListPreference splitFrequency = - (ListPreference) findPreference(SPLIT_FREQUENCY); + (ListPreference) findPreference( + getString(R.string.split_frequency_key)); minRecordingDistance.setEntries(isMetric ? R.array.min_recording_distance_options diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointDetails.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointDetails.java index 44ade200e..61e33d7ae 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointDetails.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointDetails.java @@ -66,11 +66,11 @@ public class MyTracksWaypointDetails extends Activity getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { boolean useMetric = - preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + preferences.getBoolean(getString(R.string.metric_units_key), true); utils.setMetricUnits(useMetric); boolean displaySpeed = - preferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + preferences.getBoolean(getString(R.string.report_speed_key), true); utils.setReportSpeed(displaySpeed); utils.updateWaypointUnits(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointsList.java index 0e9d6040d..594c9fb98 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointsList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksWaypointsList.java @@ -139,9 +139,9 @@ public class MyTracksWaypointsList extends ListActivity getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { recordingTrackId = - preferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + preferences.getLong(getString(R.string.recording_track_key), -1); selectedTrackId = - preferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + preferences.getLong(getString(R.string.selected_track_key), -1); } boolean selectedRecording = selectedTrackId > 0 && selectedTrackId == recordingTrackId; diff --git a/MyTracks/src/com/google/android/apps/mytracks/SendToGoogleDialog.java b/MyTracks/src/com/google/android/apps/mytracks/SendToGoogleDialog.java index 8e7847cb0..3f6ef6da9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SendToGoogleDialog.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SendToGoogleDialog.java @@ -105,17 +105,25 @@ public class SendToGoogleDialog extends Dialog { getContext().getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (prefs != null) { sendToMyMapsCheckBox.setChecked( - prefs.getBoolean(MyTracksSettings.SEND_TO_MYMAPS, true)); + prefs.getBoolean( + getContext().getString(R.string.send_to_my_maps_key), true)); sendToDocsCheckBox.setChecked( - prefs.getBoolean(MyTracksSettings.SEND_TO_DOCS, true)); + prefs.getBoolean( + getContext().getString(R.string.send_to_docs_key), true)); pickMapRadioButton.setChecked( - prefs.getBoolean(MyTracksSettings.PICK_EXISTING_MAP, false)); + prefs.getBoolean( + getContext().getString(R.string.pick_existing_map_key), false)); createNewMapRadioButton.setChecked( - !prefs.getBoolean(MyTracksSettings.PICK_EXISTING_MAP, false)); + !prefs.getBoolean( + getContext().getString(R.string.pick_existing_map_key), false)); sendStatsAndPointsRadioButton.setChecked( - prefs.getBoolean(MyTracksSettings.SEND_STATS_AND_POINTS, false)); + prefs.getBoolean( + getContext().getString(R.string.send_stats_and_points_key), + false)); sendStatsRadioButton.setChecked( - !prefs.getBoolean(MyTracksSettings.SEND_STATS_AND_POINTS, false)); + !prefs.getBoolean( + getContext().getString(R.string.send_stats_and_points_key), + false)); } } @@ -127,13 +135,16 @@ public class SendToGoogleDialog extends Dialog { Editor editor = prefs.edit(); if (editor != null) { editor.putBoolean( - MyTracksSettings.SEND_TO_MYMAPS, sendToMyMapsCheckBox.isChecked()); + getContext().getString(R.string.send_to_my_maps_key), + sendToMyMapsCheckBox.isChecked()); editor.putBoolean( - MyTracksSettings.SEND_TO_DOCS, sendToDocsCheckBox.isChecked()); + getContext().getString(R.string.send_to_docs_key), + sendToDocsCheckBox.isChecked()); editor.putBoolean( - MyTracksSettings.PICK_EXISTING_MAP, pickMapRadioButton.isChecked()); + getContext().getString(R.string.pick_existing_map_key), + pickMapRadioButton.isChecked()); editor.putBoolean( - MyTracksSettings.SEND_STATS_AND_POINTS, + getContext().getString(R.string.send_stats_and_points_key), sendStatsAndPointsRadioButton.isChecked()); editor.commit(); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java index c16bb69fa..a0deb9c4a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java @@ -1,12 +1,12 @@ /* * Copyright 2008 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -15,6 +15,9 @@ */ package com.google.android.apps.mytracks; +import com.google.android.apps.mytracks.content.MyTracksProviderUtils; +import com.google.android.apps.mytracks.content.MyTracksProviderUtilsImpl; +import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.TracksColumns; import com.google.android.apps.mytracks.content.WaypointsColumns; import com.google.android.maps.mytracks.R; @@ -24,7 +27,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.database.ContentObserver; -import android.database.Cursor; import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; @@ -48,23 +50,6 @@ import android.widget.Toast; public class StatsActivity extends Activity implements OnSharedPreferenceChangeListener, LocationListener { - /** - * Columns we need from the provider - */ - private static final String[] PROJECTION_COLUMNS = { - TracksColumns._ID, - TracksColumns.STARTTIME, - TracksColumns.TOTALTIME, - TracksColumns.MOVINGTIME, - TracksColumns.TOTALDISTANCE, - TracksColumns.AVGSPEED, - TracksColumns.AVGMOVINGSPEED, - TracksColumns.MAXSPEED, - TracksColumns.MINELEVATION, - TracksColumns.MAXELEVATION, - TracksColumns.ELEVATIONGAIN, - TracksColumns.MINGRADE, - TracksColumns.MAXGRADE }; private final StatsUtilities utils; private UIUpdateThread thread; @@ -109,6 +94,9 @@ public class StatsActivity extends Activity */ private boolean showCurrentSegment = false; + private final MyTracksProviderUtils providerUtils; + private Track track = null; + /** * A runnable for posting to the UI thread. Will update the total time field. */ @@ -147,7 +135,8 @@ public class StatsActivity extends Activity } public StatsActivity() { - this.utils = new StatsUtilities(this); + utils = new StatsUtilities(this); + providerUtils = new MyTracksProviderUtilsImpl(this); } /** Called when the activity is first created. */ @@ -176,20 +165,20 @@ public class StatsActivity extends Activity SharedPreferences preferences = getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { - selectedTrackId = preferences.getLong(MyTracksSettings.SELECTED_TRACK, - -1); - recordingTrackId = preferences.getLong(MyTracksSettings.RECORDING_TRACK, - -1); - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, - true); + selectedTrackId = preferences.getLong( + getString(R.string.selected_track_key), -1); + recordingTrackId = preferences.getLong( + getString(R.string.recording_track_key), -1); + metricUnits = preferences.getBoolean( + getString(R.string.metric_units_key), true); displaySpeed = - preferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + preferences.getBoolean(getString(R.string.report_speed_key), true); checkLiveTrack(); restoreStats(); updateLocation(null); preferences.registerOnSharedPreferenceChangeListener(this); } - locationManager = + locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); utils.setMetricUnits(metricUnits); utils.setReportSpeed(displaySpeed); @@ -231,27 +220,31 @@ public class StatsActivity extends Activity Log.d(MyTracksConstants.TAG, "StatsActivity: onSharedPreferences changed " + key); if (key != null) { - if (key.equals(MyTracksSettings.SELECTED_TRACK)) { + if (key.equals(getString(R.string.selected_track_key))) { selectedTrackId = - sharedPreferences.getLong(MyTracksSettings.SELECTED_TRACK, -1); + sharedPreferences.getLong(getString(R.string.selected_track_key), + -1); checkLiveTrack(); restoreStats(); updateLocation(null); - } else if (key.equals(MyTracksSettings.RECORDING_TRACK)) { + } else if (key.equals(getString(R.string.recording_track_key))) { recordingTrackId = - sharedPreferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); + sharedPreferences.getLong(getString(R.string.recording_track_key), + -1); checkLiveTrack(); restoreStats(); updateLocation(null); - } else if (key.equals(MyTracksSettings.METRIC_UNITS)) { + } else if (key.equals(getString(R.string.metric_units_key))) { metricUnits = - sharedPreferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + sharedPreferences.getBoolean( + getString(R.string.metric_units_key), true); utils.setMetricUnits(metricUnits); utils.updateUnits(); restoreStats(); - } else if (key.equals(MyTracksSettings.REPORT_SPEED)) { + } else if (key.equals(getString(R.string.report_speed_key))) { displaySpeed = - sharedPreferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + sharedPreferences.getBoolean(getString(R.string.report_speed_key), + true); utils.setReportSpeed(displaySpeed); utils.updateUnits(); utils.setSpeedLabel( @@ -359,60 +352,13 @@ public class StatsActivity extends Activity return; } - Cursor cursor = null; - try { - cursor = getContentResolver().query( - showCurrentSegment - ? WaypointsColumns.CONTENT_URI - : TracksColumns.CONTENT_URI, - PROJECTION_COLUMNS, - showCurrentSegment - ? WaypointsColumns.TRACKID + "=" + selectedTrackId - : "_id=" + selectedTrackId, - null, - "_id LIMIT 1"); - - if (cursor != null && cursor.moveToFirst()) { - final int idxStartTime = - cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME); - final int idxTotalTime = - cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME); - final int idxMovingTime = - cursor.getColumnIndexOrThrow(TracksColumns.MOVINGTIME); - final int idxTotalDistance = - cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE); - final int idxAverageSpeed = - cursor.getColumnIndexOrThrow(TracksColumns.AVGSPEED); - final int idxAverageMovingSpeed = - cursor.getColumnIndexOrThrow(TracksColumns.AVGMOVINGSPEED); - final int idxMaxSpeed = - cursor.getColumnIndexOrThrow(TracksColumns.MAXSPEED); - final int idxMinElevation = - cursor.getColumnIndexOrThrow(TracksColumns.MINELEVATION); - final int idxMaxElevation = - cursor.getColumnIndexOrThrow(TracksColumns.MAXELEVATION); - final int idxElevationGain = - cursor.getColumnIndexOrThrow(TracksColumns.ELEVATIONGAIN); - final int idxMinGrade = - cursor.getColumnIndexOrThrow(TracksColumns.MINGRADE); - final int idxMaxGrade = - cursor.getColumnIndexOrThrow(TracksColumns.MAXGRADE); - startTime = cursor.getLong(idxStartTime); - if (!selectedTrackIsRecording()) { - utils.setTime(R.id.total_time_register, cursor.getLong(idxTotalTime)); - } - utils.setAllStats(cursor.getLong(idxMovingTime), - cursor.getFloat(idxTotalDistance), cursor.getFloat(idxAverageSpeed), - cursor.getFloat(idxAverageMovingSpeed), - cursor.getFloat(idxMaxSpeed), cursor.getFloat(idxMinElevation), - cursor.getFloat(idxMaxElevation), cursor.getFloat(idxElevationGain), - cursor.getFloat(idxMinGrade), cursor.getFloat(idxMaxGrade)); - } - } finally { - if (cursor != null) { - cursor.close(); - } + track = providerUtils.getTrack(selectedTrackId); + startTime = track.getStatistics().getStartTime(); + if(!selectedTrackIsRecording()) { + utils.setTime(R.id.total_time_register, + track.getStatistics().getTotalTime()); } + utils.setAllStats(track.getStatistics()); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java index 4b717cc9a..42edd66f6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java @@ -19,12 +19,17 @@ 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; import android.view.Window; import android.webkit.WebView; +import android.widget.TextView; /** * An activity that displays a welcome screen. @@ -72,5 +77,16 @@ public class WelcomeActivity extends Activity { builder.setIcon(R.drawable.arrow_icon); AlertDialog dialog = builder.create(); dialog.show(); + + // Get the version from the manifest. + try { + PackageInfo pi = + getPackageManager().getPackageInfo("com.google.android.maps.mytracks", + PackageManager.GET_META_DATA); + ((TextView) dialog.findViewById(R.id.about_version_register)). + setText(pi.versionName); + } catch (NameNotFoundException e) { + Log.w(MyTracksConstants.TAG, "Failed to get version info.", e); + } } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java index a4b542e25..010e553f8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java @@ -167,24 +167,25 @@ public class MyTracksProvider extends ContentProvider { @Override public int delete(Uri url, String where, String[] selectionArgs) { - if (urlMatcher.match(url) == TRACKPOINTS) { - Log.w(MyTracksProvider.TAG, "provider trackpoints delete!"); - int count = db.delete(TRACKPOINTS_TABLE, where, selectionArgs); - getContext().getContentResolver().notifyChange(url, null, true); - return count; - } else if (urlMatcher.match(url) == TRACKS) { - Log.w(MyTracksProvider.TAG, "provider track delete!"); - int count = db.delete(TRACKS_TABLE, where, selectionArgs); - getContext().getContentResolver().notifyChange(url, null, true); - return count; - } else if (urlMatcher.match(url) == WAYPOINTS) { - Log.w(MyTracksProvider.TAG, "provider waypoint delete!"); - int count = db.delete(WAYPOINTS_TABLE, where, selectionArgs); - getContext().getContentResolver().notifyChange(url, null, true); - return count; - } else { - throw new IllegalArgumentException("Unknown URL " + url); + String table; + switch (urlMatcher.match(url)) { + case TRACKPOINTS: + table = TRACKPOINTS_TABLE; + break; + case TRACKS: + table = TRACKS_TABLE; + break; + case WAYPOINTS: + table = WAYPOINTS_TABLE; + break; + default: + throw new IllegalArgumentException("Unknown URL " + url); } + + Log.w(MyTracksProvider.TAG, "provider delete in " + table + "!"); + int count = db.delete(table, where, selectionArgs); + getContext().getContentResolver().notifyChange(url, null, true); + return count; } @Override @@ -216,19 +217,49 @@ public class MyTracksProvider extends ContentProvider { } else { values = new ContentValues(); } - if (urlMatcher.match(url) == TRACKPOINTS) { - return insertTrackPoint(url, values); - } else if (urlMatcher.match(url) == TRACKS) { - return insertTrack(url, values); - } else if (urlMatcher.match(url) == WAYPOINTS) { - return insertWaypoint(url, values); - } else { - throw new IllegalArgumentException("Unknown URL " + url); + + int urlMatchType = urlMatcher.match(url); + return insertType(url, urlMatchType, values); + } + + private Uri insertType(Uri url, int urlMatchType, ContentValues values) { + switch (urlMatchType) { + case TRACKPOINTS: + return insertTrackPoint(url, values); + case TRACKS: + return insertTrack(url, values); + case WAYPOINTS: + return insertWaypoint(url, values); + default: + throw new IllegalArgumentException("Unknown URL " + url); } } + @Override + public int bulkInsert(Uri url, ContentValues[] valuesBulk) { + Log.d(MyTracksProvider.TAG, "MyTracksProvider.bulkInsert"); + int numInserted = 0; + try { + // Use a transaction in order to make the insertions run as a single batch + db.beginTransaction(); + + int urlMatch = urlMatcher.match(url); + for (numInserted = 0; numInserted < valuesBulk.length; numInserted++) { + ContentValues values = valuesBulk[numInserted]; + if (values == null) { values = new ContentValues(); } + + insertType(url, urlMatch, values); + } + + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + + return numInserted; + } + private Uri insertTrackPoint(Uri url, ContentValues values) { - Log.d(MyTracksProvider.TAG, "MyTracksProvider.insertTrackPoint"); boolean hasLat = values.containsKey(TrackPointsColumns.LATITUDE); boolean hasLong = values.containsKey(TrackPointsColumns.LONGITUDE); boolean hasTime = values.containsKey(TrackPointsColumns.TIME); diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java index 640ce6628..25f9e7ac1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java @@ -243,6 +243,17 @@ public interface MyTracksProviderUtils { */ Uri insertTrackPoint(Location location, long trackId); + /** + * Inserts multiple track points in a single operation. + * + * @param locations an array of locations to insert + * @param length the number of locations (from the beginning of the array) + * to actually insert, or -1 for all of them + * @param trackId the ID of the track to insert the points into + * @return the number of points inserted + */ + int bulkInsertTrackPoints(Location[] locations, int length, long trackId); + /** * Inserts a waypoint in the provider. * @@ -251,14 +262,6 @@ public interface MyTracksProviderUtils { */ Uri insertWaypoint(Waypoint waypoint); - /** - * Inserts a track including its track points in the provider. - * - * @param track the track to insert - * @return the content provider URI for the inserted track - */ - Uri insertTrackAndTrackPoints(Track track); - /** * Tests if a track with given id exists. * @@ -281,7 +284,7 @@ public interface MyTracksProviderUtils { * @param cursor a cursor pointing at a db or provider with locations * @return a new location object */ - public Location createLocation(Cursor cursor); + Location createLocation(Cursor cursor); /** * Creates a waypoint object from a given cursor. @@ -289,7 +292,7 @@ public interface MyTracksProviderUtils { * @param cursor a cursor pointing at a db or provider with waypoints. * @return a new waypoint object */ - public Waypoint createWaypoint(Cursor cursor); + Waypoint createWaypoint(Cursor cursor); /** * A factory which can produce instances of {@link MyTracksProviderUtils}, diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java index a720db509..4c24e8d58 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java @@ -855,8 +855,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { Cursor cursor = getLocationsCursor(track.getId(), startingPoint, buffer.getSize(), false); - final int idColumnIdx = - cursor.getColumnIndexOrThrow(TrackPointsColumns._ID); if (cursor == null) { Log.w(MyTracksProvider.TAG, "Cannot get a locations cursor!"); buffer.setInvalid(); @@ -875,6 +873,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { return; } + final int idColumnIdx = + cursor.getColumnIndexOrThrow(TrackPointsColumns._ID); do { Location location = createLocation(cursor); if (location == null) { @@ -915,6 +915,18 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { createContentValues(location, trackId)); } + @Override + public int bulkInsertTrackPoints(Location[] locations, int length, long trackId) { + if (length == -1) { length = locations.length; } + + ContentValues[] values = new ContentValues[length]; + for (int i = 0; i < length; i++) { + values[i] = createContentValues(locations[i], trackId); + } + + return context.getContentResolver().bulkInsert(TrackPointsColumns.CONTENT_URI, values); + } + @Override public Uri insertWaypoint(Waypoint waypoint) { Log.d(MyTracksProvider.TAG, "MyTracksProviderUtilsImpl.insertWaypoint"); @@ -923,31 +935,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { createContentValues(waypoint)); } - @Override - public Uri insertTrackAndTrackPoints(Track track) { - // Insert the track right away to have its ID - Uri trackUri = insertTrack(track); - long trackId = Long.parseLong(trackUri.getLastPathSegment()); - track.setId(trackId); - - // Insert all the points (associated with the track ID) - boolean firstPoint = true; - long pointId = -1; - for (Location location : track.getLocations()) { - Uri pointUri = insertTrackPoint(location, trackId); - pointId = Long.parseLong(pointUri.getLastPathSegment()); - if (firstPoint) { - track.setStartId(pointId); - firstPoint = false; - } - } - track.setStopId(pointId); - - // Update the track with the start and end point IDs - updateTrack(track); - return trackUri; - } - @Override public boolean trackExists(long id) { Cursor cursor = null; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImport.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxImport.java deleted file mode 100644 index 2bb46ab57..000000000 --- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImport.java +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.android.apps.mytracks.io; - -import com.google.android.apps.mytracks.content.Track; -import com.google.android.apps.mytracks.stats.TripStatisticsBuilder; -import com.google.android.apps.mytracks.util.MyTracksUtils; - -import android.location.Location; - -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -/** - * Helper class to parse a GPX file or string and convert it into a track - * object. - * - * TODO: See if we can use a SAX style parser as the DOM style - * parsing uses too much memory and will not allow import of very large GPX - * files (limit currently set to 500KB). - * - * @author Leif Hendrik Wilden - */ -public class GpxImport { - private static final SimpleDateFormat DATE_FORMAT1 = - new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ"); - private static final SimpleDateFormat DATE_FORMAT2 = - new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'"); - private static final SimpleDateFormat DATE_FORMAT3 = - new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - - /** - * Reads GPS tracks from a GPX file and append tracks and their coordinates to - * the given list of tracks. - * - * @param tracks a list of tracks - * @param filename a file name - * @throws SAXException a parsing error - * @throws ParserConfigurationException internal error - * @throws IOException a file reading problem - */ - public static void importGPXFile( - final String filename, final ArrayList tracks) - throws SAXException, ParserConfigurationException, IOException, - OutOfMemoryError { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = factory.newDocumentBuilder(); - File file = new File(filename); - if (file.length() > 500 * 1024) { - // Better to throw an error now then, to let the VM do it. If the VM does - // it, it will throw another exception while throwing the OutOfMemoryError - // and that will kill out app with a nasty error message. In that way we - // can at least display a reasonable message to the user and let her know - // what the problem is. - throw new OutOfMemoryError(); - } - Document doc = builder.parse(file); - importGPXDocument(tracks, doc); - } - - /** - * This is a utility class with only static members. - */ - private GpxImport() { - } - - /** - * Reads GPS tracks from a GPX document and append then to the given list of - * tracks. - * - * TODO: Break this method down into smaller ones - * - * @param tracks an array list of tracks - * @param doc a document - */ - public static void importGPXDocument( - final ArrayList tracks, final Document doc) { - NodeList trackNodes = doc.getElementsByTagName("trk"); - for (int n = 0; n < trackNodes.getLength(); n++) { - Track track = new Track(); - tracks.add(track); - ArrayList locations = track.getLocations(); - Location lastLocation = null; - - Node trkNode = trackNodes.item(n); - NodeList segmentNodes = trkNode.getChildNodes(); - ArrayList nodes = new ArrayList(); - int nSegments = 0; - for (int k = 0; k < segmentNodes.getLength(); k++) { - Node segmentNode = segmentNodes.item(k); - if (segmentNode.getNodeName().equals("name")) { - track.setName(segmentNode.getFirstChild().getNodeValue()); - } else if (segmentNode.getNodeName().equals("description")) { - track.setDescription(segmentNode.getFirstChild().getNodeValue()); - } else if (segmentNode.getNodeName().equals("trkseg")) { - if (nSegments > 0) { - // Add a segment separator: - Location location = new Location("gps"); - location.setLatitude(100.0); - location.setLongitude(100.0); - location.setAltitude(0); - if (locations.size() > 0) { - long pointTime = locations.get(locations.size() - 1).getTime(); - location.setTime(pointTime); - } - track.addLocation(location); - lastLocation = null; - } - nSegments++; - NodeList segmentChildren = segmentNode.getChildNodes(); - nodes.clear(); - for (int j = 0; j < segmentChildren.getLength(); j++) { - Node child = segmentChildren.item(j); - if (child.getNodeName().equals("trkpt")) { - nodes.add(child); - } - } - for (int i = 0; i < nodes.size(); i++) { - NamedNodeMap namedNodes = nodes.get(i).getAttributes(); - double lat = Double.parseDouble(namedNodes.getNamedItem("lat") - .getNodeValue()); - double lon = Double.parseDouble(namedNodes.getNamedItem("lon") - .getNodeValue()); - NodeList children = nodes.get(i).getChildNodes(); - Node elementNode = null; - Node timeNode = null; - for (int j = 0; j < children.getLength(); j++) { - Node child = children.item(j); - if (child.getNodeName().equals("ele")) { - elementNode = child; - } else if (child.getNodeName().equals("time")) { - timeNode = child; - } - } - String altitudeStr = null; - if (elementNode != null) { - altitudeStr = elementNode.getFirstChild().getNodeValue(); - } else { - altitudeStr = "0"; - } - String timeContents = null; - if (timeNode != null) { - timeContents = timeNode.getFirstChild().getNodeValue(); - } else { - timeContents = ""; - } - double altitude = Double.parseDouble(altitudeStr); - long t = -1; - try { - // 1st try with time zone at end a la "+0000" - t = DATE_FORMAT1.parse(timeContents).getTime(); - } catch (ParseException e) { - // if that fails, try with a literal "Z" at the end (this is not - // according to xml standard, but some gpx files are like that): - try { - t = DATE_FORMAT2.parse(timeContents).getTime(); - } catch (ParseException ex) { - // some gpx timestamps have 3 additional digits at the end. - try { - t = DATE_FORMAT3.parse(timeContents).getTime(); - } catch (ParseException exc) { - t = 0; - } - } - } - - Location location = new Location("gps"); - location.setLatitude(lat); - location.setLongitude(lon); - location.setAltitude(altitude); - location.setTime(t); - // We don't have a speed and bearing in GPX, make something up from - // the last two points: - if (lastLocation != null) { - final long dt = location.getTime() - lastLocation.getTime(); - if (dt > 0) { - final float speed = - location.distanceTo(lastLocation) / (dt / 1000); - location.setSpeed(speed); - } - location.setBearing(lastLocation.bearingTo(location)); - } - lastLocation = location; - if (MyTracksUtils.isValidLocation(location)) { - track.addLocation(location); - } - } - - if (locations.size() > 0) { - long startTime = locations.get(0).getTime(); - - // Calculate statistics for the imported track - TripStatisticsBuilder statsBuilder = new TripStatisticsBuilder(); - statsBuilder.resumeAt(startTime); - for (Location location : locations) { - if (MyTracksUtils.isValidLocation(location)) { - /* Any time works here. The totalTime will be set by "pauseAt" later: */ - statsBuilder.addLocation(location, location.getTime()); - } - } - - long lastPointTime = locations.get(locations.size() - 1).getTime(); - statsBuilder.pauseAt(lastPointTime); - - track.setStatistics(statsBuilder.getStatistics()); - } - } - } - } - } -} diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java new file mode 100644 index 000000000..c16678e03 --- /dev/null +++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java @@ -0,0 +1,574 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks.io; + +import com.google.android.apps.mytracks.MyTracksConstants; +import com.google.android.apps.mytracks.content.MyTracksProviderUtils; +import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.stats.TripStatisticsBuilder; +import com.google.android.apps.mytracks.util.MyTracksUtils; + +import android.location.Location; +import android.location.LocationManager; +import android.net.Uri; +import android.util.Log; + +import java.io.IOException; +import java.io.InputStream; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.SimpleTimeZone; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +/** + * Imports GPX XML files to the my tracks provider. + * + * TODO: Show progress indication to the user. + * + * @author Leif Hendrik Wilden + * @author Steffen Horlacher + * @author Rodrigo Damazio + */ +public class GpxImporter extends DefaultHandler { + + /* + * Different date formats used in GPX files + */ + static final SimpleDateFormat DATE_FORMAT1 = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ssZ"); + static final SimpleDateFormat DATE_FORMAT2 = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss'Z'"); + static final SimpleDateFormat DATE_FORMAT3 = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + static final SimpleTimeZone UTC_TIMEZONE = new SimpleTimeZone(0, "UTC"); + + /* + * GPX-XML tag names and attributes. + */ + private static final String TAG_TRACK = "trk"; + private static final String TAG_TRACK_POINT = "trkpt"; + private static final Object TAG_TRACK_SEGMENT = "trkseg"; + private static final String TAG_NAME = "name"; + private static final String TAG_DESCRIPTION = "desc"; + private static final String TAG_ALTITUDE = "ele"; + private static final String TAG_TIME = "time"; + private static final String ATT_LAT = "lat"; + private static final String ATT_LON = "lon"; + + /** + * The maximum number of locations to buffer for bulk-insertion into the database. + */ + private static final int MAX_BUFFERED_LOCATIONS = 512; + + /** + * Utilities for accessing the contnet provider. + */ + private final MyTracksProviderUtils providerUtils; + + /** + * List of track ids written in the database. Only contains successfully + * written tracks. + */ + private final List tracksWritten; + + /** + * Contains the current elements content. + */ + private String content; + + /** + * Currently reading location. + */ + private Location location; + + /** + * Previous location, required for calculations. + */ + private Location lastLocation; + + /** + * Currently reading track. + */ + private Track track; + + /** + * Statistics builder for the current track. + */ + private TripStatisticsBuilder statsBuilder; + + /** + * Buffer of locations to be bulk-inserted into the database. + */ + private Location[] bufferedPointInserts = new Location[MAX_BUFFERED_LOCATIONS]; + + /** + * Number of locations buffered to be inserted into the database. + */ + private int numBufferedPointInserts = 0; + + /** + * Number of locations already processed. + */ + private int numberOfLocations; + + /** + * Number of segments already processed. + */ + private int numberOfSegments; + + /** + * Used to identify if a track was written to the database but not yet + * finished successfully. + */ + private boolean isCurrentTrackRollbackable; + + /** + * Flag to indicate if we're inside a track's xml element. + * Some sub elements like name may be used in other parts of the gpx file, + * and we use this to ignore them. + */ + private boolean isInTrackElement; + + /** + * Counter to find out which child level of track we are processing. + */ + private int trackChildDepth; + + /** + * SAX-Locator to get current line information. + */ + private Locator locator; + private Location lastSegmentLocation; + + /** + * Reads GPS tracks from a GPX file and writes tracks and their coordinates to + * the database. + * + * @param tracks a list of tracks + * @param is a input steam with gpx-xml data + * @return long[] array of track ids written in the database + * @throws SAXException a parsing error + * @throws ParserConfigurationException internal error + * @throws IOException a file reading problem + */ + public static long[] importGPXFile(final InputStream is, + final MyTracksProviderUtils providerUtils) + throws ParserConfigurationException, SAXException, IOException { + SAXParserFactory factory = SAXParserFactory.newInstance(); + GpxImporter handler = new GpxImporter(providerUtils); + SAXParser parser = factory.newSAXParser(); + long[] trackIds = null; + + try { + long start = System.currentTimeMillis(); + + parser.parse(is, handler); + + long end = System.currentTimeMillis(); + Log.d(MyTracksConstants.TAG, "Total import time: " + (end - start) + "ms"); + + trackIds = handler.getImportedTrackIds(); + } finally { + // delete track if not finished + handler.rollbackUnfinishedTracks(); + } + + return trackIds; + } + + /** + * Constructor, requires providerUtils for writing tracks the database. + */ + public GpxImporter(MyTracksProviderUtils providerUtils) { + this.providerUtils = providerUtils; + tracksWritten = new ArrayList(); + } + + @Override + public void characters(char[] ch, int start, int length) throws SAXException { + String newContent = new String(ch, start, length); + if (content == null) { + content = newContent; + } else { + // In 99% of the cases, a single call to this method will be made for each + // sequence of characters we're interested in, so we'll rarely be + // concatenating strings, thus not justifying the use of a StringBuilder. + content += newContent; + } + } + + @Override + public void startElement(String uri, String localName, String name, + Attributes attributes) throws SAXException { + if (isInTrackElement) { + trackChildDepth++; + if (localName.equals(TAG_TRACK_POINT)) { + onTrackPointElementStart(attributes); + } else if (localName.equals(TAG_TRACK_SEGMENT)) { + onTrackSegmentElementStart(); + } else if (localName.equals(TAG_TRACK)) { + String msg = createErrorMessage("Invalid GPX-XML detected"); + throw new SAXException(msg); + } + } else if (localName.equals(TAG_TRACK)) { + isInTrackElement = true; + trackChildDepth = 0; + onTrackElementStart(); + } + } + + @Override + public void endElement(String uri, String localName, String name) + throws SAXException { + if (!isInTrackElement) { return; } + + // process these elements only as sub-elements of track + if (localName.equals(TAG_TRACK_POINT)) { + onTrackPointElementEnd(); + } else if (localName.equals(TAG_ALTITUDE)) { + onAltitudeElementEnd(); + } else if (localName.equals(TAG_TIME)) { + onTimeElementEnd(); + } else if (localName.equals(TAG_NAME)) { + // we are only interested in the first level name element + if (trackChildDepth == 1) { + onNameElementEnd(); + } + } else if (localName.equals(TAG_DESCRIPTION)) { + // we are only interested in the first level description element + if (trackChildDepth == 1) { + onDescriptionElementEnd(); + } + } else if (localName.equals(TAG_TRACK_SEGMENT)) { + onTrackSegmentElementEnd(); + } else if (localName.equals(TAG_TRACK)) { + onTrackElementEnd(); + isInTrackElement = false; + trackChildDepth = 0; + } + trackChildDepth--; + + // reset element content + content = null; + } + + @Override + public void setDocumentLocator(Locator locator) { + this.locator = locator; + } + + /** + * Create a new Track object and insert empty track in database. Track will be + * updated with missing values later. + */ + private void onTrackElementStart() { + track = new Track(); + numberOfLocations = 0; + + Uri trackUri = providerUtils.insertTrack(track); + long trackId = Long.parseLong(trackUri.getLastPathSegment()); + track.setId(trackId); + isCurrentTrackRollbackable = true; + } + + private void onDescriptionElementEnd() { + track.setDescription(content.toString().trim()); + } + + private void onNameElementEnd() { + track.setName(content.toString().trim()); + } + + /** + * Track segment started. + */ + private void onTrackSegmentElementStart() { + if (numberOfSegments > 0) { + // Add a segment separator: + location = new Location(LocationManager.GPS_PROVIDER); + location.setLatitude(100.0); + location.setLongitude(100.0); + location.setAltitude(0); + if (lastLocation != null) { + location.setTime(lastLocation.getTime()); + } + insertTrackPoint(location); + lastLocation = location; + lastSegmentLocation = null; + location = null; + } + + numberOfSegments++; + } + + /** + * Reads trackpoint attributes and assigns them to the current location. + * + * @param attributes xml attributes + */ + private void onTrackPointElementStart(Attributes attributes) throws SAXException { + if (location != null) { + String errorMsg = createErrorMessage("Found a track point inside another one."); + throw new SAXException(errorMsg); + } + + location = createLocationFromAttributes(attributes); + } + + /** + * Creates and returns a location with the position parsed from the given + * attributes. + * + * @param attributes the attributes to parse + * @return the created location + * @throws SAXException if the attributes cannot be parsed + */ + private Location createLocationFromAttributes(Attributes attributes) throws SAXException { + String latitude = attributes.getValue(ATT_LAT); + String longitude = attributes.getValue(ATT_LON); + + if (latitude == null || longitude == null) { + throw new SAXException(createErrorMessage("Point with no longitude or latitude")); + } + + // create new location and set attributes + Location loc = new Location(LocationManager.GPS_PROVIDER); + loc.setLatitude(Double.parseDouble(latitude)); + loc.setLongitude(Double.parseDouble(longitude)); + return loc; + } + + /** + * Track point finished, write in database. + * + * @throws SAXException - thrown if track point is invalid + */ + private void onTrackPointElementEnd() throws SAXException { + if (MyTracksUtils.isValidLocation(location)) { + statsBuilder.addLocation(location, location.getTime()); + + // insert in db + insertTrackPoint(location); + + // first track point? + if (lastLocation == null && numberOfSegments == 1) { + track.setStartId(getLastPointId()); + } + + lastLocation = location; + lastSegmentLocation = location; + location = null; + } else { + // invalid location - abort import + String msg = createErrorMessage("Invalid location detected: " + location); + throw new SAXException(msg); + } + } + + private void insertTrackPoint(Location loc) { + bufferedPointInserts[numBufferedPointInserts] = loc; + numBufferedPointInserts++; + numberOfLocations++; + + if (numBufferedPointInserts >= MAX_BUFFERED_LOCATIONS) { + flushPointInserts(); + } + } + + private void flushPointInserts() { + if (numBufferedPointInserts <= 0) { return; } + + providerUtils.bulkInsertTrackPoints(bufferedPointInserts, numBufferedPointInserts, track.getId()); + numBufferedPointInserts = 0; + } + + /** + * Track segment finished. + */ + private void onTrackSegmentElementEnd() { + // Nothing to be done + } + + /** + * Track finished - update in database. + */ + private void onTrackElementEnd() { + if (lastLocation != null) { + flushPointInserts(); + + // Calculate statistics for the imported track and update + statsBuilder.pauseAt(lastLocation.getTime()); + track.setStopId(getLastPointId()); + track.setNumberOfPoints(numberOfLocations); + track.setStatistics(statsBuilder.getStatistics()); + providerUtils.updateTrack(track); + tracksWritten.add(track.getId()); + isCurrentTrackRollbackable = false; + lastSegmentLocation = null; + lastLocation = null; + statsBuilder = null; + } else { + // track contains no track points makes no real + // sense to import it as we have no location + // information -> roll back + rollbackUnfinishedTracks(); + } + } + + /** + * Setting time and doing additional calculations as this is the last value + * required. Also sets the start time for track and statistics as there is no + * start time in the track root element. + * + * @throws SAXException on parsing errors + */ + private void onTimeElementEnd() throws SAXException { + if (location == null) { return; } + + long time = parseTimeForAllFormats(content); + if (lastSegmentLocation != null) { + long timeDifference = time - lastSegmentLocation.getTime(); + + // check for negative time change + if (timeDifference < 0) { + String msg = createErrorMessage("Found negative time change."); + throw new SAXException(msg); + } + + // We don't have a speed and bearing in GPX, make something up from + // the last two points. + // TODO GPS points tend to have some inherent imprecision, + // speed and bearing will likely be off, so the statistics for things like + // max speed will also be off. + float speed = location.distanceTo(lastLocation) * 1000.0f / timeDifference; + location.setSpeed(speed); + location.setBearing(lastSegmentLocation.bearingTo(location)); + } + + location.setTime(time); + // initialize start time with time of first track point + if (statsBuilder == null) { + statsBuilder = new TripStatisticsBuilder(); + statsBuilder.resumeAt(time); + } + } + + private void onAltitudeElementEnd() { + if (location != null) { + location.setAltitude(Double.parseDouble(content)); + } + } + + /** + * Deletes the last track if it was not completely imported. + */ + public void rollbackUnfinishedTracks() { + if (isCurrentTrackRollbackable) { + providerUtils.deleteTrack(track.getId()); + isCurrentTrackRollbackable = false; + } + } + + /** + * Get all track ids of the tracks created by this importer run. + * + * @return array of track ids + */ + private long[] getImportedTrackIds() { + // Convert from java.lang.Long for convenience + long[] result = new long[tracksWritten.size()]; + for (int i = 0; i < result.length; i++) { + result[i] = tracksWritten.get(i); + } + return result; + } + + /** + * Parse time trying different formats used in GPX files. + * + * @param timeContents string with time information + * @return time as long + * @throws SAXException on time parsing errors + */ + private long parseTimeForAllFormats(String timeContents) throws SAXException { + long time; + timeContents = timeContents.trim(); + + // 1st try with time zone at end a la "+0000" + time = parseTime(timeContents, DATE_FORMAT1); + if (time > -1) { return time; } + + // if that fails, try with a literal "Z" at the end + // (this is not according to xml standard, but some gpx files are like + // that): + time = parseTime(timeContents, DATE_FORMAT2); + if (time > -1) { return time; } + + // some gpx timestamps have 3 additional digits at the end. + time = parseTime(timeContents, DATE_FORMAT3); + if (time > -1) { return time; } + + // everything failed - abort the import + String msg = createErrorMessage("Invalid time format: " + timeContents); + throw new SAXException(msg); + } + + private long parseTime(String timeContents, SimpleDateFormat formatParam) { + SimpleDateFormat format = formatParam; + try { + format.setTimeZone(UTC_TIMEZONE); + return format.parse(timeContents).getTime(); + } catch (ParseException ex) { + return -1; + } + } + + /** + * Returns the ID of the last point inserted into the database. + */ + private long getLastPointId() { + flushPointInserts(); + + return providerUtils.getLastLocationId(track.getId()); + } + + /** + * Builds a parsing error message with current line information. + * + * @param details details about the error, will be appended + * @return error message string with current line information + */ + private String createErrorMessage(String details) { + StringBuffer msg = new StringBuffer(); + msg.append("Parsing error at line: "); + msg.append(locator.getLineNumber()); + msg.append(" column: "); + msg.append(locator.getColumnNumber()); + msg.append(". "); + msg.append(details); + return msg.toString(); + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java index 163e29b03..448b820d1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java @@ -112,7 +112,9 @@ public class SendToDocs { SharedPreferences preferences = activity.getSharedPreferences( MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + metricUnits = + preferences.getBoolean(activity.getString(R.string.metric_units_key), + true); } else { metricUnits = true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java index cfebe4539..a5a89564f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java @@ -264,7 +264,9 @@ public class SendToMyMaps { MyTracksSettings.SETTINGS_NAME, 0); boolean metricUnits = true; if (preferences != null) { - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + metricUnits = + preferences.getBoolean(context.getString(R.string.metric_units_key), + true); } // For the progress monitor: @@ -390,7 +392,7 @@ public class SendToMyMaps { boolean mapPublic = true; if (preferences != null) { mapPublic = preferences.getBoolean( - MyTracksSettings.DEFAULT_MAP_PUBLIC, true); + context.getString(R.string.default_map_public_key), true); } metaData.setSearchable(mapPublic); Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java new file mode 100644 index 000000000..0a8b912d6 --- /dev/null +++ b/MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java @@ -0,0 +1,191 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks.io; + +import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.content.Waypoint; +import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat; + +import android.location.Location; +import android.os.Build; +import android.os.Environment; + +import java.io.OutputStream; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +/** + * Write out a a track in the Garmin training center database, tcx format. + * As defined by: + * http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 + * + * @author Sandor Dornbush + */ +public class TcxTrackWriter implements TrackFormatWriter { + + private PrintWriter pw = null; + private Track track; + + static final SimpleDateFormat TIMESTAMP_FORMAT = + new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + { + TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + } + + public TcxTrackWriter() { + } + + @Override + public void prepare(Track track, OutputStream out) { + this.track = track; + this.pw = new PrintWriter(out); + + } + + @Override + public void close() { + if (pw != null) { + pw.close(); + pw = null; + } + } + + @Override + public String getDefaultDirectory() { + return Environment.getExternalStorageDirectory() + + System.getProperty("file.separator") + getExtension(); + } + + @Override + public String getExtension() { + return TrackFileFormat.TCX.getExtension(); + } + + @Override + public void writeHeader() { + if (pw == null) { + return; + } + pw.println(""); + pw.print(""); + pw.println(); + } + + @Override + public void writeBeginTrack(Location firstPoint) { + if (pw == null) { + return; + } + pw.println(" "); + pw.print(" "); + pw.print(" "); + pw.print(TIMESTAMP_FORMAT.format(track.getStatistics().getStartTime())); + pw.println(""); + pw.println(" "); + pw.print(" "); + pw.print(track.getStatistics().getTotalTime() / 1000); + pw.println(""); + pw.print(" "); + pw.print(track.getStatistics().getTotalDistance()); + pw.println(""); + // TODO max speed etc. + // Calories are a required element just put in 0. + pw.print("0"); + pw.println("Active"); + pw.println("Manual)"); + } + + @Override + public void writeOpenSegment() { + if (pw != null) { + pw.println(" "); + } + } + + @Override + public void writeLocation(Location location) { + if (pw == null) { + return; + } + pw.println(" "); + Date d = new Date(location.getTime()); + pw.println(" "); + pw.println(" "); + + pw.print(" "); + pw.print(location.getLatitude()); + pw.println(""); + + pw.print(" "); + pw.print(location.getLongitude()); + pw.println(""); + + pw.println(" "); + pw.print(" "); + pw.print(location.getAltitude()); + pw.println(""); + + pw.println(" "); + } + + @Override + public void writeCloseSegment() { + if (pw != null) { + pw.println(" "); + } + } + + @Override + public void writeEndTrack(Location lastPoint) { + if (pw == null) { + return; + } + pw.println(" "); + pw.print(" "); + pw.print(""); + pw.print(Build.MODEL); + pw.print(""); + pw.println(")"); + pw.println(" "); + pw.println(" "); + } + + @Override + public void writeFooter() { + if (pw == null) { + return; + } + pw.print(" "); + pw.print("My Tracks by Google"); + pw.println(""); + pw.println(""); + } + + @Override + public void writeWaypoint(Waypoint waypoint) { + // TODO Write out the waypoints somewhere. + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java index 98e7c177b..bc3c15ddd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriterFactory.java @@ -49,6 +49,12 @@ public class TrackWriterFactory { public TrackFormatWriter newFormatWriter(Context context) { return new CsvTrackWriter(); } + }, + TCX { + @Override + public TrackFormatWriter newFormatWriter(Context context) { + return new TcxTrackWriter(); + } }; /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java new file mode 100644 index 000000000..5128ceca0 --- /dev/null +++ b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java @@ -0,0 +1,142 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks.services; + +import android.content.SharedPreferences; +import android.util.Log; + +import com.google.android.apps.mytracks.MyTracksConstants; +import com.google.android.apps.mytracks.MyTracksSettings; +import com.google.android.maps.mytracks.R; + +/** + * A class that manages reading the shared preferences for the service. + * + * @author Sandor Dornbush + */ +public class PreferenceManager { + private TrackRecordingService service; + private String announcement_frequency_key; + private String max_recording_distance_key; + private String metric_units_key; + private String min_recording_distance_key; + private String min_recording_interval_key; + private String min_required_accuracy_key; + private String signal_sampling_frequency_key; + private String split_frequency_key; + + public PreferenceManager(TrackRecordingService service) { + this.service = service; + announcement_frequency_key = + service.getString(R.string.announcement_frequency_key); + max_recording_distance_key = + service.getString(R.string.max_recording_distance_key); + metric_units_key = + service.getString(R.string.metric_units_key); + min_recording_distance_key = + service.getString(R.string.min_recording_distance_key); + min_recording_interval_key = + service.getString(R.string.min_recording_interval_key); + min_required_accuracy_key = + service.getString(R.string.min_required_accuracy_key); + split_frequency_key = + service.getString(R.string.split_frequency_key); + signal_sampling_frequency_key = + service.getString(R.string.signal_sampling_frequency_key); + } + + /** + * Notifies that preferences have changed. + * Call this with key == null to update all preferences in one call. + * + * @param key the key that changed (may be null to update all preferences) + */ + public void onSharedPreferenceChanged(String key) { + SharedPreferences sharedPreferences = + service.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); + if (sharedPreferences == null) { + Log.w(MyTracksConstants.TAG, + "TrackRecordingService: Couldn't get shared preferences."); + return; + } + + if (key == null || key.equals(min_recording_distance_key)) { + service.setMinRecordingDistance( + sharedPreferences.getInt( + min_recording_distance_key, + MyTracksSettings.DEFAULT_MIN_RECORDING_DISTANCE)); + Log.d(MyTracksConstants.TAG, + "TrackRecordingService: minRecordingDistance = " + + service.getMinRecordingDistance()); + } + if (key == null || key.equals(max_recording_distance_key)) { + service.setMaxRecordingDistance( + sharedPreferences.getInt( + max_recording_distance_key, + MyTracksSettings.DEFAULT_MAX_RECORDING_DISTANCE)); + } + if (key == null || key.equals(min_recording_interval_key)) { + int minRecordingInterval = sharedPreferences.getInt( + min_recording_interval_key, + MyTracksSettings.DEFAULT_MIN_RECORDING_INTERVAL); + switch (minRecordingInterval) { + case -2: + // Battery Miser + // min: 30 seconds + // max: 5 minutes + // minDist: 5 meters Choose battery life over moving time accuracy. + service.setLocationListenerPolicy( + new AdaptiveLocationListenerPolicy(30000, 300000, 5)); + break; + case -1: + // High Accuracy + // min: 1 second + // max: 30 seconds + // minDist: 0 meters get all updates to properly measure moving time. + service.setLocationListenerPolicy( + new AdaptiveLocationListenerPolicy(1000, 30000, 0)); + break; + default: + service.setLocationListenerPolicy( + new AbsoluteLocationListenerPolicy(minRecordingInterval * 1000)); + } + } + if (key == null || key.equals(min_required_accuracy_key)) { + service.setMinRequiredAccuracy( + sharedPreferences.getInt( + min_required_accuracy_key, + MyTracksSettings.DEFAULT_MIN_REQUIRED_ACCURACY)); + } + if (key == null || key.equals(announcement_frequency_key)) { + service.setAnnouncementFrequency( + sharedPreferences.getInt(announcement_frequency_key, + -1)); + } + if (key == null || key.equals(split_frequency_key)) { + service.getSplitManager().setSplitFrequency( + sharedPreferences.getInt(split_frequency_key, 0)); + } + if (key == null || key.equals(signal_sampling_frequency_key)) { + service.getSignalManager().setFrequency( + sharedPreferences.getInt( + signal_sampling_frequency_key, -1), service); + } + if (key == null || key.equals(metric_units_key)) { + service.getSplitManager().setMetricUnits(sharedPreferences.getBoolean( + metric_units_key, true)); + } + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java index d0ec9a41e..ba0f0cf52 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java @@ -116,10 +116,12 @@ public class StatusAnnouncerTask boolean metricUnits = true; boolean reportSpeed = true; if (preferences != null) { - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, - true); - reportSpeed = preferences.getBoolean(MyTracksSettings.REPORT_SPEED, - true); + metricUnits = + preferences.getBoolean(context.getString(R.string.metric_units_key), + true); + reportSpeed = + preferences.getBoolean(context.getString(R.string.report_speed_key), + true); } double d = stats.getTotalDistance() / 1000; diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java index fc952387d..65eebf418 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java @@ -1,12 +1,12 @@ /* * Copyright 2008 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -56,7 +56,7 @@ import java.util.TimerTask; /** * A background service that registers a location listener and records track * points. Track points are saved to the MyTracksProvider. - * + * * @author Leif Hendrik Wilden */ public class TrackRecordingService extends Service implements LocationListener { @@ -68,8 +68,6 @@ public class TrackRecordingService extends Service implements LocationListener { private LocationManager locationManager; private WakeLock wakeLock; - private int minRecordingInterval = - MyTracksSettings.DEFAULT_MIN_RECORDING_INTERVAL; private int minRecordingDistance = MyTracksSettings.DEFAULT_MIN_RECORDING_DISTANCE; private int maxRecordingDistance = @@ -110,8 +108,10 @@ public class TrackRecordingService extends Service implements LocationListener { private TaskExecuterManager signalManager; private SplitManager splitManager; + private PreferenceManager prefManager; + /** - * The interval in milliseconds that we have requested to be notfied of gps + * The interval in milliseconds that we have requested to be notified of gps * readings. */ private long currentRecordingInterval = 0; @@ -126,7 +126,7 @@ public class TrackRecordingService extends Service implements LocationListener { * Task invoked by a timer periodically to make sure the location listener is * still registered. */ - private TimerTask checkLocationListener = new TimerTask() { + private final TimerTask checkLocationListener = new TimerTask() { @Override public void run() { if (!onCreateWasCalled) { @@ -198,7 +198,7 @@ public class TrackRecordingService extends Service implements LocationListener { /** * Inserts a new location in the track points db and updates the corresponding * track in the track db. - * + * * @param recordingTrack the track that is currently being recorded * @param location the location to be inserted * @param lastRecordedLocation the last recorded location before this one (or @@ -475,8 +475,7 @@ public class TrackRecordingService extends Service implements LocationListener { } // This should never happen, but just in case (we really don't want the - // service - // to crash): + // service to crash): if (location == null) { Log.w(MyTracksConstants.TAG, "Location changed, but location is null."); @@ -559,8 +558,7 @@ public class TrackRecordingService extends Service implements LocationListener { } // If separation from last recorded point is too large insert a - // separator - // to indicate end of a segment: + // separator to indicate end of a segment: boolean startNewSegment = lastRecordedLocation != null && lastRecordedLocation.getLatitude() < 90 @@ -620,7 +618,7 @@ public class TrackRecordingService extends Service implements LocationListener { */ /** - * Notifies that preferences have changed. + * Notifies that preferences have changed. * Call this with key == null to update all preferences in one call. * * @param key the key that changed (may be null to update all preferences) @@ -628,93 +626,7 @@ public class TrackRecordingService extends Service implements LocationListener { public void onSharedPreferenceChanged(String key) { Log.d(MyTracksConstants.TAG, "TrackRecordingService.onSharedPreferenceChanged"); - SharedPreferences sharedPreferences = - getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); - if (sharedPreferences == null) { - Log.w(MyTracksConstants.TAG, - "TrackRecordingService: Couldn't get shared preferences."); - return; - } - - if (key == null || key.equals(MyTracksSettings.MIN_RECORDING_DISTANCE)) { - minRecordingDistance = sharedPreferences.getInt( - MyTracksSettings.MIN_RECORDING_DISTANCE, - MyTracksSettings.DEFAULT_MIN_RECORDING_DISTANCE); - Log.d(MyTracksConstants.TAG, - "TrackRecordingService: minRecordingDistance = " - + minRecordingDistance); - } - if (key == null || key.equals(MyTracksSettings.MAX_RECORDING_DISTANCE)) { - maxRecordingDistance = sharedPreferences.getInt( - MyTracksSettings.MAX_RECORDING_DISTANCE, - MyTracksSettings.DEFAULT_MAX_RECORDING_DISTANCE); - } - if (key == null || key.equals(MyTracksSettings.MIN_RECORDING_INTERVAL)) { - minRecordingInterval = sharedPreferences.getInt( - MyTracksSettings.MIN_RECORDING_INTERVAL, - MyTracksSettings.DEFAULT_MIN_RECORDING_INTERVAL); - switch (minRecordingInterval) { - case -2: - // Battery Miser - // min: 30 seconds - // max: 5 minutes - // minDist: 5 meters Choose battery life over moving time accuracy. - locationListenerPolicy = - new AdaptiveLocationListenerPolicy(30000, 300000, 5); - break; - case -1: - // High Accuracy - // min: 1 second - // max: 30 seconds - // minDist: 0 meters get all updates to properly measure moving time. - locationListenerPolicy = - new AdaptiveLocationListenerPolicy(1000, 30000, 0); - break; - default: - locationListenerPolicy = - new AbsoluteLocationListenerPolicy(minRecordingInterval * 1000); - } - } - if (key == null || key.equals(MyTracksSettings.MIN_REQUIRED_ACCURACY)) { - minRequiredAccuracy = sharedPreferences.getInt( - MyTracksSettings.MIN_REQUIRED_ACCURACY, - MyTracksSettings.DEFAULT_MIN_REQUIRED_ACCURACY); - } - if (key == null || key.equals(MyTracksSettings.RECORDING_TRACK)) { - recordingTrackId = - sharedPreferences.getLong(MyTracksSettings.RECORDING_TRACK, -1); - } - if (key == null || key.equals(MyTracksSettings.ANNOUNCEMENT_FREQUENCY)) { - announcementFrequency = - sharedPreferences.getInt(MyTracksSettings.ANNOUNCEMENT_FREQUENCY, -1); - if (mTTSAvailable) { - if (announcementFrequency == -1) { - if (executer != null) { - executer.shutdown(); - executer = null; - } - } else { - if (executer == null) { - SafeStatusAnnouncerTask announcer = - new SafeStatusAnnouncerTask(this); - executer = new PeriodicTaskExecuter(announcer, this); - } - executer.scheduleTask(announcementFrequency * 60000); - } - } - } - if (key == null || key.equals(MyTracksSettings.SPLIT_FREQUENCY)) { - splitManager.setSplitFrequency( - sharedPreferences.getInt(MyTracksSettings.SPLIT_FREQUENCY, 0)); - } - if (key == null || key.equals(MyTracksSettings.SIGNAL_SAMPLING_FREQUENCY)) { - signalManager.setFrequency(sharedPreferences.getInt( - MyTracksSettings.SIGNAL_SAMPLING_FREQUENCY, -1), this); - } - if (key == null || key.equals(MyTracksSettings.METRIC_UNITS)) { - splitManager.setMetricUnits( - sharedPreferences.getBoolean(MyTracksSettings.METRIC_UNITS, true)); - } + prefManager.onSharedPreferenceChanged(key); if (isRecording) { registerLocationListener(); @@ -730,7 +642,6 @@ public class TrackRecordingService extends Service implements LocationListener { Log.d(MyTracksConstants.TAG, "TrackRecordingService.onCreate"); super.onCreate(); onCreateWasCalled = true; - setForeground(true); providerUtils = MyTracksProviderUtils.Factory.get(this); notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); @@ -748,6 +659,7 @@ public class TrackRecordingService extends Service implements LocationListener { signalManager = new TaskExecuterManager(-1, new SignalStrengthTask(this), this); } + prefManager = new PreferenceManager(this); onSharedPreferenceChanged(null); restoreStats(); registerLocationListener(); @@ -815,7 +727,7 @@ public class TrackRecordingService extends Service implements LocationListener { /** * Inserts a statistics marker. A statistics marker holds the stats for the * last segment up to this marker. - * + * * @param location the location where to insert * @return the unique id of the inserted marker */ @@ -872,7 +784,7 @@ public class TrackRecordingService extends Service implements LocationListener { public boolean hasRecorded() { return providerUtils.getLastTrackId() >= 0; } - + @Override public long startNewTrack() { Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack"); @@ -903,11 +815,11 @@ public class TrackRecordingService extends Service implements LocationListener { signalManager.restore(); return trackId; } - + /** * Insert the given waypoint marker. Users can insert waypoint markers * to tag locations with a name, description, category etc. - * + * * @param waypoint a waypoint * @return the unique id of the inserted marker */ @@ -915,11 +827,11 @@ public class TrackRecordingService extends Service implements LocationListener { public long insertWaypointMarker(Waypoint waypoint) { return TrackRecordingService.this.insertWaypointMarker(waypoint); } - + /** * Insert a statistics marker. A statistics marker holds the stats for * the last segment up to this marker. - * + * * @param location the location where to insert * @return the unique id of the inserted marker */ @@ -927,7 +839,7 @@ public class TrackRecordingService extends Service implements LocationListener { public long insertStatisticsMarker(Location location) { return TrackRecordingService.this.insertStatisticsMarker(location); } - + @Override public void endCurrentTrack() { Log.d(MyTracksConstants.TAG, "TrackRecordingService.endCurrentTrack"); @@ -952,18 +864,18 @@ public class TrackRecordingService extends Service implements LocationListener { showNotification(); recordingTrackId = -1; } - + @Override public void deleteAllTracks() { endCurrentTrack(); providerUtils.deleteAllTracks(); } - + @Override public void recordLocation(Location loc) { onLocationChanged(loc); } - + @Override public void sharedPreferenceChanged(String key) { Log.d(MyTracksConstants.TAG, @@ -983,4 +895,68 @@ public class TrackRecordingService extends Service implements LocationListener { long getRecordingTrackId() { return recordingTrackId; } + + public int getAnnouncementFrequency() { + return announcementFrequency; + } + + public void setAnnouncementFrequency(int announcementFrequency) { + this.announcementFrequency = announcementFrequency; + if (mTTSAvailable) { + if (announcementFrequency == -1) { + if (executer != null) { + executer.shutdown(); + executer = null; + } + } else { + if (executer == null) { + SafeStatusAnnouncerTask announcer = + new SafeStatusAnnouncerTask(this); + executer = new PeriodicTaskExecuter(announcer, this); + } + executer.scheduleTask(announcementFrequency * 60000); + } + } + } + + public int getMaxRecordingDistance() { + return maxRecordingDistance; + } + + public void setMaxRecordingDistance(int maxRecordingDistance) { + this.maxRecordingDistance = maxRecordingDistance; + } + + public int getMinRecordingDistance() { + return minRecordingDistance; + } + + public void setMinRecordingDistance(int minRecordingDistance) { + this.minRecordingDistance = minRecordingDistance; + } + + public int getMinRequiredAccuracy() { + return minRequiredAccuracy; + } + + public void setMinRequiredAccuracy(int minRequiredAccuracy) { + this.minRequiredAccuracy = minRequiredAccuracy; + } + + public LocationListenerPolicy getLocationListenerPolicy() { + return locationListenerPolicy; + } + + public void setLocationListenerPolicy( + LocationListenerPolicy locationListenerPolicy) { + this.locationListenerPolicy = locationListenerPolicy; + } + + public SplitManager getSplitManager() { + return splitManager; + } + + public TaskExecuterManager getSignalManager() { + return signalManager; + } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsBuilder.java b/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsBuilder.java index 9724ba727..f0107e832 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsBuilder.java +++ b/MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsBuilder.java @@ -347,6 +347,8 @@ public class TripStatisticsBuilder { * Returns the amount of time the user has been idle or 0 if they are moving. */ public long getIdleTime() { + if (lastLocation == null || lastMovingLocation == null) + return 0; return lastLocation.getTime() - lastMovingLocation.getTime(); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java index f232dbf51..bd721512a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java @@ -53,7 +53,8 @@ public class ChartURLGenerator { context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); boolean metricUnits = true; if (preferences != null) { - metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true); + metricUnits = preferences.getBoolean( + context.getString(R.string.metric_units_key), true); } return getChartUrl(distances, elevations, track, diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java index d5a8ed34b..c4c0b2317 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java @@ -173,7 +173,7 @@ public class StringUtils implements DescriptionGenerator { context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); if (preferences != null) { displaySpeed = - preferences.getBoolean(MyTracksSettings.REPORT_SPEED, true); + preferences.getBoolean(context.getString(R.string.report_speed_key), true); } TripStatistics trackStats = track.getStatistics(); diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath index f8a6020f2..7ec6a9bf6 100644 --- a/MyTracksTest/.classpath +++ b/MyTracksTest/.classpath @@ -4,6 +4,11 @@ - + + + + + + diff --git a/MyTracksTest/.factorypath b/MyTracksTest/.factorypath new file mode 100644 index 000000000..25bd193ed --- /dev/null +++ b/MyTracksTest/.factorypath @@ -0,0 +1,4 @@ + + + + diff --git a/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs b/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 000000000..357ffd6b8 --- /dev/null +++ b/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,7 @@ +#Thu Aug 12 19:30:48 BRT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=.apt_generated +org.eclipse.jdt.apt.processorOptions/bin_dir=MyTracksTest/bin +org.eclipse.jdt.apt.processorOptions/logfile=MyTracksTest/annotations.log +org.eclipse.jdt.apt.reconcileEnabled=false diff --git a/MyTracksTest/.settings/org.eclipse.jdt.core.prefs b/MyTracksTest/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..1afc2a96c --- /dev/null +++ b/MyTracksTest/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +#Thu Aug 12 19:30:48 BRT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.processAnnotations=enabled +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/MyTracksTest/default.properties b/MyTracksTest/default.properties index 5b3be86a8..c4fb0851b 100644 --- a/MyTracksTest/default.properties +++ b/MyTracksTest/default.properties @@ -10,4 +10,4 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=Google Inc.:Google APIs:4 +target=Google Inc.:Google APIs:8 diff --git a/MyTracksTest/libs/AndroidMockGenerator.jar b/MyTracksTest/libs/AndroidMockGenerator.jar new file mode 100644 index 000000000..ef8b3612c Binary files /dev/null and b/MyTracksTest/libs/AndroidMockGenerator.jar differ diff --git a/MyTracksTest/libs/AndroidMockRuntime.jar b/MyTracksTest/libs/AndroidMockRuntime.jar new file mode 100644 index 000000000..40fa9e173 Binary files /dev/null and b/MyTracksTest/libs/AndroidMockRuntime.jar differ diff --git a/MyTracksTest/libs/easymock.jar b/MyTracksTest/libs/easymock.jar deleted file mode 100644 index de591680c..000000000 Binary files a/MyTracksTest/libs/easymock.jar and /dev/null differ diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java new file mode 100644 index 000000000..091d2b0f0 --- /dev/null +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxImporterTest.java @@ -0,0 +1,258 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks.io; + +import static com.google.android.testing.mocking.AndroidMock.eq; +import static com.google.android.testing.mocking.AndroidMock.expect; + +import com.google.android.apps.mytracks.content.MyTracksProviderUtils; +import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory; +import com.google.android.apps.mytracks.content.Track; +import com.google.android.apps.mytracks.content.TracksColumns; +import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory; +import com.google.android.testing.mocking.AndroidMock; +import com.google.android.testing.mocking.UsesMocks; + +import android.content.ContentUris; +import android.location.Location; +import android.location.LocationManager; +import android.net.Uri; +import android.test.AndroidTestCase; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Arrays; + +import javax.xml.parsers.ParserConfigurationException; + +import org.easymock.Capture; +import org.easymock.IArgumentMatcher; +import org.xml.sax.SAXException; + +/** + * Tests for the GPX importer. + * + * @author Steffen Horlacher + */ +public class GpxImporterTest extends AndroidTestCase { + + private static final String TRACK_NAME = "blablub"; + private static final String TRACK_DESC = "s'Laebe isch koi Schlotzer"; + + private static final String TRACK_LAT_1 = "48.768364"; + private static final String TRACK_LON_1 = "9.177886"; + private static final String TRACK_ELE_1 = "324.0"; + private static final String TRACK_TIME_1 = "2010-04-22T18:21:00Z"; + + private static final String TRACK_LAT_2 = "48.768374"; + private static final String TRACK_LON_2 = "9.177816"; + private static final String TRACK_ELE_2 = "333.0"; + private static final String TRACK_TIME_2 = "2010-04-22T18:21:50Z"; + + // TODO use real files from different sources with more track points + private static final String VALID_TEST_GPX = "" + "" + TRACK_ELE_1 + " +" + "" + TRACK_ELE_2 + "" + ""; + + // invalid xml + private static final String INVALID_XML_TEST_GPX = VALID_TEST_GPX.substring( + 0, VALID_TEST_GPX.length() - 50); + private static final String INVALID_LOCATION_TEST_GPX = VALID_TEST_GPX + .replaceAll(TRACK_LAT_1, "1000.0"); + private static final String INVALID_TIME_TEST_GPX = VALID_TEST_GPX + .replaceAll(TRACK_TIME_1, "invalid"); + + private static final long TRACK_ID = 1; + private static final long TRACK_POINT_ID_1 = 1; + private static final long TRACK_POINT_ID_2 = 2; + + private static final Uri TRACK_ID_URI = ContentUris.appendId( + TracksColumns.CONTENT_URI.buildUpon(), TRACK_ID).build(); + + private MyTracksProviderUtils providerUtils; + + private Factory oldProviderUtilsFactory; + + @UsesMocks(MyTracksProviderUtils.class) + @Override + protected void setUp() throws Exception { + super.setUp(); + + providerUtils = AndroidMock.createMock(MyTracksProviderUtils.class); + oldProviderUtilsFactory = + TestingProviderUtilsFactory.installWithInstance(providerUtils); + } + + @Override + protected void tearDown() throws Exception { + TestingProviderUtilsFactory.restoreOldFactory(oldProviderUtilsFactory); + super.tearDown(); + } + + /** + * Test import success + */ + public void testImportSuccess() throws Exception { + Capture trackParam = new Capture(); + + SimpleDateFormat format = GpxImporter.DATE_FORMAT2; + Location loc1 = new Location(LocationManager.GPS_PROVIDER); + loc1.setTime(format.parse(TRACK_TIME_1).getTime()); + loc1.setLatitude(Double.parseDouble(TRACK_LAT_1)); + loc1.setLongitude(Double.parseDouble(TRACK_LON_1)); + loc1.setAltitude(Double.parseDouble(TRACK_ELE_1)); + + Location loc2 = new Location(LocationManager.GPS_PROVIDER); + loc2.setTime(format.parse(TRACK_TIME_2).getTime()); + loc2.setLatitude(Double.parseDouble(TRACK_LAT_2)); + loc2.setLongitude(Double.parseDouble(TRACK_LON_2)); + loc2.setAltitude(Double.parseDouble(TRACK_ELE_2)); + + expect(providerUtils.insertTrack(AndroidMock.capture(trackParam))) + .andReturn(TRACK_ID_URI); + + expect(providerUtils.getLastLocationId(TRACK_ID)).andReturn(TRACK_POINT_ID_1).andReturn(TRACK_POINT_ID_2); + + // A flush happens after the first insertion to get the starting point ID, + // which is why we get two calls + expect(providerUtils.bulkInsertTrackPoints(LocationsMatcher.eqLoc(loc1), + eq(1), eq(TRACK_ID))).andReturn(1); + expect(providerUtils.bulkInsertTrackPoints(LocationsMatcher.eqLoc(loc2), + eq(1), eq(TRACK_ID))).andReturn(1); + + providerUtils.updateTrack(AndroidMock.capture(trackParam)); + + AndroidMock.replay(providerUtils); + + InputStream is = new ByteArrayInputStream(VALID_TEST_GPX.getBytes()); + GpxImporter.importGPXFile(is, providerUtils); + + AndroidMock.verify(providerUtils); + + // verify track parameter + Track track = trackParam.getValue(); + assertEquals(TRACK_NAME, track.getName()); + assertEquals(TRACK_DESC, track.getDescription()); + assertEquals(format.parse(TRACK_TIME_1).getTime(), track.getStatistics() + .getStartTime()); + assertNotSame(-1, track.getStartId()); + assertNotSame(-1, track.getStopId()); + } + + /** + * Test with invalid location - track should be deleted + */ + public void testImportLocationFailure() throws ParserConfigurationException, + SAXException, IOException { + testInvalidXML(INVALID_LOCATION_TEST_GPX); + } + + /** + * Test with invalid time - track should be deleted + */ + public void testImportTimeFailure() throws ParserConfigurationException, + SAXException, IOException { + testInvalidXML(INVALID_TIME_TEST_GPX); + } + + /** + * Test with invalid xml - track should be deleted + */ + public void testImportXMLFailure() throws ParserConfigurationException, + SAXException, IOException { + testInvalidXML(INVALID_XML_TEST_GPX); + } + + private void testInvalidXML(String xml) throws ParserConfigurationException, + IOException { + expect(providerUtils.insertTrack((Track) AndroidMock.anyObject())) + .andReturn(TRACK_ID_URI); + + expect(providerUtils.bulkInsertTrackPoints((Location[]) AndroidMock.anyObject(), + AndroidMock.anyInt(), AndroidMock.anyLong())).andStubReturn(1); + expect(providerUtils.getLastLocationId(TRACK_ID)).andStubReturn(TRACK_POINT_ID_1); + + providerUtils.deleteTrack(TRACK_ID); + + AndroidMock.replay(providerUtils); + + InputStream is = new ByteArrayInputStream(xml.getBytes()); + try { + GpxImporter.importGPXFile(is, providerUtils); + } catch (SAXException e) { + // expected exception + } + + AndroidMock.verify(providerUtils); + } + + /** + * Workaround because of capture bug 2617107 in easymock: + * http://sourceforge.net + * /tracker/?func=detail&aid=2617107&group_id=82958&atid=567837 + */ + private static class LocationsMatcher implements IArgumentMatcher { + private final Location[] matchLocs; + + private LocationsMatcher(Location[] expected) { + this.matchLocs = expected; + } + + public static Location[] eqLoc(Location[] expected) { + IArgumentMatcher matcher = new LocationsMatcher(expected); + AndroidMock.reportMatcher(matcher); + return null; + } + + public static Location[] eqLoc(Location expected) { + return eqLoc(new Location[] { expected}); + } + + @Override + public void appendTo(StringBuffer buf) { + buf.append("eqLoc(").append(Arrays.toString(matchLocs)).append(")"); + } + + @Override + public boolean matches(Object obj) { + if (! (obj instanceof Location[])) { return false; } + Location[] locs = (Location[]) obj; + if (locs.length < matchLocs.length) { return false; } + + // Only check the first elements (those that will be taken into account) + for (int i = 0; i < matchLocs.length; i++) { + if (!locationsMatch(locs[i], matchLocs[i])) { + return false; + } + } + + return true; + } + + private boolean locationsMatch(Location loc1, Location loc2) { + return (loc1.getTime() == loc2.getTime()) && + (loc1.getLatitude() == loc2.getLatitude()) && + (loc1.getLongitude() == loc2.getLongitude()) && + (loc1.getAltitude() == loc2.getAltitude()); + } + } +} diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java new file mode 100644 index 000000000..ec132e0db --- /dev/null +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/TcxTrackWriterTest.java @@ -0,0 +1,66 @@ +// Copyright 2010 Google Inc. All Rights Reserved. +package com.google.android.apps.mytracks.io; + +import android.location.Location; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import java.util.Date; +import java.util.List; + +/** + * Tests for the GPX track exporter. + * + * @author Sandor Dornbush + */ +public class TcxTrackWriterTest extends TrackFormatWriterTest { + + public void testXmlOutput() throws Exception { + TrackFormatWriter writer = new TcxTrackWriter(); + String result = writeTrack(writer); + Document doc = parseXmlDocument(result); + + Element root = getChildElement(doc, "TrainingCenterDatabase"); + Element activitiesTag = getChildElement(root, "Activities"); + Element activityTag = getChildElement(activitiesTag, "Activity"); + Element lapTag = getChildElement(activityTag, "Lap"); + + List segmentTags = getChildElements(lapTag, "Track", 2); + Element segment1Tag = segmentTags.get(0); + Element segment2Tag = segmentTags.get(1); + List seg1PointTags = getChildElements(segment1Tag, "Trackpoint", 2); + List seg2PointTags = getChildElements(segment2Tag, "Trackpoint", 2); + assertTagsMatchPoints(seg1PointTags, location1, location2); + assertTagsMatchPoints(seg2PointTags, location3, location4); + } + + /** + * Asserts that the given tags describe the given points, in the same order. + */ + private void assertTagsMatchPoints(List tags, Location... locs) { + assertEquals(locs.length, tags.size()); + for (int i = 0; i < locs.length; i++) { + Element tag = tags.get(i); + Location loc = locs[i]; + + assertTagMatchesLocation(tag, loc); + } + } + + /** + * Asserts that the given tag describes the given location. + */ + private void assertTagMatchesLocation(Element tag, Location loc) { + Element posTag = getChildElement(tag, "Position"); + assertEquals(Double.toString(loc.getLatitude()), + getChildTextValue(posTag, "LatitudeDegrees")); + assertEquals(Double.toString(loc.getLongitude()), + getChildTextValue(posTag, "LongitudeDegrees")); + assertEquals( + TcxTrackWriter.TIMESTAMP_FORMAT.format(new Date(loc.getTime())), + getChildTextValue(tag, "Time")); + assertEquals(Double.toString(loc.getAltitude()), + getChildTextValue(tag, "AltitudeMeters")); + } +} diff --git a/eclipse/mytracks-style.xml b/eclipse/mytracks-style.xml new file mode 100644 index 000000000..45afba5bc --- /dev/null +++ b/eclipse/mytracks-style.xml @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse/mytracks.importorder b/eclipse/mytracks.importorder new file mode 100644 index 000000000..794a97650 --- /dev/null +++ b/eclipse/mytracks.importorder @@ -0,0 +1,7 @@ +#Organize Import Order +#Fri May 28 03:20:44 BRT 2010 +4=org +3=javax +2=java +1=android +0=com