Refactored the Home and Favorites business logic. This includes a fix…

… for the timing and order of calls for fetching the latest arrival times from the cache.

Also, removed the CachedDataMap class and just added simple hasCachedData methods to each repo class.

app/src/main/java/com/andrewvora/apps/rideatlanta/MainActivity.java

@@ -23,7 +23,6 @@
 import com.andrewvora.apps.rideatlanta.buses.BusRoutesContract;
 import com.andrewvora.apps.rideatlanta.buses.BusRoutesFragment;
 import com.andrewvora.apps.rideatlanta.buses.BusRoutesPresenter;
-import com.andrewvora.apps.rideatlanta.data.CachedDataMap;
 import com.andrewvora.apps.rideatlanta.data.remote.buses.GetBusesIntentService;
 import com.andrewvora.apps.rideatlanta.data.remote.trains.GetTrainsIntentService;
 import com.andrewvora.apps.rideatlanta.data.repos.BusesRepo;
@@ -202,7 +201,12 @@ private void onHomeTabSelected() {
             fragment = HomeFragment.newInstance();
         }
 
-        HomeContract.Presenter presenter = new HomePresenter(fragment);
+        HomeContract.Presenter presenter = new HomePresenter(
+                fragment,
+                FavoriteRoutesRepo.getInstance(this),
+                NotificationsRepo.getInstance(this),
+                BusesRepo.getInstance(this),
+                TrainsRepo.getInstance(this));
         fragment.setPresenter(presenter);
 
         startFragment(R.id.fragment_container, fragment, HomeFragment.TAG, false);
@@ -261,8 +265,7 @@ private void onNotificationsTabSelected() {
 
         NotificationsContract.Presenter presenter = new NotificationsPresenter(
                 fragment,
-                NotificationsRepo.getInstance(this),
-                CachedDataMap.getInstance());
+                NotificationsRepo.getInstance(this));
         fragment.setPresenter(presenter);
 
         startFragment(R.id.fragment_container, fragment, NotificationsFragment.TAG, false);

app/src/main/java/com/andrewvora/apps/rideatlanta/buses/BusRoutesPresenter.java

@@ -6,7 +6,6 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.andrewvora.apps.rideatlanta.data.CachedDataMap;
 import com.andrewvora.apps.rideatlanta.data.contracts.BusesDataSource;
 import com.andrewvora.apps.rideatlanta.data.contracts.FavoriteRoutesDataSource;
 import com.andrewvora.apps.rideatlanta.data.models.Bus;
@@ -104,7 +103,6 @@ private BusesDataSource.GetBusesCallback createGetBusesCallbackInstance() {
             @Override
             public void onFinished(List<Bus> buses) {
                 updateView(buses);
-                makeCachedDataAvailable();
             }
 
             @Override
@@ -119,11 +117,7 @@ private void updateView(List<Bus> buses) {
     }
 
     private boolean hasNoCachedData() {
-        return !CachedDataMap.getInstance().hasCachedData(TAG);
-    }
-
-    private void makeCachedDataAvailable() {
-        CachedDataMap.getInstance().put(TAG, true);
+        return !mBusesRepo.hasCachedData();
     }
 
     private void useCachedDataIfAvailable() {

app/src/main/java/com/andrewvora/apps/rideatlanta/data/contracts/BusesDataSource.java

@@ -35,4 +35,6 @@ interface DeleteBusesCallback {
     void deleteAllBus(@Nullable DeleteBusesCallback callback);
     void saveBus(@NonNull Bus route);
     void reloadBuses();
+
+    boolean hasCachedData();
 }

app/src/main/java/com/andrewvora/apps/rideatlanta/data/contracts/FavoriteRoutesDataSource.java

@@ -29,4 +29,6 @@ interface GetFavoriteRouteCallback {
     void deleteRoute(@NonNull FavoriteRouteDataObject route);
     void deleteAllRoutes();
     void reloadRoutes();
+
+    boolean hasCachedData();
 }

app/src/main/java/com/andrewvora/apps/rideatlanta/data/contracts/NotificationsDataSource.java

@@ -10,7 +10,6 @@
  * Created by faytx on 10/22/2016.
  * @author Andrew Vorakrajangthiti
  */
-
 public interface NotificationsDataSource {
 
     interface GetNotificationsCallback {
@@ -22,4 +21,6 @@ interface GetNotificationsCallback {
     void deleteAllNotifications();
     void saveNotification(@NonNull Notification notification);
     void reloadNotifications();
+
+    boolean hasCachedData();
 }

app/src/main/java/com/andrewvora/apps/rideatlanta/data/contracts/TrainsDataSource.java

@@ -36,4 +36,6 @@ interface DeleteTrainRoutesCallback {
     void deleteAllTrains(@Nullable DeleteTrainRoutesCallback callback);
     void saveTrain(@NonNull Train route);
     void reloadTrains();
+
+    boolean hasCachedData();
 }

app/src/main/java/com/andrewvora/apps/rideatlanta/data/local/buses/BusesLocalSource.java

@@ -164,6 +164,11 @@ public void saveBus(@NonNull Bus route) {
         }
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void reloadBuses() {
         // reload handled in the BusesRepo

app/src/main/java/com/andrewvora/apps/rideatlanta/data/local/notifications/NotificationsLocalSource.java

@@ -37,6 +37,11 @@ public static NotificationsLocalSource getInstance(@NonNull Context context) {
         return mInstance;
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void getNotifications(@NonNull GetNotificationsCallback callback) {
         SQLiteDatabase db = mDbHelper.getReadableDatabase();

app/src/main/java/com/andrewvora/apps/rideatlanta/data/local/routes/FavoriteRoutesLocalSource.java

@@ -123,6 +123,11 @@ public void deleteRoute(@NonNull FavoriteRouteDataObject route) {
         db.delete(FavoriteRoutesTable.TABLE_NAME, whereClause, whereArgs);
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void reloadRoutes() {
         // reloading is handled in the FavoriteRoutesRepo.

app/src/main/java/com/andrewvora/apps/rideatlanta/data/local/trains/TrainsLocalSource.java

@@ -189,6 +189,11 @@ public void saveTrain(@NonNull Train route) {
         }
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void reloadTrains() {
         // refreshing handled in the TrainRepo

app/src/main/java/com/andrewvora/apps/rideatlanta/data/remote/buses/BusesRemoteSource.java

@@ -94,6 +94,11 @@ public void reloadBuses() {
 
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     private RequestQueue getRequestQueue() {
         if(mRequestQueue == null) {
             mRequestQueue = Volley.newRequestQueue(mContext);

app/src/main/java/com/andrewvora/apps/rideatlanta/data/remote/notifications/NotificationsRemoteSource.java

@@ -76,6 +76,11 @@ public void failure(TwitterException exception) {
         });
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void deleteAllNotifications() {
         // remote notifications are read-only

app/src/main/java/com/andrewvora/apps/rideatlanta/data/remote/routes/FavoriteRoutesRemoteSource.java

@@ -37,6 +37,11 @@ public static FavoriteRoutesRemoteSource getInstance(@NonNull Context context) {
         return mInstance;
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     @Override
     public void getFavoriteRoutes(@NonNull GetFavoriteRoutesCallback callback) {
 

app/src/main/java/com/andrewvora/apps/rideatlanta/data/remote/trains/TrainsRemoteSource.java

@@ -119,6 +119,11 @@ private <T> void addToRequestQueue(Request<T> request) {
         requestQueue.add(request);
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return false;
+    }
+
     private static class ParseTrainsJsonTask extends AsyncTask<JSONArray, Void, List<Train>> {
         @NonNull
         private GetTrainRoutesCallback callbackRef;

app/src/main/java/com/andrewvora/apps/rideatlanta/data/repos/BusesRepo.java

@@ -26,10 +26,9 @@ public class BusesRepo implements BusesDataSource {
 
     private static BusesRepo mInstance;
 
-    @NonNull
-    private Map<String, Bus> mCachedBuses;
-    private BusesDataSource mRemoteSource;
-    private BusesDataSource mLocalSource;
+    @NonNull private Map<String, Bus> mCachedBuses;
+    @NonNull private BusesDataSource mRemoteSource;
+    @NonNull private BusesDataSource mLocalSource;
 
     private boolean mCacheIsDirty;
 
@@ -136,6 +135,11 @@ public void saveBus(@NonNull Bus route) {
         }
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return !mCachedBuses.isEmpty();
+    }
+
     @Override
     public void reloadBuses() {
         mCacheIsDirty = true;

app/src/main/java/com/andrewvora/apps/rideatlanta/data/repos/FavoriteRoutesRepo.java

@@ -21,11 +21,10 @@ public class FavoriteRoutesRepo implements FavoriteRoutesDataSource {
 
     private static FavoriteRoutesRepo mInstance;
 
-    private FavoriteRoutesDataSource mRemoteSource;
-    private FavoriteRoutesDataSource mLocalSource;
+    @NonNull private FavoriteRoutesDataSource mRemoteSource;
+    @NonNull private FavoriteRoutesDataSource mLocalSource;
 
-    @NonNull
-    private Map<String, FavoriteRoute> mCachedRoutes;
+    @NonNull private Map<String, FavoriteRoute> mCachedRoutes;
 
     private boolean mCacheIsDirty;
 
@@ -119,6 +118,11 @@ public void deleteRoute(@NonNull FavoriteRouteDataObject route) {
         mCachedRoutes.remove(getMapKeyFor(route));
     }
 
+    @Override
+    public boolean hasCachedData() {
+        return !mCachedRoutes.isEmpty();
+    }
+
     @Override
     public void reloadRoutes() {
         mCacheIsDirty = true;

app/src/main/java/com/andrewvora/apps/rideatlanta/data/repos/NotificationsRepo.java

@@ -2,17 +2,16 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.andrewvora.apps.rideatlanta.data.models.Notification;
 import com.andrewvora.apps.rideatlanta.data.contracts.NotificationsDataSource;
 import com.andrewvora.apps.rideatlanta.data.local.notifications.NotificationsLocalSource;
+import com.andrewvora.apps.rideatlanta.data.models.Notification;
 import com.andrewvora.apps.rideatlanta.data.remote.notifications.NotificationsRemoteSource;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Created by faytx on 10/22/2016.
@@ -23,16 +22,19 @@ public class NotificationsRepo implements NotificationsDataSource {
 
     private static NotificationsRepo mInstance;
 
-    private Map<String, Notification> mCachedNotifications;
-    private NotificationsDataSource mLocalSource;
-    private NotificationsDataSource mRemoteSource;
+    @NonNull private Map<String, Notification> mCachedNotifications;
+    @NonNull private NotificationsDataSource mLocalSource;
+    @NonNull private NotificationsDataSource mRemoteSource;
+
     private boolean mCacheIsDirty;
 
     private NotificationsRepo(@NonNull NotificationsDataSource localSource,
                               @NonNull NotificationsDataSource remoteSource)
     {
         mLocalSource = localSource;
         mRemoteSource = remoteSource;
+
+        mCachedNotifications = new ConcurrentHashMap<>();
     }
 
     public static NotificationsRepo getInstance(@NonNull Context context) {
@@ -46,13 +48,14 @@ public static NotificationsRepo getInstance(@NonNull Context context) {
         return mInstance;
     }
 
-    public static void destroyInstance() {
-        mInstance = null;
+    @Override
+    public boolean hasCachedData() {
+        return !mCachedNotifications.isEmpty();
     }
 
     @Override
     public void getNotifications(@NonNull final GetNotificationsCallback callback) {
-        if(mCachedNotifications != null && !mCacheIsDirty) {
+        if(!mCachedNotifications.isEmpty() && !mCacheIsDirty) {
             callback.onFinished(new ArrayList<>(mCachedNotifications.values()));
         }
         else if(mCacheIsDirty) {
@@ -79,7 +82,6 @@ public void deleteAllNotifications() {
         mLocalSource.deleteAllNotifications();
         mRemoteSource.deleteAllNotifications();
 
-        mCachedNotifications = checkNotNull(mCachedNotifications);
         mCachedNotifications.clear();
     }
 
@@ -116,7 +118,6 @@ public void onError(Object error) {
 
     private void reloadCachedNotifications(@NonNull List<Notification> notifications) {
 
-        mCachedNotifications = checkNotNull(mCachedNotifications);
         mCachedNotifications.clear();
 
         for(Notification notification : notifications) {
@@ -136,16 +137,6 @@ private void reloadLocalNotifications(@NonNull List<Notification> notifications)
     }
 
     private void cacheNotification(Notification notification) {
-        mCachedNotifications = checkNotNull(mCachedNotifications);
         mCachedNotifications.put(notification.getNotificationId(), notification);
     }
-
-    private Map<String, Notification> checkNotNull(@Nullable Map<String, Notification> map)
-    {
-        if(map == null) {
-            map = new LinkedHashMap<>();
-        }
-
-        return map;
-    }
 }