Compare commits

..

166 Commits

Author SHA1 Message Date
Rodrigo Damazio 2eb36aedeb Releasing version 1.0.20. 2010-11-23 15:18:39 -08:00
Bartlomiej Niechwiej 0e623ebfeb Fix a memory leak that was observed each time a recording session was stopped. 2010-11-21 23:49:17 -08:00
Rodrigo Damazio ffb73569e9 Merging Bart's fixes. 2010-11-21 21:11:35 -08:00
Bartlomiej Niechwiej 713cda9455 Addressed Rodrigo's comment. 2010-11-21 21:07:59 -08:00
Bartlomiej Niechwiej 223721cca8 Nullify bineder/checkListener on destroy. 2010-11-21 20:55:44 -08:00
Rodrigo Damazio e7479c8a93 Fixing periodic task restarting. 2010-11-21 20:45:25 -08:00
Bartlomiej Niechwiej 224fe0069b Make sure there is only one instance of TrackRecordingService at a time. 2010-11-21 19:33:14 -08:00
Rodrigo Damazio cb97847392 Addressing comments from a475cd4d33. 2010-11-21 00:44:34 -08:00
Rodrigo Damazio 6a29531467 Second attempt at proper task startup. 2010-11-20 16:21:59 -08:00
Rodrigo Damazio 262e249d2c Also fixing splitter initialization, just for completeness. 2010-11-20 05:46:38 -08:00
Rodrigo Damazio 77479efaef Fixing TTS initialization. 2010-11-20 05:43:09 -08:00
Rodrigo Damazio 898863a8d9 Merging Sandor's second head by ignoring it 2010-11-19 18:37:27 -08:00
Sandor Dornbush 05d555f98d Fix the end track confirmation dialog. 2010-11-19 17:23:27 -08:00
Rodrigo Damazio 868092db10 Fixing intiialization before context is available. 2010-11-19 14:26:11 -08:00
Rodrigo Damazio 7a738c2eca Moving the end recording method to more reasonable location. 2010-11-18 17:14:56 -08:00
Rodrigo Damazio b304dbcba6 Fixing wake lock being held for too long in the service. 2010-11-18 17:13:20 -08:00
Rodrigo Damazio 6e28a5daa4 Merging Matthew's fix for issue 137. 2010-11-18 16:41:21 -08:00
Bartlomiej Niechwiej 8f4f9660ed Addressed Sandor's comments. 2010-11-18 15:42:02 -08:00
Bartlomiej Niechwiej 2d01535651 Fixed a NPE introduced after refactoring dialogManager. 2010-11-17 22:39:50 -08:00
Bartlomiej Niechwiej e57d4669fc Revert API key changes. 2010-11-17 22:25:20 -08:00
Bartlomiej Niechwiej f47c599dea Merge with 63eb7915dafe329e8f06cc33c56122ee15ea6df7 2010-11-17 22:20:15 -08:00
Bartlomiej Niechwiej 7a693a90f7 Make the app single process only, including the following fixes:
1) Simplify SharedPreferences management
2) Shut down signalManager/splitManager to avoid random crashes
3) Get rid of sharedPreferencesChanged from the service interface

All tests pass.
2010-11-17 22:18:50 -08:00
Bartlomiej Niechwiej 9cf51de3f7 Fix a typo in onDestroy. 2010-11-17 20:07:34 -08:00
Matthew Simmons 5089c20cd6 Code review fixes 2010-11-16 11:39:08 -05:00
Bartlomiej Niechwiej a0da23f86a Various fixes to shared preferences. 2010-11-15 23:09:18 -08:00
Rodrigo Damazio 44d24b57c6 Making telephony support optional. 2010-11-15 22:04:48 -08:00
Rodrigo Damazio c143d774d4 Merging Aaron's changes. 2010-11-15 21:50:46 -08:00
Matthew Simmons 9e92240dd0 More self-review 2010-11-15 21:46:19 -05:00
Sandor Dornbush d2c586b096 Fix StatusAnnouncer thread for initialization and prefs in service. 2010-11-15 18:20:10 -08:00
Matthew Simmons fbfbb9408a Self-review 2010-11-15 18:46:23 -05:00
Matthew Simmons fb56665dec Rework authorization failure retry. The retry needs to be synchronous with
the original runone.
2010-11-15 18:37:42 -05:00
Bartlomiej Niechwiej 5b65c216b6 More tests. 2010-11-12 22:18:38 -08:00
Rodrigo Damazio 9ad98c5970 Merging Sandor's changes 2010-11-12 14:37:04 -08:00
Aaron Brown cae9d0f2e5 updated MyTracks/AndroidManifest.xml for inclusion of uses-feature 2010-11-12 17:11:56 +10:00
Sandor Dornbush c0d267c63e Minor formating fixes. 2010-11-11 21:41:39 -08:00
Sandor Dornbush 70704b0a5e Move navcontrols icon decleration to xml. 2010-11-11 21:38:24 -08:00
Sandor Dornbush b135275201 Minor fix for dialog manager. 2010-11-11 16:15:11 -08:00
Bartlomiej Niechwiej 7e1eae6681 Addressed Sandor's comments and added more unit tests and fixed 2 NPEs. 2010-11-11 10:55:15 -08:00
Bartlomiej Niechwiej 30f5d6dc85 Fix two NPEs and add more test coverage. 2010-11-11 00:31:56 -08:00
Sandor Dornbush a50dd1168b Fix format error. 2010-11-09 13:57:19 -08:00
Sandor Dornbush 62fa1620aa Actually add the dialog tests. 2010-11-08 11:31:14 -08:00
Sandor Dornbush a0d42c8b59 Add basic tests to the DialogManager. 2010-11-08 11:28:39 -08:00
Bartlomiej Niechwiej a21663da61 Fix a NPE (replace MyTracks.getInstance() with the parent activity). 2010-11-06 23:37:14 -07:00
Bartlomiej Niechwiej 67a0382942 Fixed another bug reported by users (division by zero).
The issue was most likely related to a race condition (selectedTrackId can change in the UI thread, while the track is being processed in the handler thread).

Simulated slow drawing by adding 50ms, works pretty cool :)
2010-11-06 00:31:52 -07:00
Bartlomiej Niechwiej f5c2467d01 Fix StringIndexOutOfBoundsException in ChartsExtendedEncoder.getEncodedValue().
Found in user error reports (3rd top issue):
java.lang.StringIndexOutOfBoundsException
at com.google.android.apps.mytracks.util.ChartsExtendedEncoder.getEncodedValue(ChartsExtendedEncoder.java:45)
at com.google.android.apps.mytracks.util.ChartURLGenerator.getChartUrl(ChartURLGenerator.java:162)
at com.google.android.apps.mytracks.util.ChartURLGenerator.getChartUrl(ChartURLGenerator.java:60)
at com.google.android.apps.mytracks.util.StringUtils.generateTrackDescription(StringUtils.java:366)
at com.google.android.apps.mytracks.io.SendToMyMaps.doUpload(SendToMyMaps.java:581)
at com.google.android.apps.mytracks.io.SendToMyMaps.access$10(SendToMyMaps.java:538)
at com.google.android.apps.mytracks.io.SendToMyMaps$5.run(SendToMyMaps.java:517)
at android.os.Handler.handleCallback(Handler.java:587)
at android.os.Handler.dispatchMessage(Handler.java:92)
at android.os.Looper.loop(Looper.java:123)
at android.os.HandlerThread.run(HandlerThread.java:60)
2010-11-05 22:52:42 -07:00
Bartlomiej Niechwiej a3abcc8094 Provide a workaround for binding to the service once it has been started. It fixes the failing tests (4). 2010-11-05 20:45:06 -07:00
Sandor Dornbush edf439f301 Merge Bart's bug fixes and tests. 2010-11-05 15:37:20 -07:00
Sandor Dornbush 2245563250 Fix broken build. 2010-11-05 14:51:06 -07:00
Bartlomiej Niechwiej bca21d5515 Addressed Rodrigo's comments. 2010-11-05 10:11:55 -07:00
Bartlomiej Niechwiej 89cae2e7c9 Fix a regression related refactoring recordingTrackId management.
In particular:
1) Add a workaround to {start/end}Recording to update recordingTrackId to trigger a notification
2) Add a bunch of unit tests for MyTracks
3) Clear minor style issues in a few classes
2010-11-04 23:32:31 -07:00
Sandor Dornbush 26c381a4c4 Address Bart's comments and more dialog clean up. 2010-11-04 17:44:08 -07:00
Sandor Dornbush 4bc5aa050c Add tests for the TempFileCleaner. 2010-11-04 17:07:59 -07:00
Rodrigo Damazio cd44b0d180 Merging Sandor's changes. 2010-11-03 21:08:50 -02:00
Rodrigo Damazio 59ee91ca5d Merging my own changes. 2010-11-03 20:59:32 -02:00
Rodrigo Damazio 59165a7033 Ignoring Matthew's second head by no-op merging it. 2010-11-03 20:53:50 -02:00
Rodrigo Damazio 93d242c05f Merging Matthew's first head. 2010-11-03 20:42:35 -02:00
Rodrigo Damazio 4bbb6591e3 Merging Bart's changes. 2010-11-03 19:59:35 -02:00
Sandor Dornbush 7df8025f6a Merge with head and address comments. 2010-11-03 12:53:12 -07:00
Bartlomiej Niechwiej f19c52f40e Addressed Sandor's comments. 2010-11-02 08:31:21 -07:00
Bartlomiej Niechwiej b7840779fe Revert API Key Change. 2010-11-02 08:26:31 -07:00
Rodrigo Damazio 28042a8cc9 Adding tests to voice announcements.
If anyone asks, I didn't write this code.
2010-11-02 02:19:43 -02:00
Matthew Simmons b2907226bf Code review comments 2010-11-01 15:21:33 -04:00
Matthew Simmons a2f46821f5 Fix author line 2010-11-01 14:32:19 -04:00
Matthew Simmons b7385cd4cc Combine b2f2f9e9e9 and 8774b3663c
Allow users to choose the default track name policy.  By default, we'll switch
to a new, timestamp-based name.  If they change the pref, they'll get the
old-style 'track n' style.
2010-11-01 13:48:33 -04:00
Matthew Simmons 718c65818c Allow users to choose the track name policy. 2010-11-01 12:59:56 -04:00
Rodrigo Damazio 91e2293606 Adding proper AndroidMock configuration - requires setting eclipse variables 2010-11-01 05:30:16 -02:00
Rodrigo Damazio 3c4a921f9a Addressing review suggestions 2010-11-01 05:27:04 -02:00
Rodrigo Damazio d04b333126 Merging 2010-11-01 02:05:42 -02:00
Rodrigo Damazio 0a4bef4d9a Fixing concurrent access to the content provider by making it have a single instance in the same process as the service. 2010-10-29 17:35:54 -02:00
Bartlomiej Niechwiej a0f090a83a Bug fixing and refactoring:
1) Make sure no one but service changes recordingTrackId (which is owned by it)
2) Cache sharedPreferences
3) Clear recordingTrackId if it doesn't correspond to a valid track or the service is not recording
4) More unit tests
2010-10-28 22:49:01 -07:00
Bartlomiej Niechwiej dc8ee5943c Merge with c10bc69662325f00bf166b783cc3ab1b78ccfed9 2010-10-28 20:48:01 -07:00
Bartlomiej Niechwiej 9132c36aa7 Use a test android:apiKey instead of the official one. 2010-10-28 20:47:42 -07:00
Sandor Dornbush 224c0d759f Minor fixes noticed on first review. 2010-10-28 17:13:59 -07:00
Sandor Dornbush ffcaca2db1 Refactor a few 100 lines of code out of the main Activity. 2010-10-28 17:08:59 -07:00
Sandor Dornbush 409fc4a43b Address Bart's comments. 2010-10-28 15:07:01 -07:00
Sandor Dornbush 16968f3f2b Fix copyright notice. 2010-10-28 14:50:03 -07:00
Sandor Dornbush e3fd0dce21 Undo changes to the eclipse prefs. 2010-10-28 14:47:00 -07:00
Sandor Dornbush 53b6b6deca Add tests to ChartValueSeries.
Also other minor fixes.
2010-10-28 14:43:31 -07:00
Rodrigo Damazio 26f47a50d0 Fixing issue 34: Not making voice announcements during a phone call 2010-10-27 03:07:17 -02:00
Bartlomiej Niechwiej 3cf77374c4 Fix merge. 2010-10-26 20:19:54 -07:00
Bartlomiej Niechwiej a1129c3f0f Merge with c58e4b8519d3ed6959a96192286b83aa1b77f6f3 2010-10-26 20:17:15 -07:00
Bartlomiej Niechwiej 2fe74603a3 Merge with 96ee47b2d8639a0cf62a387f3360640643fbeb0a 2010-10-26 20:14:41 -07:00
Bartlomiej Niechwiej 54d517363d Merge with e34329d612571554d6424d5941dfad57e35612a0 2010-10-26 19:39:46 -07:00
Bartlomiej Niechwiej 948fe0c0e6 Merge with 68eb8dff3a87698ace057447dff40a07cf673f2e 2010-10-26 19:39:20 -07:00
Bartlomiej Niechwiej dbd8e6c0e9 Merge with 5ed61c63ba59f4748231ea14bbbc222423d0b08a 2010-10-26 19:38:51 -07:00
Bartlomiej Niechwiej 02b5601933 Remove unnecessary log. 2010-10-26 19:32:24 -07:00
Sandor Dornbush 3ed40608a2 Merging from head. 2010-10-26 14:44:31 -07:00
Bartlomiej Niechwiej 36d7c2dd91 Allow to move the app to SD card (by default goes to internal storage). This is a frequently requested feature (based on market feedback). 2010-10-26 00:33:38 -07:00
Bartlomiej Niechwiej fa7ef68851 Addressed Sandor's comments. 2010-10-25 22:35:38 -07:00
Matthew Simmons f84877a4fc Issue 86: Remove - from the list of disallowed characters for filenames. 2010-10-25 14:59:20 -04:00
Matthew Simmons 261fb62e24 Changed the default new track name from "track %d" to "date time", where "date"
is a short, locale-aware version of the track's start date, and "time" is the
track's start time.
2010-10-25 14:15:16 -04:00
Bartlomiej Niechwiej 48d8aa4cd8 Introduce an interface to decouple platform specific API from the classes that require it. Also:
1) Put the service into foreground to prevent from being killed by the system
2) Fix a bug the prevented MyTracks from running on pre-Eclair devices
2010-10-24 21:24:11 -07:00
Bartlomiej Niechwiej 95ff0d3db6 Fix a typo in shared preferences and minor cleanup. 2010-10-24 18:55:35 -07:00
Bartlomiej Niechwiej 2dc1d914c0 Several fixes to the service and more test coverage.
Notably:
1) Fixed isRecording to not return false if service is down (for instance, it may be being restarted)
2) Added more checks to prevent from invalid starting/stopping (if in already in progress/not started).
2010-10-24 14:16:43 -07:00
Bartlomiej Niechwiej fc06701009 Fix several bugs and clean up statistics management.
1) Decouple clock from TripStatisticsBuilder.
2) Introduce a new param to constructor to automatically resume at given time
3) Fix various statsbuilder initialization issues in the service (wrong order, missing initialization)
2010-10-24 03:30:58 -07:00
Bartlomiej Niechwiej ee4f334296 Fixed a NPE under certain circumstances (move initialization to onCreate()). 2010-10-24 03:26:32 -07:00
Bartlomiej Niechwiej cac2395237 More unit tests for TracksRecordingService and fix a few bugs. Made the service less forgiving rather than silently ignoring invalid state. 2010-10-24 00:48:53 -07:00
Bartlomiej Niechwiej 5afc3f13cf Minor refactoring: remove dependency on Context and replace it with ContentResolver. 2010-10-23 19:04:57 -07:00
Rodrigo Damazio 9030917c14 Merging Bart's changes. 2010-10-22 15:34:24 -02:00
Bartlomiej Niechwiej 9905def352 Terminate tracker update thread on destroy. 2010-10-22 10:14:36 -07:00
Bartlomiej Niechwiej a3793aa92b Minor updates. 2010-10-22 10:00:15 -07:00
Nulled 76c8498956 updated zh-cn translation 2010-10-21 17:51:40 +08:00
Nulled 75bd8ea5a2 Updated zh-cn translation. fixed some errors. 2010-10-15 18:15:43 +08:00
Nulled 50a5e864ac updated zh-cn translation 2010-10-15 18:04:56 +08:00
Rodrigo Damazio 352fc26f7e Fixing tests 2010-10-14 23:25:42 -03:00
Rodrigo Damazio 44afa1623e Making locations be reused when writing tracks. 2010-10-14 21:06:59 -03:00
Rodrigo Damazio 14acafabfc Getting rid of TrackBuffer. 2010-10-14 20:42:02 -03:00
Rodrigo Damazio 773af58d03 Fixing issue 190 (third step: reordering methods in execution order - no other changes) 2010-10-14 18:44:55 -03:00
Rodrigo Damazio 352b851e9c Fixing issue 190 (second step: refactoring mymaps uploading) 2010-10-14 18:35:51 -03:00
Rodrigo Damazio 8353a01082 Addressing review suggestions. 2010-10-14 16:41:20 -03:00
Bartlomiej Niechwiej b70e001206 Addressed Rodrigo's comments. 2010-10-13 21:58:26 -07:00
Rodrigo Damazio a741bb4d55 Fixing issue 190 (first step: dirty hack) 2010-10-13 22:03:31 -03:00
Rodrigo Damazio 24adee3d54 Addressing review suggestions and adding tests. 2010-10-13 21:53:16 -03:00
Bartlomiej Niechwiej 09203ffb95 Improved test coverage and minor refactoring/improvements. 2010-10-13 12:29:00 -07:00
Bartlomiej Niechwiej e94338f4c6 Fix a drawing lag during track recording.
For a track with ~2,500 points, the average drawign would take ~30-50ms, now it takes about 20ms (21ms if software clipping is enabled).

Removed all possible congestion points by introducing a blocking queue.

This change includes many fixes, including:
1) Major refactoring and clean up of the overlay, sped up drawing by a factor of 2x
2) Disable software clipping as it was slower by about 5% than w/o clipping and would trigger a bug related to map view spanning
3) Add waypoints synchronization  and fixed a bug related to skipping the first wpt
4) Add a simple unit test
2010-10-11 21:55:12 -07:00
Rodrigo Damazio dd9dd8ee81 Refactoring API level detection. 2010-10-11 22:28:02 -03:00
Rodrigo Damazio 01d6dcac59 Merging Bart's Polish fix. 2010-10-07 21:59:11 -03:00
Rodrigo Damazio ad0ee6b0d6 Merging Bart's Polish fix. 2010-10-07 21:58:07 -03:00
Rodrigo Damazio 769c8c228e Added tag v1.0.19 for changeset b096086934d6 2010-10-07 21:21:52 -03:00
Rodrigo Damazio 50fcd67085 Releasing version 1.0.19 (bugfix release) 2010-10-07 21:21:23 -03:00
Sandor Dornbush 52d03e6b7d Address Rodrigo's comments. 2010-10-07 16:28:42 -07:00
Sandor Dornbush b949cd0039 Really fix bug. 2010-10-07 12:39:05 -07:00
Sandor Dornbush e527170315 Fix recording error. 2010-10-07 12:01:32 -07:00
Sandor Dornbush ec7d210c36 Fix recording error. 2010-10-07 11:51:54 -07:00
Bartlomiej Niechwiej 74a4089464 Fix incorrect Polish translation related to delete track(s)/marker confirmation dialog (Issue 176). 2010-10-07 11:36:39 -07:00
Rodrigo Damazio fa9e14f574 Added tag v1.0.18 for changeset 7c67cd917be3 2010-10-05 17:12:20 -03:00
Rodrigo Damazio cdbeefcd16 Releasing version 1.0.18 2010-10-05 17:11:52 -03:00
Rodrigo Damazio ffdd5f4091 Merging Bart's changes 2010-10-05 14:48:43 -03:00
Bartlomiej Niechwiej bb60525780 Rename intent name to be uppercase. 2010-10-05 10:39:07 -07:00
Bartlomiej Niechwiej 82634af649 Minor refactoring. 2010-10-05 09:47:15 -07:00
Bartlomiej Niechwiej 3643ed9f13 Add missing Polish translations. 2010-10-04 23:07:38 -07:00
Bartlomiej Niechwiej fac59ab705 Partially fix a nasty bug related to losing a tracking session on service crash. 2010-10-04 21:53:34 -07:00
Bartlomiej Niechwiej 1e343b0d12 Limit the maximum number of auto-resume retry attempts to 3. 2010-10-04 21:17:56 -07:00
Bartlomiej Niechwiej 34bb467b97 Merge with 25704964a526fcfe09919af8f29c1e526b5409ec 2010-10-04 16:34:38 -07:00
Sandor Dornbush b092525c10 More swedish fixes. 2010-10-04 16:33:25 -07:00
Bartlomiej Niechwiej 256dac3a82 Moved showNotification() outside if clause. 2010-10-03 23:34:19 -07:00
Bartlomiej Niechwiej dfe947f54d Fixed an exception in MyTracks (added isBound), moved resumeState from onStart to onCreate in TrackRecordingService and some minor refactoring. 2010-10-03 23:28:12 -07:00
Andreas Bockert ce09407816 Fixed a number incorrect translation in Swedish language. 2010-10-01 22:33:16 +02:00
Bartlomiej Niechwiej beee6af79d Apply review feedback. 2010-09-30 23:46:47 -07:00
Bartlomiej Niechwiej c282562867 Introduce getLastModified() in Tracks class and fixe a NullPointerException in service if null intent is passed by the system. 2010-09-30 21:54:07 -07:00
Rodrigo Damazio 2aed9b3a33 Fixing track writer test after memory changes 2010-09-29 18:49:13 -03:00
Rodrigo Damazio 210910f21e Merging aggregated statistics change 2010-09-29 18:46:45 -03:00
Bartlomiej Niechwiej 1d666318ae Fix a bug in maybeResumeTrack. Still not sure if it works correctly (need to verify on real device). 2010-09-29 00:33:28 -07:00
Bartlomiej Niechwiej 4df6095089 Implement automatic restart of MyTracks on phone reboot.
In addition fix the following issues/add functionality:
0) Introduce MyTracksReceiver for listening on broadcast messages
1) Remove unnecessary call to VerifyChecker to avoid 403.
2) Clean up TrackRecordingService by adding private methods for common functionality
3) Fix a bug related to not canceling a timer after service was stopped
4) Add a new preference item to control behavior of new functionality
5) Add a unit test for the service (still need to figure out one issue with mocking content resolver).
2010-09-28 22:46:24 -07:00
Rodrigo Damazio d4edcce224 Uncommenting overlooked XML. 2010-09-27 21:42:59 -03:00
Rodrigo Damazio d7c6761841 Addressing comments I originally made on Sandor's change. 2010-09-27 21:02:52 -03:00
Rodrigo Damazio 5733224f8d Merging Sandor's memory footprint improvement 2010-09-27 17:41:34 -03:00
Rodrigo Damazio 22fd5042bc Merging Sandor's memory footprint improvement 2010-09-27 17:37:20 -03:00
Rodrigo Damazio 44a6f2d448 Further improving/fixing drawing, and adding a bounding box for debugging. 2010-09-27 16:14:04 -03:00
Rodrigo Damazio cd9c17f9b3 Fixing leftover from another commit - commenting out testing method. 2010-09-27 16:11:17 -03:00
Rodrigo Damazio dc07bcf0fa Fixing call to HandlerThread.quit() which only exists in API level 5+. 2010-09-27 14:54:36 -03:00
Rodrigo Damazio 248b8fb4fd Fixing bad resource in preferences (only used in 1.5). 2010-09-27 14:53:30 -03:00
Sandor Dornbush 35182a1483 Merge changes. 2010-09-23 14:30:44 -07:00
Sandor Dornbush 21b0a517a9 Merged Rodrigo's changes. 2010-09-23 11:07:31 -07:00
Sandor Dornbush 19a770445e Submit my changes before merging. 2010-09-23 11:02:45 -07:00
Rodrigo Damazio c6512f1376 Preparing to further isolate non-UI code from map drawing. 2010-09-22 22:10:36 -03:00
Rodrigo Damazio 2cb3963138 Refactoring track drawing 2010-09-22 22:04:07 -03:00
Sandor Dornbush d05c394c68 Trying to track down the missing end of track bug. 2010-09-21 15:10:56 -07:00
Sandor Dornbush 797de31960 Merging fixes. 2010-09-14 10:52:55 -07:00
Sandor Dornbush 872d2d4337 Correctly take preference as a long and stop dividing bounds by E6. 2010-09-08 17:36:58 -07:00
FNelson b84da40365 Merge with 28a6c6c0e8f12e489fa501609be4b564eb822f55
(Merge to Head)
2010-09-02 12:23:32 +01:00
FNelson 236bcba2bd Changing retrieveAllTracks to getAllTracks 2010-08-12 14:31:03 +01:00
FNelson 0347877290 Tidy up to adhere to style guidlines 2010-08-05 12:51:46 +01:00
FNelson b464526d5e Aggregated stats in first working state. 2010-08-04 11:58:43 +01:00
FNelson 0ccd05e605 First stab at aggregated stats. Still needs work. Check in to work on home computer 2010-07-30 15:04:35 +01:00
FNelson 916e4586c5 First HG commit test. 2010-07-28 10:38:26 +01:00
3 changed files with 10 additions and 50 deletions
+2 -2
View File
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.maps.mytracks"
android:installLocation="auto"
android:versionCode="22"
android:versionName="1.0.21">
android:versionCode="21"
android:versionName="1.0.20">
<application android:icon="@drawable/arrow_icon"
android:label="@string/app_name"
android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
@@ -62,6 +62,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -227,9 +228,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
}
try {
return trackRecordingService.isRecording();
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
} catch (RemoteException e) {
Log.e(MyTracksConstants.TAG, "MyTracks: Remote exception.", e);
// Fall back to alternative check method.
@@ -406,11 +405,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
return dialogManager.onCreateDialog(id, args);
}
@Override
protected Dialog onCreateDialog(int id) {
return dialogManager.onCreateDialog(id, null);
}
@Override
protected void onPrepareDialog(int id, Dialog dialog) {
super.onPrepareDialog(id, dialog);
@@ -914,9 +908,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker?");
return -4;
}
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
} 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);
@@ -956,9 +948,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?");
return -4;
}
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
} 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);
@@ -1026,9 +1016,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
setSelectedTrackId(recordingTrackId);
Toast.makeText(this, getString(R.string.status_now_recording),
Toast.LENGTH_SHORT).show();
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
} catch (RemoteException e) {
Toast.makeText(this,
getString(R.string.error_unable_to_start_recording),
Toast.LENGTH_SHORT).show();
@@ -1061,9 +1049,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
long currentTrackId = recordingTrackId;
try {
trackRecordingService.endCurrentTrack();
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
} catch (RemoteException e) {
Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e);
}
Intent intent = new Intent(MyTracks.this, MyTracksDetails.class);
@@ -935,33 +935,21 @@ public class TrackRecordingService extends Service implements LocationListener {
@Override
public boolean isRecording() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.isRecording();
}
@Override
public long getRecordingTrackId() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.recordingTrackId;
}
@Override
public boolean hasRecorded() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.providerUtils.getLastTrackId() >= 0;
}
@Override
public long startNewTrack() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.startNewTrack();
}
@@ -974,9 +962,6 @@ public class TrackRecordingService extends Service implements LocationListener {
*/
@Override
public long insertWaypointMarker(Waypoint waypoint) {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.insertWaypointMarker(waypoint);
}
@@ -989,36 +974,25 @@ public class TrackRecordingService extends Service implements LocationListener {
*/
@Override
public long insertStatisticsMarker(Location location) {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
return service.insertStatisticsMarker(location);
}
@Override
public void endCurrentTrack() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
service.endCurrentTrack();
}
@Override
public void deleteAllTracks() {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
if (isRecording()) {
throw new IllegalStateException("Cannot delete all tracks while recording!");
throw new IllegalStateException(
"Cannot delete all tracks while recording!");
}
service.providerUtils.deleteAllTracks();
}
@Override
public void recordLocation(Location loc) {
if (service == null) {
throw new IllegalStateException("The service has been already detached!");
}
service.onLocationChanged(loc);
}
}