From f45c3e5bed20699b3f08a57ff40fc36c159defc3 Mon Sep 17 00:00:00 2001 From: Bennet Brunsen Date: Tue, 28 Jun 2016 11:49:57 +0200 Subject: [PATCH] Make regatta list adapter independent of competitor --- .../android/tracking/app/provider/AnalyticsContract.java | 4 ++-- .../android/tracking/app/ui/fragments/HomeFragment.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java index 86a912f6a52..5ce59952385 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java @@ -40,8 +40,8 @@ public class AnalyticsContract { public static final Uri BASE_CONTENT_URI = Uri.parse("content://" + CONTENT_AUTHORITY); private static final String PATH_COMPETITOR = "competitors"; - private static final String PATH_EVENT = "events"; - private static final String PATH_LEADERBOARD = "leaderboards"; + public static final String PATH_EVENT = "events"; + public static final String PATH_LEADERBOARD = "leaderboards"; private static final String PATH_CHECKIN_URI = "checkin_uris"; public static class LeaderboardsEventsJoined { diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java index 15425a241cc..1be6777fcde 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java @@ -197,10 +197,11 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback public Loader onCreateLoader(int loaderId, Bundle bundle) { switch (loaderId) { case REGATTA_LOADER: - String[] projection = new String[] { "events.event_checkin_digest", "events.event_id", "events._id", - "events.event_name", "events.event_server", "competitors.competitor_display_name", - "competitors.competitor_id", "leaderboards.leaderboard_name", - "competitors.competitor_country_code", "competitors.competitor_sail_id" }; + String[] projection = new String[] { AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_CHECKIN_DIGEST, + AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event._ID, + AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_NAME, + AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_SERVER, + AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME}; return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI, projection, null, null, null);