Axel Uhl
cfe4af7251
added null checks for boat.getColor() in app code
...
Change-Id: I3878752357eb0836f98b633d64366df7cefa20be
2018-04-10 18:43:07 +02:00
Axel Uhl
9cfb66cbe8
fixed RaceManager app's start order acquisition
...
Change-Id: Ie287abcd78c8856476759724bed11c18674329c8
2018-04-09 17:06:50 +02:00
Axel Uhl
06447318e5
bug4500: consolidated the two Competitor Json (De-)Serializers into one
...
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
2018-04-09 16:39:17 +02:00
Axel Uhl
40b3425a76
Merge branch 'master' into bug2822_boatcolors
...
Change-Id: Ibf6e7b9cff993cd42bf55321aa3ad998e8775400
2018-03-20 13:58:52 +01:00
Axel Uhl
1bb3c2cefd
removed more @SuppressWarning annotations no longer needed with Oxygen
...
Change-Id: I6bc209c415e1e3917033b3242f24f16b2e43fde9
2018-03-20 13:56:31 +01:00
Axel Uhl
19a3d4db44
Merge branch 'master' into bug2822_boatcolors
...
Change-Id: I4b22e9f80faead020963a5b61cfbea6dffd20175
2018-03-19 16:17:34 +01:00
Axel Uhl
db583da3a0
removed import to avoid warning
...
Change-Id: I148fa0340a3042f84940ebe9d58e48d8120c1b47
2018-03-16 15:40:59 +01:00
Peter Siegmund
5145f967e0
handle empty start / end date for events in InSight app
2018-03-16 08:52:00 +01:00
Peter Siegmund
ca7a167455
use boat color into InSight app
2018-03-08 11:26:25 +01:00
Peter Siegmund
b73eeb8190
define default encoding charset for query params
2018-03-08 08:11:42 +01:00
Peter Siegmund
b8246e02ed
checkin for and automatic start tracking boats
2018-03-07 17:07:59 +01:00
Peter Siegmund
9cb430ea16
save and show boat in startup screen
2018-03-07 16:44:46 +01:00
Peter Siegmund
c6cf021fd5
re-encode IDs (competitor, mark and boat) after extracting from url
2018-03-07 16:15:19 +01:00
Peter Siegmund
1f21bba095
add boat to database and get boat data from server
2018-03-07 15:41:18 +01:00
Peter Siegmund
91bceb0499
restricted tag length in logcat
2018-03-07 14:07:13 +01:00
Peter Siegmund
ec9102e2cd
use of competitor boat in PenaltyFragment
2018-02-20 16:13:16 +01:00
Peter Siegmund
aff30b8f52
use canBoatsOfCompetitorsChangePerRace in TrackingListFragment
2018-02-20 11:33:06 +01:00
Peter Siegmund
f676b69b9d
set canBoatsOfCompetitorsChangePerRace in OfflineDataManager
2018-02-20 11:31:31 +01:00
Peter Siegmund
4361781265
adding competitor/boat combination to tracking and penalty list
2018-02-13 16:03:46 +01:00
Peter Siegmund
5e74cdc66e
fixed changed endpoint
2018-02-13 11:28:11 +01:00
Frank Mittag
7ba23e179d
Implemented usage of CompetitorAndBoatDeserializer in rcApp -> Peter to check this now
2018-02-12 10:32:36 +01:00
Peter Siegmund
a1d35afc2f
rewrite of leaderboard loading (use pair instead of competitor)
2018-02-06 16:12:33 +01:00
Frank Mittag
e9e52697a6
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2018-01-31 15:04:09 +01:00
Peter Siegmund
b9239c60c5
Merge branch 'bug4232'
2018-01-30 11:35:42 +01:00
Axel Uhl
a20ce70fb3
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: I0f5333eae69540da5d87c4a7cdb0c2bef9988b38
2018-01-26 09:21:02 +01:00
Joel Bürkle
9698567cc1
Merging master with branch 'bug4420'
2018-01-22 08:39:23 +00:00
Peter Siegmund
ad418d25fb
show merge error hint in edit dialog
2018-01-19 17:14:18 +01:00
Peter Siegmund
257515074a
check for competitor id (not with object equal)
2018-01-19 16:50:18 +01:00
Peter Siegmund
6030e90085
remove id tag for demo overlay in tablet version
2018-01-19 12:02:18 +01:00
Peter Siegmund
b67ccb4d8a
fixed missing "publish" issue in trackinglist
2018-01-19 11:57:05 +01:00
Peter Siegmund
6b33e400e1
fixed issue with "no configuration found" in login
2018-01-19 11:40:10 +01:00
Peter Siegmund
0408b5e92d
Merge branch 'master' into bug4232
2018-01-18 14:53:51 +01:00
Peter Siegmund
f0f39e2ed7
reset merge state on "apply"
2018-01-18 14:51:10 +01:00
Peter Siegmund
fc247ec919
don't reset visible data after publish
2018-01-18 13:48:13 +01:00
Peter Siegmund
234585dde9
also show marker for published data
2018-01-18 13:12:03 +01:00
Peter Siegmund
dcd3d82d47
Merge branch 'bug4269'
2018-01-17 16:09:17 +01:00
Peter Siegmund
19e0f16508
fixed english wording
2018-01-17 15:45:29 +01:00
Peter Siegmund
568a35c186
change error alert wording
2018-01-17 15:31:12 +01:00
Peter Siegmund
303d173c14
add annotation for Eclipse build
2018-01-17 15:03:50 +01:00
Frank Mittag
be9dc21f40
fixed a case where getShortInfo() can be null
2018-01-17 10:36:59 +01:00
Joel Bürkle
25e399ae49
Creating dummy files inside res-folders for bug 4420
2018-01-17 09:13:38 +00:00
Peter Siegmund
f4d50868cf
No result (e.g. offline or timeout) for hello-call throws an IOException
...
-> show retry AlertDialog instead of user credentials
2018-01-16 15:46:21 +01:00
Frank Mittag
debd0b04ba
some little fixes regarding usage of competitor.getShortInfo()
2018-01-16 15:21:37 +01:00
Axel Uhl
dcb43721e6
don't use "instanceof CompetitorWithBoat" because of live migration;
...
when a tracked race is loaded into a regatta with changing boats and the
competitor has a boat, it is migrated "in place" with its boat reference
set to null; this way it is possible to have a CompetitorWithBoat object
that returns false from hasBoat(). Therefore, hasBoat() must be
preferred over a type check
Change-Id: Ic74441bfb48566e66cb88391b52537303638d564
2018-01-16 12:43:30 +01:00
Axel Uhl
5073ea75d7
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: I61c922f7a1d7ece025ace4cd6277ccce3640d055
2018-01-16 11:24:13 +01:00
Peter Siegmund
13f8b7d437
add "demo mode" overlay to race view
2018-01-16 11:23:41 +01:00
Axel Uhl
842d215d93
Merge branch 'master' into bug4232
...
Change-Id: I6734e53d0ed9e39fd76d93fc15ec95af25d84d7f
2018-01-12 18:05:40 +01:00
Peter Siegmund
95484d63a4
save accessToken to preferences in QRHelper
...
(single point to save from QR code)
2018-01-12 11:10:29 +01:00
Peter Siegmund
ba71cf1ee7
fixed blocking lint warnings while "./gradlew build" for all apps
2018-01-05 14:20:49 +01:00
Peter Siegmund
d975e5f806
Merge branch 'master' into bug4177
2018-01-05 13:52:17 +01:00
Axel Uhl
Peter Siegmund
Frank Mittag
Joel Bürkle