From 07caaa9f37e29c12687b915534bc157a93c14db8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 22 Apr 2019 16:07:25 +0200
Subject: [PATCH] clean up

---
 .../thoughtcrime/securesms/map/DataCollectionTask.java   | 4 +---
 src/org/thoughtcrime/securesms/map/DataCollector.java    | 9 +++------
 src/org/thoughtcrime/securesms/map/MapDataManager.java   | 2 --
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/map/DataCollectionTask.java b/src/org/thoughtcrime/securesms/map/DataCollectionTask.java
index efd786df6..b5f095966 100644
--- a/src/org/thoughtcrime/securesms/map/DataCollectionTask.java
+++ b/src/org/thoughtcrime/securesms/map/DataCollectionTask.java
@@ -67,10 +67,8 @@ public class DataCollectionTask extends AsyncTask<Void, Void, Void> {
                 featureCollections,
                 lastPositions,
                 boundingBuilder);
-        int markerCounter = 0;
         for (int contactId : contactIds) {
-
-           markerCounter = markerCounter + dataCollector.updateSource(chatId,
+           dataCollector.updateSource(chatId,
                     contactId,
                     System.currentTimeMillis() - TIME_FRAME,
                     TIMESTAMP_NOW);
diff --git a/src/org/thoughtcrime/securesms/map/DataCollector.java b/src/org/thoughtcrime/securesms/map/DataCollector.java
index 60d852955..5c9bbc09d 100644
--- a/src/org/thoughtcrime/securesms/map/DataCollector.java
+++ b/src/org/thoughtcrime/securesms/map/DataCollector.java
@@ -13,7 +13,6 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import org.thoughtcrime.securesms.map.model.MapSource;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -53,14 +52,14 @@ public class DataCollector {
     }
 
 
-    public int updateSource(int chatId,
+    public void updateSource(int chatId,
                               int contactId,
                               long startTimestamp,
                               long endTimestamp) {
         DcArray locations = dcContext.getLocations(chatId, contactId, startTimestamp, endTimestamp);
         int count = locations.getCnt();
         if (count == 0) {
-            return 0;
+            return;
         }
 
         MapSource contactMapMetadata = contactMapSources.get(contactId);
@@ -70,7 +69,7 @@ public class DataCollector {
 
         LinkedList<Feature> sortedPointFeatures = featureCollections.get(contactMapMetadata.getMarkerFeatureCollection());
         if (sortedPointFeatures != null && sortedPointFeatures.size() == count) {
-            return -1;
+            return;
         } else {
             sortedPointFeatures = new LinkedList<>();
         }
@@ -121,8 +120,6 @@ public class DataCollector {
 
         featureCollections.put(contactMapMetadata.getMarkerFeatureCollection(), sortedPointFeatures);
         featureCollections.put(contactMapMetadata.getLineFeatureCollection(), sortedLineFeatures);
-
-        return count;
     }
 
     private MapSource addContactMapSource(ConcurrentHashMap<Integer, MapSource> contactMapSources, int contactId) {
diff --git a/src/org/thoughtcrime/securesms/map/MapDataManager.java b/src/org/thoughtcrime/securesms/map/MapDataManager.java
index 92a9577a2..df3941c74 100644
--- a/src/org/thoughtcrime/securesms/map/MapDataManager.java
+++ b/src/org/thoughtcrime/securesms/map/MapDataManager.java
@@ -13,7 +13,6 @@ import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
 
-import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcEventCenter;
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
@@ -34,7 +33,6 @@ import org.thoughtcrime.securesms.map.model.MapSource;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;