Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 21cd231707 updated versions of Android-related libraries to better align Eclipse debug experience with production code
Change-Id: I4b5367f3569a25e2aa446d399d72f32316594a31
2016-04-19 18:50:04 +02:00
Axel Uhl 4bf415e864 Merge remote-tracking branch 'server/fix_autoupdate_for_playstore' into ubilabs--rcapp--develop 2016-04-19 13:19:32 +02:00
Axel Uhl 5da5e4738c removed unused logging TAG declaration
Change-Id: I8ff27b5f627f9fc6c504bb6cd617a459a312887c
2016-04-18 23:46:00 +02:00
Axel Uhl f00e91075f use constants for exception message construction and matching
Change-Id: I3df736af045d46f1f39dbc0a36a9c0824122b6a8
2016-04-18 23:44:51 +02:00
Axel Uhl f1fedb1d0e fixed exception message text
Change-Id: I18ef82f89058202bed4806bc43e95d5fca0c1ed7
2016-04-18 23:43:10 +02:00
Axel Uhl 255c4c198c Merge branch 'translation' into ubilabs--rcapp--develop 2016-04-18 21:27:17 +02:00
Axel Uhl 3d69ff2cd4 removed another redundant _en file
Change-Id: I0708a52b978bc35ce814356f4eb74287b94242f2
2016-04-18 21:22:02 +02:00
Axel Uhl 29453c91e5 removed redundant _en file
Change-Id: Iade51020e0aa71dcad50bd39c3124c3ded279760
2016-04-18 21:21:24 +02:00
Axel Uhl 358adc0865 re-introduced Unicode escapes where we had them
Change-Id: I57750746cd79c32945584bec1234923d123d3a7c
2016-04-18 21:19:49 +02:00
Axel Uhl 9ccd8a8714 removed redundant StringMessages_en.properties
Change-Id: I48fc3210c1a9eab465053068713b205ac4c33690
2016-04-18 21:11:22 +02:00
Axel Uhl aa36952e12 removed redundant TextMessages_en.properties; it duplicates TextMessages.properties and kills proper Unicode escapes
Change-Id: Ia84f86f8f6cc21899e1b7ec916e1fc684d6245fb
2016-04-18 21:06:38 +02:00
Axel Uhl 38d65f22ba Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties

Change-Id: I3ff3966a8ebb007d14f37ea96fc6cdcc46a17dd5
2016-04-18 20:58:27 +02:00
Axel Uhl b62c21b1fd Merge remote-tracking branch 'server/master' 2016-04-18 20:51:52 +02:00
Axel Uhl cdd1441bef fixed german translations of a few AdminConsole strings, in particular swapped before/after labels for waypoint addition buttons
Change-Id: I2864f67224105633d9532046b3985681b900177e
2016-04-18 20:48:44 +02:00
Axel Uhl 5b2d063c40 added missing imports for ViewCompat
Change-Id: I6986902e1d5870477e0883d43ac8a62861a2d95a
2016-04-18 18:44:38 +02:00
Axel Uhl 1dc83816b8 added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267
Change-Id: I55b343e2447c2837ce678dbc32e1921ce9a2ffa9
2016-04-18 18:41:57 +02:00
Axel Uhl e255120996 Merge branch 'master' into ubilabs--rcapp--develop 2016-04-18 18:27:54 +02:00
Axel Uhl 4e8ac24419 fixed MarkPositionTImeFilterTest after introducing default methods for recordFix with overloads
Change-Id: I8b229022004fe1ebadfc795d03a1aad9ca6f86e0
2016-04-18 18:27:24 +02:00
Axel Uhl 1e3a282461 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java

Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e
2016-04-18 17:48:32 +02:00
Axel Uhl d88852ac3b Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3595' into ubilabs--rcapp--develop 2016-04-18 17:45:36 +02:00
Axel Uhl 86a63366a2 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: Ibc180ab51e659a0c452d64f1756b5d7008ffbfb6
2016-04-18 17:35:47 +02:00
Axel Uhl 4ef21a5ccb Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java

Change-Id: I4e741f66667c9946b0aa36e25ea759cce47b9c9d
2016-04-18 17:31:09 +02:00
Axel Uhl 5f96787626 Merge branch 'master' into ubilabs--rcapp--bug-3595 2016-04-18 17:03:09 +02:00
Axel Uhl 0e16d0a9ee removed the excessive output of ReceiveTrackingDataTest altogether; there may be a connection to bug 3610 (JUnit tests not getting executed)
Change-Id: I019e3097ac35824a3ea7bac9320be952c5183be2
2016-04-18 09:49:14 +02:00
Axel Uhl 13a39ae28f cleanly stop the Receiver objects during the TracTrac test case's tearDown; maybe it helps for bug 3610
Change-Id: I6810f6cb7c42ebc9606be5453b1de25fa61c3003
2016-04-18 02:22:28 +02:00
Axel Uhl e2d41eeb9c launch MarkPassingCalculator initialization synchronously during test execution
Change-Id: I1b336553fc8b9cf86a935944cf889211e81d7169
2016-04-17 23:12:30 +02:00
Axel Uhl 5d3314d033 added null check for the case of an empty track
Change-Id: Ic5d013fbe8eb7f2aa751d43d6cb6fe058b785dc7
2016-04-17 21:59:16 +02:00
Axel Uhl 6e903409bc enhanced logging for MarkPassingUpdateListener further
Change-Id: Ied8e02ceef57a48672e1886a109235a0ed30c5e2
2016-04-17 19:16:46 +02:00
Axel Uhl 2cc519c425 compare against outer object's this
Change-Id: Ie3c16a9bbdace0913b2c9082162eca5b808f3849
2016-04-17 19:13:21 +02:00
Axel Uhl 6f5e545edf fixing issue where MarkPassingCalculators for all races in the regatta are stopped when only one race is removed
Change-Id: I27d374637828ea6506771fdaef9a9c7769f21cbd
2016-04-17 19:11:31 +02:00
Axel Uhl ce76740656 removed now obsolete serialVersionUID
Change-Id: Ifd6be7778904f54a53233993ec801a7eba91d0e6
2016-04-17 18:05:55 +02:00
Axel Uhl 9781659655 Merge branch 'bug3604' 2016-04-17 10:49:37 +02:00
Axel Uhl 89df5e7038 Merge branch 'ubilabs--ios--develop' 2016-04-17 10:20:36 +02:00
Axel Uhl f0dc8fd5de use #available for checking for iOS 9
Change-Id: If530a91359fa79a7d67a32a49a3e2ff0e89da754
2016-04-16 16:48:38 +02:00
Axel Uhl c8ab7bde3b checking for allowsBackgroundLocationUpdates property before accessing
Change-Id: I42eb7548e32b516bb461c0108f3a1b982a989e34
2016-04-16 16:41:13 +02:00
Axel Uhl 53fb8d418b accessing the background tracking properties the Swift way
Change-Id: Ia7bf2e1b62eabd7ce70bb7a88ae06e7609330a69
2016-04-16 16:37:25 +02:00
Axel Uhl 1f9f461518 trying to enable background GPS service
Change-Id: I418eded7a9dac7913dc5ac142341de0201873887
2016-04-16 16:12:22 +02:00
Axel Uhl e5efe3efa9 Merge branch 'master' into bug3604
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java

Change-Id: Iee106dc5b8ce71ee5ad22dad2cf748816ae91983
2016-04-16 10:51:43 +02:00
Axel Uhl 14539584b8 added timeout to echo.websocket.org test because the site currently seems unresponsive
Change-Id: Iac6acbd192d787d163133f9fa21e5033f1f6998d
2016-04-16 10:49:27 +02:00
Axel Uhl f53d57b281 introduced relaxation of distance penalties at lines and gates based on GPSFix.TYPICAL_HDOP
Change-Id: I36f3ebccb776b5c575e75a32becc4f1309fb2d9f
2016-04-16 03:33:50 +02:00
Axel Uhl 760e0a7962 need to acquire the track's read lock before getRawFixes() can be called
Change-Id: Idb422a5f73a698524f96c40d066ecffd4dacd3aa
2016-04-16 02:35:30 +02:00
Axel Uhl d2921999d2 turned logging down again for mark passing algorithm
Change-Id: I87a94ff469caa6dbd5f31dbc797e2c5843ea7374
2016-04-16 01:52:00 +02:00
Axel Uhl e00d0c4e5c serialize with a TrackedRaceImpl whether it had a MarkPassingCalculator; put initialization of MarkPassingCalculator internals into own thread
Change-Id: Ie9ed7ccfd6da136b80cf09bcbc4885215fbbe64d
2016-04-16 00:03:45 +02:00
Axel Uhl 23fbf840a8 reverted serializablity of MarkPassingCalculator;
instead, the MarkPassingCalculator is re-established after de-serializing the TrackedRaceImpl

Change-Id: If4f1d4379034b9e74096eba8cca829fb63e74adf
2016-04-15 23:19:31 +02:00
Axel Uhl 5b8a836423 also made Comparator for fixed mark passing tree set serializable
Change-Id: I32f9ecc359784c119cea257013427e88f4d3781b
2016-04-15 22:50:29 +02:00
Axel Uhl 8bf2d1231f also needed to make Edge serializable
Change-Id: I4fc6a377d349be6e890491d33f7ba117b230f34c
2016-04-15 22:39:26 +02:00
Axel Uhl 7e7b79f10a trying to make MarkPassingCalculator serializable as a first patch for bug 3604; consistent serialization will be a problem
Change-Id: I9051b67e6d15833cec622cca026816dbf65e22f0
2016-04-15 22:22:22 +02:00
Axel Uhl 4286c9a924 forcing a mark fix into the track for RaceLogTracking if it is the first or replaces an existing at the same time point
Change-Id: I352c05808e3dad0988a4507f3f13a4652ddc0b71
2016-04-15 22:16:53 +02:00
Axel Uhl 51cbb8ba64 Merge remote-tracking branch 'server/master' 2016-04-15 18:20:06 +02:00
Axel Uhl 92c63cfe38 use Location object's time point for sending ping to server
Change-Id: I653c9c2271381cdea18427eb79e884588fb2f7c9
2016-04-15 18:16:54 +02:00
Axel Uhl f11c9ffd80 avoid NPE in CandidateChooserImpl
Change-Id: Iae8af837f554edba0ab16173cd54fd6d53c2ea01
2016-04-15 18:15:34 +02:00
Axel Uhl 8b5cade99d Merge remote-tracking branch 'server/competitor_searchtag' 2016-04-15 14:29:02 +02:00
Axel Uhl 13b56abcfe some renames to make clear where we're dealing with the String-conversion of the Mark's ID
Change-Id: Ie4e729d14b44b3c8a57a9ed9edb93e8e9ad30d17
2016-04-15 12:05:33 +02:00
Axel Uhl 52021d77ef single point of exit in SailingServiceIMpl.convertToMark
Change-Id: Ib6c2be47d17d29c66502eacce6d7aa7caee9f578
2016-04-15 11:59:18 +02:00
Axel Uhl 35b930d4da convert Mark ID from String to UUID if applicable, matching the behavior of the MarkDeserializer
Change-Id: I26d519fade93bc71cc84223cd0d8afa0a9f42f58
2016-04-15 11:48:50 +02:00
Axel Uhl f9ddd9174c made MarkInfo fields final, making this a value object effectively
Change-Id: Id03913359590c37434f064d4decd9bb783a31b3a
2016-04-15 11:44:37 +02:00
Axel Uhl b9ed121b93 Removed setter from MarkInfo and replaced by constructor arguments
Change-Id: I62403f3664149ba54e3676f2a953cc4dcd9fa48a
2016-04-15 11:44:01 +02:00
Axel Uhl b93bdfa3be Merge branch 'master' into ubilabs--tracking_app--bugfix-constants 2016-04-15 11:36:04 +02:00
Axel Uhl 88413e55a7 Merge branch 'ubilabs--rcapp--develop' into ubilabs--tracking_app--bugfix-constants 2016-04-15 11:23:30 +02:00
Axel Uhl f77e2b158b Merge branch 'master' into ubilabs--tracking_app--bugfix-constants 2016-04-15 11:23:15 +02:00
Axel Uhl 9d27f75094 Merge branch 'master' into ubilabs--rcapp--develop 2016-04-15 11:07:51 +02:00
Axel Uhl 9241bac1b2 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3598 2016-04-15 11:04:24 +02:00
Axel Uhl c3f43e3438 Revert "added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267";
is now on branch ubilabs--rcapp--bug-1267

This reverts commit b08b718886.
2016-04-15 11:02:30 +02:00
Axel Uhl 7cde171906 Revert "fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName";
is now on branch ubilabs--rcapp--bug-1267

This reverts commit 24afb859f6.
2016-04-15 11:01:59 +02:00
Axel Uhl d3b620475e Revert "renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer";
is now on branch ubilabs--rcapp--bug-1267

This reverts commit 4006732304.
2016-04-15 11:01:22 +02:00
Axel Uhl b18057c2c0 Revert "renamed accessor method for mCourseAreaContainer"; this contribution is now on branch ubilabs--rcapp--bug-1267
This reverts commit 9f7277580b.
2016-04-15 11:00:50 +02:00
Axel Uhl 5244f988e5 Revert "removed obsolete comment"
This reverts commit 0b2f1f327f.
2016-04-15 11:00:33 +02:00
Axel Uhl 349b9c7d70 removed obsolete comment
Change-Id: I7e148a560828c2d6b530f338798a8765551a676a
2016-04-15 10:54:49 +02:00
Axel Uhl 5b35d2a75c renamed accessor method for mCourseAreaContainer
Change-Id: I9d8610d9f0c8dd0d8461bd3552ab81a0d909b907
2016-04-15 10:54:23 +02:00
Axel Uhl ca7c590c53 renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer
Change-Id: Ie4c495e1ffb8907798c9ebefe1eb3a506582e2a2
2016-04-15 10:54:13 +02:00
Axel Uhl b7b12f4b2d fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName
Change-Id: I80156bdbef120b6c70bdd18e8be14facbe4a4b82
2016-04-15 10:53:01 +02:00
Axel Uhl b41035e067 fixed imports after merge; added a TODO for unused method initFactor in MainScheduleFragment
Change-Id: I12bf0d8333b579f39719966abf98445eb3a0aad0
2016-04-15 10:51:32 +02:00
Axel Uhl 5a75caf0f5 Merge branch 'master' into ubilabs--rcapp--bug-1267
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: I5fa5dce7ca0cbb7d7b4c7804fe010b7200b64bf3
2016-04-15 10:49:18 +02:00
Axel Uhl e371774f99 Merge branch 'master' into ubilabs--rcapp--bug-3598 2016-04-15 09:34:13 +02:00
Axel Uhl ad5c6692b5 changed ignore syntax for build.info files
Change-Id: I2688d3cd171c8101f55ce706f4c5e6c6bb927cce
2016-04-15 09:16:45 +02:00
Axel Uhl 118ffa2b25 added missing translations for Android
Change-Id: I05eedd7b0574aa4d370fa4da946fbfb9ed74d18a
2016-04-15 08:07:58 +02:00
Axel Uhl 3de80cd641 fix attempt for bug 3601: using ViewCompat.getMinimumWidth/Height to avoid NoSuchMethodError on older API levels
Change-Id: I4a1eff2e7eead08617719c15e6a31e7df97ec616
2016-04-15 07:39:31 +02:00
Axel Uhl 1070cece12 Merge remote branch 'origin/master' 2016-04-15 06:21:13 +02:00
Axel Uhl 2dcfe13d97 Merge remote branch 'origin/bug3599' 2016-04-15 06:18:09 +02:00
Axel Uhl c8accfd1f8 Merge remote-tracking branch 'server/master' 2016-04-14 23:14:26 +02:00
Axel Uhl a2176d0bc5 fixed generation of app names in invitation e-mails
Change-Id: I7655edbb636b8bb9016b71d50fee1561585d3fc1
2016-04-14 23:12:06 +02:00
Axel Uhl 63ecb41944 fixed bug3599, tests now pass
Change-Id: Ifffdc82c0b8705440de635c48ce4b90571cb0096
2016-04-14 19:04:14 +02:00
Axel Uhl 30b5b08017 added failing replication test case for bug3599
Change-Id: I68e9ff67e04d109dee547b4d3c9f75b75eed3b7d
2016-04-14 18:59:15 +02:00
Axel Uhl 8781eefbeb added second fialing test case for user store
Change-Id: Iaaa502113b89689aac04267fe5ea158230d5cee4
2016-04-14 18:41:33 +02:00
Axel Uhl 426a944f3b first failing test case that shows that the UserStore doesn't clear the userByAccessToken structure in its clear() method
Change-Id: Id93bdbcc16a6f94c08547fa596685dfbe04cdb8a
2016-04-14 18:30:55 +02:00
Axel Uhl ed3ad16678 starting to work on making mark ID handling in buoy pinging app consistent
Change-Id: Ic148adcce06187c2f0b989f4b6a5435caab2f082
2016-04-14 18:25:48 +02:00
Axel Uhl e1e5054e32 started adding a failing test case for bug3599 2016-04-14 18:22:54 +02:00
Axel Uhl a60ca6ff8c fixed minute display for wind status servlet 2016-04-14 16:32:25 +02:00
Axel Uhl 43a391713d fixed wind status servlet time lag output (s instead of min) 2016-04-14 16:16:18 +02:00
Axel Uhl 78764593d2 use constants from AnalyticsContract.Mark instead of string literals in RegattaFragment
Change-Id: I0a0f43374c8ab585dbab0bde690c9a91780f2fa8
2016-04-14 13:11:24 +02:00
Axel Uhl 9acb1c4748 removed setters from MarkPingInfo and use final fields and constructor instead; this doesn't have to be mutable
Change-Id: I1444cf25d064ee70524ce524a443ba15500efe12
2016-04-14 13:03:00 +02:00
Axel Uhl 6c85d0462b use final for local variables where possible
Change-Id: Ieac283b754c17a00a4389a5339068a4415eb6b54
2016-04-14 12:58:32 +02:00
Axel Uhl 8b59b63ace using SharedDomainFactory to deserialize marks in buoy pinging app
Change-Id: I1ad347f3e35cca1476603d46679977a08ecaaf93
2016-04-14 12:45:40 +02:00
Axel Uhl 972209066f cleaned up CheckinManager constructors
Change-Id: I024db6ee02a3833ed5e0191999f73eea9d3c05d1
2016-04-14 12:32:42 +02:00
Axel Uhl 0b2f1f327f removed obsolete comment
Change-Id: I7e148a560828c2d6b530f338798a8765551a676a
2016-04-14 11:13:32 +02:00
Axel Uhl 9f7277580b renamed accessor method for mCourseAreaContainer
Change-Id: I9d8610d9f0c8dd0d8461bd3552ab81a0d909b907
2016-04-14 11:12:25 +02:00
Axel Uhl 4006732304 renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer
Change-Id: Ie4c495e1ffb8907798c9ebefe1eb3a506582e2a2
2016-04-14 11:11:24 +02:00
Axel Uhl 1b239ec4bf Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop 2016-04-14 11:10:06 +02:00
Axel Uhl 24afb859f6 fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName
Change-Id: I80156bdbef120b6c70bdd18e8be14facbe4a4b82
2016-04-14 11:08:45 +02:00
Axel Uhl 319033cbc2 formatting change
Change-Id: Ibd966673dd25530ac0495845a0f5f3a5778a6e3e
2016-04-14 11:05:05 +02:00