vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 08:41:10 +01:00
Code Issues Releases Wiki Activity

Update podlist

Browse source
This commit is contained in:
Gregor Santner 2016-10-07 03:47:59 +02:00
parent c550c2474e
commit 64a9d02e7c
4 changed files with 1469 additions and 1444 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
View file

@ -1,6 +1,8 @@
package com.github.dfa.diaspora_android.data;
import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.Serializable;
import java.util.ArrayList;
@ -8,10 +10,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
/**
* Created by gsantner (https://gsantner.github.io/ on 30.09.16.
@ -25,6 +23,8 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
private boolean trackMergeChanges = false;
private Integer trackAddedIndexStart = -1;
private List<Integer> trackUpdatedIndexes = new ArrayList<>();
private boolean keepOldNameDuringMerge = false;
private long timestamp;
public DiasporaPodList() {
}
@ -45,6 +45,9 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
pods.add(pod);
}
}
if (json.has("timestamp")) {
timestamp = json.getLong("timestamp");
}
return this;
}
@ -58,6 +61,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
jpods.put(pod.toJson());
}
json.put("pods", jpods);
json.put("timestamp", System.currentTimeMillis());
return json;
}
@ -89,6 +93,9 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
if (updatePodBak.getScore() != 0 && updatePod.getScore() == 0) {
updatePod.setScore(updatePodBak.getScore());
}
if (!updatePodBak.getName().equals("") && keepOldNameDuringMerge) {
updatePod.setName(updatePodBak.getName());
}
if (isTrackMergeChanges()) {
trackUpdatedIndexes.add(index);
}
@ -154,12 +161,20 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
return trackUpdatedIndexes;
}
public boolean isKeepOldNameDuringMerge() {
return keepOldNameDuringMerge;
}
public void setKeepOldNameDuringMerge(boolean keepOldNameDuringMerge) {
this.keepOldNameDuringMerge = keepOldNameDuringMerge;
}
/* ██████╗ ██████╗ ██████╗
* ██╔══██╗██╔═══██╗██╔══██╗
* ██████╔╝██║ ██║██║ ██║
* ██╔═══╝ ██║ ██║██║ ██║
* ██║ ╚██████╔╝██████╔╝
* ╚═╝ ╚═════╝ ╚═════╝ */
* ██╔══██╗██╔═══██╗██╔══██╗
* ██████╔╝██║ ██║██║ ██║
* ██╔═══╝ ██║ ██║██║ ██║
* ██║ ╚██████╔╝██████╔╝
* ╚═╝ ╚═════╝ ╚═════╝ */
public static class DiasporaPod implements Iterable<DiasporaPodList.DiasporaPod.DiasporaPodUrl>, Comparable<DiasporaPod>, Serializable {
private List<DiasporaPodUrl> podUrls = new ArrayList<>();
private List<String> mainLangs = new ArrayList<>();
@ -289,7 +304,6 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
/*
* Getter & Setter
*/
@NonNull
public List<DiasporaPodUrl> getPodUrls() {
return podUrls;
}
@ -299,7 +313,6 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
return this;
}
@NonNull
public List<String> getMainLangs() {
return mainLangs;
}
@ -319,8 +332,8 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
/**
* Returns the first DiasporaPodUrl in the list
*/
public DiasporaPodUrl getPodUrl(){
if(podUrls.size() > 0){
public DiasporaPodUrl getPodUrl() {
if (podUrls.size() > 0) {
return podUrls.get(0);
}
return null;
@ -433,7 +446,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
/**
* Set default values for https
*/
public void setHttpsDefaults(){
public void setHttpsDefaults() {
setProtocol("https");
setPort(443);
}
@ -442,7 +455,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
/**
* Set default values for http
*/
public void setHttpDefaults(){
public void setHttpDefaults() {
setProtocol("http");
setPort(80);
}

12
app/src/main/java/com/github/dfa/diaspora_android/fragment/PodSelectionFragment.java
View file

@ -20,6 +20,7 @@ import android.webkit.CookieManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
@ -83,7 +84,14 @@ public class PodSelectionFragment extends CustomFragment implements SearchView.O
listViewPod.setTextFilterEnabled(true);
listViewPod.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
showPodSelectionDialog(podList.getPodAt(i));
String text = ((TextView) view).getText().toString();
for (DiasporaPod pod : podList) {
if (pod.getPodUrl().getHost().equals(text)) {
showPodSelectionDialog(pod);
return;
}
}
}
});
LocalBroadcastManager.getInstance(getContext()).registerReceiver(podListReceiver, new IntentFilter(GetPodsService.MESSAGE_PODS_RECEIVED));
@ -139,7 +147,7 @@ public class PodSelectionFragment extends CustomFragment implements SearchView.O
private void updateListedPods() {
final ArrayList<String> listedPodsList = new ArrayList<>();
for (DiasporaPod pod : this.podList) {
listedPodsList.add(pod.getPodUrls().get(0).getHost());
listedPodsList.add(pod.getPodUrl().getHost());
}
listViewPodAdapter = new ArrayAdapter<>(