From d0b53f6f1bc7cf6e80887446313c8a31cb5df5af Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 2 Dec 2016 15:52:55 +0100 Subject: [PATCH] removed now redundant casts based on the introduction of generics for CheckinData Change-Id: I380626162bf4bb78ec6a31a3c638334cb3cf3427 --- .../tracking/app/ui/activities/RegattaActivity.java | 5 ++--- .../android/tracking/app/ui/activities/StartActivity.java | 7 +++---- .../positioning/app/ui/activities/RegattaActivity.java | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java index a9508decd06..dce1ed84e06 100755 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java @@ -420,10 +420,9 @@ public class RegattaActivity extends AbstractRegattaActivity @Override public void onCheckinDataAvailable(CheckinData checkinData) { if (checkinData != null) { - CheckinData data = (CheckinData) checkinData; try { - if (data instanceof CompetitorCheckinData) { - CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) data; + if (checkinData instanceof CompetitorCheckinData) { + CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData; DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinDigest); DatabaseHelper.getInstance().storeCompetitorCheckinRow(this, competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(), competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl()); diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java index 246cc6e5af0..3ee0ee21b7a 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java @@ -103,11 +103,10 @@ public class StartActivity extends AbstractStartActivity { @Override public void onCheckinDataAvailable(CheckinData data) { - if (data != null && data instanceof CheckinData) { - CheckinData checkinData = (CheckinData) data; - if (!checkinData.isUpdate()) { + if (data != null) { + if (!data.isUpdate()) { getHomeFragment().displayUserConfirmationScreen(data); - } else if (checkinData.isUpdate()) { + } else if (data.isUpdate()) { updateRegatta(data); } } diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java index b65d1128d13..c69cd5b18db 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java @@ -143,9 +143,8 @@ public class RegattaActivity extends AbstractRegattaActivity { } @Override - public void onCheckinDataAvailable(CheckinData checkinData) { - if (checkinData != null && checkinData instanceof CheckinData) { - CheckinData data = (CheckinData) checkinData; + public void onCheckinDataAvailable(CheckinData data) { + if (data != null) { try { DatabaseHelper.getInstance().updateMarks(this, data); } catch (DatabaseHelper.GeneralDatabaseHelperException e) {