Adding online layer fetching on load

Author: Kevin Gilland

mage/src/main/java/mil/nga/giat/mage/MageApplication.java

@@ -49,6 +49,7 @@
 import mil.nga.giat.mage.sdk.datastore.user.UserHelper;
 import mil.nga.giat.mage.sdk.event.ISessionEventListener;
 import mil.nga.giat.mage.sdk.exceptions.UserException;
+import mil.nga.giat.mage.sdk.fetch.ImageryServerFetch;
 import mil.nga.giat.mage.sdk.fetch.StaticFeatureServerFetch;
 import mil.nga.giat.mage.sdk.http.HttpClientManager;
 import mil.nga.giat.mage.sdk.http.resource.UserResource;
@@ -85,8 +86,6 @@ public interface OnLogoutListener {
 
 	private ObservationNotificationListener observationNotificationListener = null;
 
-	private StaticFeatureServerFetch staticFeatureServerFetch = null;
-
 	private Activity runningActivity;
 
     @Override
@@ -170,21 +169,28 @@ public void onLogin() {
 		ObservationFetchWorker.Companion.beginWork();
 
 		// Pull static layers and features just once
-		loadStaticFeatures(false, null);
+		loadOnlineAndOfflineLayers(false, null);
 
 		InitializeMAGEWearBridge.startBridgeIfWearBuild(getApplicationContext());
 	}
 
-	public void loadStaticFeatures(final boolean force, final StaticFeatureServerFetch.OnStaticLayersListener listener) {
+	private void loadOnlineAndOfflineLayers(final boolean force, final StaticFeatureServerFetch.OnStaticLayersListener listener) {
 		@SuppressLint("StaticFieldLeak") AsyncTask<Void, Void, Void> fetcher = new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... voids) {
-				staticFeatureServerFetch = new StaticFeatureServerFetch(getApplicationContext());
+				StaticFeatureServerFetch staticFeatureServerFetch = new StaticFeatureServerFetch(getApplicationContext());
 				try {
 					staticFeatureServerFetch.fetch(force, listener);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
+
+				try {
+					ImageryServerFetch imageryServerFetch = new ImageryServerFetch(getApplicationContext());
+					imageryServerFetch.fetch();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 				return null;
 			}
 		} ;
@@ -333,11 +339,6 @@ private void startFetching() {
 	private void destroyFetching() {
 		stopService(new Intent(getApplicationContext(), LocationFetchService.class));
 		stopService(new Intent(getApplicationContext(), ObservationFetchService.class));
-
-		if (staticFeatureServerFetch != null) {
-			staticFeatureServerFetch.destroy();
-			staticFeatureServerFetch = null;
-		}
 	}
 
 	/**