Skip to content

Commit 62d6212

Browse files
committed
#122 #129 #137 - Does not re-instantiate a Deployment each time we get a new list from ExternalStorage or the server.
1 parent a573824 commit 62d6212

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

app/src/main/java/org/redcross/openmapkit/deployments/Deployments.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,16 @@ private void putDeployment(JSONObject deploymentJson) {
5555
nameToIdx.put(name, deployments.size());
5656
deployments.add(deployment);
5757
}
58+
59+
/**
60+
* Note: Needs Server Synchronization
61+
*
62+
* https://github.com/AmericanRedCross/OpenMapKitAndroid/issues/137
63+
*/
5864
// replace existing deployment
59-
else {
60-
deployments.set(idx, deployment);
61-
}
65+
// else {
66+
// deployments.set(idx, deployment);
67+
// }
6268
}
6369

6470
public void fetch(DeploymentsActivity activity, String url) {
@@ -110,8 +116,6 @@ private void parseJsonFromApi(String json) {
110116
*/
111117
private Deployments.Status fetchFromExternalStorage() {
112118
Deployments.Status status = Status.SERVER_NOT_FOUND;
113-
deployments.clear();
114-
nameToIdx.clear();
115119
List<File> files = ExternalStorage.allDeploymentJSONFiles();
116120
for (File f : files) {
117121
try {

0 commit comments

Comments
 (0)