v0.2.0a

2016-11-07 17:39:35 +01:00 · 2016-11-07 17:39:35 +01:00 · fff3c7a716
parent bea35292f8
commit fff3c7a716
17 changed files with 1043 additions and 28 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,7 @@ app/src/main/res/raw/contributors.md
 app/src/main/res/raw/license.md
 app/src/main/res/raw/readme.md
 app/src/main/res/raw/contributors.txt
-app/src/main/res/raw/podlist.json
+#app/src/main/res/raw/podlist.json

 ##############
 ### Common ###
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,7 +10,7 @@ android {
        minSdkVersion 17
        targetSdkVersion 24
        versionCode 10
-        versionName "0.2.0-next"
+        versionName "0.2.0a"
        setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")

        vectorDrawables.useSupportLibrary = true
@ -61,8 +61,6 @@ dependencies {
 //  #####################
 final String RAW_DIR = "app/src/main/res/raw"
 final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "LICENSE.md", "CHANGELOG.md", "CONTRIBUTORS.txt"]
-final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json'
-final String PODLIST_PATH = "${RAW_DIR}/podlist.json"

 // Called before building
 task copyRepoFiles(type: Copy) {
@ -84,26 +82,6 @@ task copyRepoFiles(type: Copy) {
            (line.toString().matches("..l>>.*") || line.toString().startsWith("## 99l CONTRIBUTORS")) ? null : line.toString().trim().replaceAll(" \\(.*\\)", "")
        }
    }
-
-    // Download PodList
-    downloadFile(PODLIST_PATH, PODLIST_URL, false)
-
-    // Application variants
-    android.applicationVariants.all { v ->
-        // Do if we build in release (signed apk) mode
-        if (v.buildType.name == "release") {
-            downloadFile(PODLIST_PATH, PODLIST_URL, true)
-        }
-    }
-}
-
-// Downloads a file
-def downloadFile(filePath, url, downloadIfExists) {
-    def f = new File(filePath)
-    f.exists() && downloadIfExists && f.delete();
-    if (!f.exists()) {
-        new URL(url).withInputStream { i -> f.withOutputStream { it << i } }
-    }
 }

 tasks.copyRepoFiles.execute()
--- a/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java
@ -41,7 +41,7 @@ import info.guardianproject.netcipher.NetCipher;
 public class FetchPodsService extends Service {
    public static final String EXTRA_PODLIST = "pods";
    public static final String MESSAGE_PODS_RECEIVED = "com.github.dfa.diaspora.podsreceived";
-    public static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json";
+    public static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android/master/app/src/main/res/raw/podlist.json";

    public FetchPodsService() {
    }
--- a/app/src/main/res/raw/podlist.json
+++ b/app/src/main/res/raw/podlist.json
@ -0,0 +1,985 @@
+{
+  "pods": [
+    {
+      "score": 20,
+      "podUrls": [
+        {"host": "joindiaspora.com"},
+        {
+          "protocol": "http",
+          "port": 80,
+          "host": "diasporaaqmjixh5.onion"
+        }
+      ],
+      "name": "JoinDiaspora*",
+      "mainLangs": ["en"],
+      "id": 38077
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.geraspora.de"}],
+      "name": "Geraspora",
+      "mainLangs": ["de"],
+      "id": 24783
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasp.org"}],
+      "name": "diasporg*",
+      "mainLangs": [],
+      "id": 12688
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "framasphere.org"}],
+      "name": "Framasphere",
+      "mainLangs": [],
+      "id": 38776
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "nerdpol.ch"}],
+      "name": "nerdpol.ch*",
+      "mainLangs": ["de"],
+      "id": 17343
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "despora.de"}],
+      "name": "Despora*",
+      "mainLangs": ["de"],
+      "id": 6695
+    },
+    {
+      "score": 20,
+      "podUrls": [
+        {"host": "sechat.org"},
+        {
+          "protocol": "http",
+          "port": 80,
+          "host": "sechatqpscuj2npx.onion"
+        }
+      ],
+      "name": "Sechat*",
+      "mainLangs": [],
+      "id": 6524
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "berdaguermontes.eu"}],
+      "name": "berdaguermontes.eu",
+      "mainLangs": [],
+      "id": 25432
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "berlinspora.de"}],
+      "name": "berlinspora.de",
+      "mainLangs": ["de"],
+      "id": 38327
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "community.kanalinseln.de"}],
+      "name": "community.kanalinseln.de",
+      "mainLangs": ["de"],
+      "id": 37468
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "d.consumium.org"}],
+      "name": "d.consumium.org",
+      "mainLangs": [],
+      "id": 2107
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "dia.manuelbichler.at"}],
+      "name": "dia.manuelbichler.at",
+      "mainLangs": ["de"],
+      "id": 14817
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "dia.myocastor.de"}],
+      "name": "dia.myocastor.de",
+      "mainLangs": ["de"],
+      "id": 7190
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diapod.net"}],
+      "name": "diapod.net",
+      "mainLangs": [],
+      "id": 43611
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diapod.org"}],
+      "name": "diapod.org",
+      "mainLangs": [],
+      "id": 13926
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasp.ca"}],
+      "name": "diasp.ca",
+      "mainLangs": [],
+      "id": 40056
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasp.cz"}],
+      "name": "diasp.cz",
+      "mainLangs": [],
+      "id": 21452
+    },
+    {
+      "score": -22,
+      "podUrls": [{"host": "diasp.de"}],
+      "name": "diasp.de",
+      "mainLangs": ["de"],
+      "id": 46864
+    },
+    {
+      "score": -22,
+      "podUrls": [{"host": "diasp.eu"}],
+      "name": "diasp.eu",
+      "mainLangs": [],
+      "id": 46423
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diasp.eu.com"}],
+      "name": "diasp.eu.com",
+      "mainLangs": [],
+      "id": 4343
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasp.nl"}],
+      "name": "diasp.nl",
+      "mainLangs": ["nl"],
+      "id": 33262
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspod.de"}],
+      "name": "diaspod.de",
+      "mainLangs": ["de"],
+      "id": 2553
+    },
+    {
+      "score": -22,
+      "podUrls": [{"host": "diaspora-fr.org"}],
+      "name": "diaspora-fr.org",
+      "mainLangs": [],
+      "id": 13909
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.alfter.us"}],
+      "name": "alfter.us",
+      "mainLangs": ["en"],
+      "id": 13402
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.bohramt.de"}],
+      "name": "bohramt.de",
+      "mainLangs": ["de"],
+      "id": 8209
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.com.ar"}],
+      "name": "com.ar",
+      "mainLangs": [],
+      "id": 22994
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.deadhexagon.com"}],
+      "name": "deadhexagon.com",
+      "mainLangs": [],
+      "id": 16721
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.digi-merc.org"}],
+      "name": "digi-merc.org",
+      "mainLangs": [],
+      "id": 13165
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.dorf-post.de"}],
+      "name": "dorf-post.de",
+      "mainLangs": ["de"],
+      "id": 43137
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.espiritolivre.org"}],
+      "name": "espiritolivre.org",
+      "mainLangs": [],
+      "id": 8690
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.horwood.biz"}],
+      "name": "horwood.biz",
+      "mainLangs": [],
+      "id": 12684
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.hzsogood.net"}],
+      "name": "hzsogood.net",
+      "mainLangs": [],
+      "id": 3651
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.kapper.net"}],
+      "name": "kapper.net",
+      "mainLangs": [],
+      "id": 40765
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.koehn.com"}],
+      "name": "koehn.com",
+      "mainLangs": [],
+      "id": 25812
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.kosebamse.com"}],
+      "name": "kosebamse.com",
+      "mainLangs": [],
+      "id": 15474
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.lebarjack.com"}],
+      "name": "lebarjack.com",
+      "mainLangs": [],
+      "id": 36540
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.microdata.co.uk"}],
+      "name": "microdata.co.uk",
+      "mainLangs": ["en"],
+      "id": 8704
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.moosje.nl"}],
+      "name": "moosje.nl",
+      "mainLangs": ["nl"],
+      "id": 45461
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.net.gr"}],
+      "name": "net.gr",
+      "mainLangs": [],
+      "id": 9863
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.permutationsofchaos.com"}],
+      "name": "permutationsofchaos.com",
+      "mainLangs": [],
+      "id": 1513
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.pimpmypony.eu"}],
+      "name": "pimpmypony.eu",
+      "mainLangs": [],
+      "id": 38497
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.pingupod.de"}],
+      "name": "pingupod.de",
+      "mainLangs": ["de"],
+      "id": 10135
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.podzimek.org"}],
+      "name": "podzimek.org",
+      "mainLangs": [],
+      "id": 12139
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.poleni.com"}],
+      "name": "poleni.com",
+      "mainLangs": [],
+      "id": 1154
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.psyco.fr"}],
+      "name": "psyco.fr",
+      "mainLangs": ["fr"],
+      "id": 31397
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.punkbeer.me"}],
+      "name": "punkbeer.me",
+      "mainLangs": [],
+      "id": 44751
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.raven-ip.com"}],
+      "name": "raven-ip.com",
+      "mainLangs": [],
+      "id": 17410
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.retrodigital.net"}],
+      "name": "retrodigital.net",
+      "mainLangs": [],
+      "id": 24640
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.soh.re"}],
+      "name": "soh.re",
+      "mainLangs": [],
+      "id": 39183
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.subsignal.org"}],
+      "name": "subsignal.org",
+      "mainLangs": [],
+      "id": 22108
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.trash-talk.de"}],
+      "name": "trash-talk.de",
+      "mainLangs": ["de"],
+      "id": 46672
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.u4u.org"}],
+      "name": "u4u.org",
+      "mainLangs": [],
+      "id": 9278
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "diaspora.unixcorn.org"}],
+      "name": "unixcorn.org",
+      "mainLangs": [],
+      "id": 43416
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasporabr.com.br"}],
+      "name": "diasporabr.com.br",
+      "mainLangs": [],
+      "id": 18248
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasporabrazil.org"}],
+      "name": "diasporabrazil.org",
+      "mainLangs": [],
+      "id": 42422
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasporapr.tk"}],
+      "name": "diasporapr.tk",
+      "mainLangs": [],
+      "id": 12020
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diasporing.ch"}],
+      "name": "Diasporing.ch",
+      "mainLangs": ["de"],
+      "id": 8471
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "distributed.chat"}],
+      "name": "distributed.chat",
+      "mainLangs": [],
+      "id": 43459
+    },
+    {
+      "score": -17,
+      "podUrls": [{"host": "espora.com.es"}],
+      "name": "espora.com.es",
+      "mainLangs": [],
+      "id": 11247
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "espora.social"}],
+      "name": "espora.social",
+      "mainLangs": [],
+      "id": 5948
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "failure.net"}],
+      "name": "failure.net",
+      "mainLangs": [],
+      "id": 41690
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "flokk.no"}],
+      "name": "flokk.no",
+      "mainLangs": [],
+      "id": 45658
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "freehuman.fr"}],
+      "name": "freehuman.fr",
+      "mainLangs": ["fr"],
+      "id": 21531
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "iliketoast.net"}],
+      "name": "iliketoast.net",
+      "mainLangs": [],
+      "id": 23287
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "jons.gr"}],
+      "name": "jons.gr",
+      "mainLangs": [],
+      "id": 41539
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "kapok.se"}],
+      "name": "kapok.se",
+      "mainLangs": [],
+      "id": 32786
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "karmasphe.re"}],
+      "name": "karmasphe.re",
+      "mainLangs": [],
+      "id": 20368
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "laba.mba"}],
+      "name": "laba.mba",
+      "mainLangs": [],
+      "id": 32393
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "liberdade.digital"}],
+      "name": "liberdade.digital",
+      "mainLangs": [],
+      "id": 40958
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "librenet.co.za"}],
+      "name": "librenet.co.za",
+      "mainLangs": [],
+      "id": 14862
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "librenet.gr"}],
+      "name": "librenet.gr",
+      "mainLangs": [],
+      "id": 27582
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "misamigos.online"}],
+      "name": "misamigos.online",
+      "mainLangs": [],
+      "id": 16366
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "mondiaspora.net"}],
+      "name": "mondiaspora.net",
+      "mainLangs": [],
+      "id": 3365
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "networkwizard.de"}],
+      "name": "networkwizard.de",
+      "mainLangs": ["de"],
+      "id": 47458
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "nx-pod.de"}],
+      "name": "nx-pod.de",
+      "mainLangs": ["de"],
+      "id": 14678
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pe.spbstu.ru"}],
+      "name": "pe.spbstu.ru",
+      "mainLangs": ["ru"],
+      "id": 39808
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.4ray.co"}],
+      "name": "4ray.co",
+      "mainLangs": [],
+      "id": 2522
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "pod.8n1.org"}],
+      "name": "8n1.org",
+      "mainLangs": [],
+      "id": 12504
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.alterworld.info"}],
+      "name": "alterworld.info",
+      "mainLangs": [],
+      "id": 1176
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "pod.asap-soft.com"}],
+      "name": "asap-soft.com",
+      "mainLangs": [],
+      "id": 49271
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.cannyfoxx.me"}],
+      "name": "cannyfoxx.me",
+      "mainLangs": [],
+      "id": 3505
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.cyberdungeon.de"}],
+      "name": "cyberdungeon.de",
+      "mainLangs": ["de"],
+      "id": 887
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.dapor.net"}],
+      "name": "dapor.net",
+      "mainLangs": [],
+      "id": 45578
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.datenknoten.me"}],
+      "name": "datenknoten.me",
+      "mainLangs": [],
+      "id": 34173
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.diaspora.software"}],
+      "name": "software",
+      "mainLangs": [],
+      "id": 33657
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.dirkomatik.de"}],
+      "name": "dirkomatik.de",
+      "mainLangs": ["de"],
+      "id": 47570
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.disroot.org"}],
+      "name": "disroot.org",
+      "mainLangs": [],
+      "id": 39828
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.gedankenausbruch.com"}],
+      "name": "gedankenausbruch.com",
+      "mainLangs": [],
+      "id": 6893
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.gleisnetze.de"}],
+      "name": "gleisnetze.de",
+      "mainLangs": ["de"],
+      "id": 31471
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.goodsharing.at"}],
+      "name": "goodsharing.at",
+      "mainLangs": ["de"],
+      "id": 36615
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.hashtagueule.fr"}],
+      "name": "hashtagueule.fr",
+      "mainLangs": ["fr"],
+      "id": 10296
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.hoizi.net"}],
+      "name": "hoizi.net",
+      "mainLangs": [],
+      "id": 27479
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.itabs.nl"}],
+      "name": "itabs.nl",
+      "mainLangs": ["nl"],
+      "id": 15016
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.jpope.org"}],
+      "name": "jpope.org",
+      "mainLangs": [],
+      "id": 11674
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.liebeleu.de"}],
+      "name": "liebeleu.de",
+      "mainLangs": ["de"],
+      "id": 29566
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.nomorestars.com"}],
+      "name": "nomorestars.com",
+      "mainLangs": [],
+      "id": 31958
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.orkz.net"}],
+      "name": "orkz.net",
+      "mainLangs": [],
+      "id": 41604
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.ponk.pink"}],
+      "name": "ponk.pink",
+      "mainLangs": [],
+      "id": 14849
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.promedol.com"}],
+      "name": "promedol.com",
+      "mainLangs": [],
+      "id": 21338
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.psynet.su"}],
+      "name": "psynet.su",
+      "mainLangs": [],
+      "id": 16045
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.roocita.com"}],
+      "name": "roocita.com",
+      "mainLangs": [],
+      "id": 47269
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.sertelon.fr"}],
+      "name": "sertelon.fr",
+      "mainLangs": ["fr"],
+      "id": 15234
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.storel.li"}],
+      "name": "storel.li",
+      "mainLangs": [],
+      "id": 33181
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.tchncs.de"}],
+      "name": "tchncs.de",
+      "mainLangs": ["de"],
+      "id": 20115
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.thomasdalichow.de"}],
+      "name": "thomasdalichow.de",
+      "mainLangs": ["de"],
+      "id": 12001
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.volt.io"}],
+      "name": "volt.io",
+      "mainLangs": [],
+      "id": 19139
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "podbay.net"}],
+      "name": "podbay.net",
+      "mainLangs": [],
+      "id": 16270
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "poddery.com"}],
+      "name": "poddery.com",
+      "mainLangs": [],
+      "id": 36667
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "podricing.pw"}],
+      "name": "podricing.pw",
+      "mainLangs": [],
+      "id": 6398
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pubpod.alqualonde.org"}],
+      "name": "pubpod.alqualonde.org",
+      "mainLangs": [],
+      "id": 26555
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "revreso.de"}],
+      "name": "revreso.de",
+      "mainLangs": ["de"],
+      "id": 41788
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "ruhrspora.de"}],
+      "name": "ruhrspora.de",
+      "mainLangs": ["de"],
+      "id": 46198
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "russiandiaspora.org"}],
+      "name": "russiandiaspora.org",
+      "mainLangs": [],
+      "id": 22166
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "shrekislove.us"}],
+      "name": "shrekislove.us",
+      "mainLangs": ["en"],
+      "id": 39003
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "social.acclaro.digital"}],
+      "name": "acclaro.digital",
+      "mainLangs": [],
+      "id": 33853
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "social.baldr.io"}],
+      "name": "baldr.io",
+      "mainLangs": [],
+      "id": 7781
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "social.daxbau.net"}],
+      "name": "daxbau.net",
+      "mainLangs": [],
+      "id": 37517
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "social.elaon.de"}],
+      "name": "elaon.de",
+      "mainLangs": ["de"],
+      "id": 30112
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "social.lanham.id.au"}],
+      "name": "lanham.id.au",
+      "mainLangs": [],
+      "id": 48421
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "social.mbuto.me"}],
+      "name": "mbuto.me",
+      "mainLangs": [],
+      "id": 18258
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "socializer.cc"}],
+      "name": "socializer.cc",
+      "mainLangs": [],
+      "id": 30584
+    },
+    {
+      "score": 0,
+      "podUrls": [{"host": "spora.zone"}],
+      "name": "spora.zone",
+      "mainLangs": [],
+      "id": 24735
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "subvillage.de"}],
+      "name": "subvillage.de",
+      "mainLangs": ["de"],
+      "id": 29359
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "sysad.org"}],
+      "name": "sysad.org",
+      "mainLangs": [],
+      "id": 45830
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "teki.be"}],
+      "name": "teki.be",
+      "mainLangs": [],
+      "id": 5276
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "therealtalk.org"}],
+      "name": "therealtalk.org",
+      "mainLangs": [],
+      "id": 26786
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "thinkopen.net"}],
+      "name": "thinkopen.net",
+      "mainLangs": [],
+      "id": 7366
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "tippentappen.de"}],
+      "name": "tippentappen.de",
+      "mainLangs": ["de"],
+      "id": 622
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "whatsnewz.com"}],
+      "name": "whatsnewz.com",
+      "mainLangs": [],
+      "id": 5842
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "wk3.org"}],
+      "name": "wk3.org",
+      "mainLangs": [],
+      "id": 39292
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "www.datataffel.dk"}],
+      "name": "datataffel.dk",
+      "mainLangs": [],
+      "id": 35984
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "www.diasporaix.de"}],
+      "name": "diasporaix.de",
+      "mainLangs": ["de"],
+      "id": 26219
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.hofud.com"}],
+      "name": "hofud.com",
+      "mainLangs": [],
+      "id": 10983
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.softwarelivre.org"}],
+      "name": "softwarelivre.org",
+      "mainLangs": [],
+      "id": 33510
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "confetticake.club"}],
+      "name": "confetticake.club",
+      "mainLangs": [],
+      "id": 41623
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspote.org"}],
+      "name": "diaspote.org",
+      "mainLangs": [],
+      "id": 33317
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "diaspora.zone"}],
+      "name": "zone",
+      "mainLangs": [],
+      "id": 41976
+    },
+    {
+      "score": 20,
+      "podUrls": [{"host": "pod.userzap.de"}],
+      "name": "userzap.de",
+      "mainLangs": ["de"],
+      "id": 12816
+    }
+  ],
+  "timestamp": 1478535559925
+}
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@ -15,6 +15,9 @@
  <string name="pref_title__sub_nav_slider">Navigations Slider</string>
  <string name="pref_desc__sub_nav_slider">Konfiguration der Sichtbarkeit von Einträgen im Navigation-Slider</string>
  <string name="pref_cat__visibility_nav_items">Sichtbarkeit der Einträge</string>
+  <string name="pref_cat__visibility_nav_items__user">Nutzer</string>
+  <string name="pref_cat__visibility_nav_items__general">Generelles</string>
+  <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
  <!-- Themes -->
  <string name="pref_title__themes">Farbschema</string>
  <string name="pref_desc__themes">Einstellungen des Farbdesigns</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Verweise auf App</string>
  <string name="pref_desc__append_shared_via_app">Füge beim Teilen von Texten einen Verweis auf diese App an (\"geteilt durch&#8230;\")</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Verschiedenes</string>
+  <string name="pref_title__wipe_settings">Zurücksetzen</string>
+  <string name="pref_desc__wipe_settings">Setze alle Einstellungen der Anwendung zurück und melde alle Konten ab</string>
+  <string name="dialog_content__wipe_settings">Dies wird alle geänderten Einstellungen der Anwendung auf die Standardwerte zurücksetzen und alle Konten abmelden. Deine heruntergeladenen Medien bleiben unberührt. Bist du sicher, dass du fortfahren willst?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -45,6 +45,7 @@
  <string name="nav_help_license">Über | Hilfe</string>
  <string name="nav_followed_tags">Tags</string>
  <string name="nav_public_activities">Öffentliche Aktivitäten</string>
+  <string name="nav_reports">Meldungen</string>
  <string name="share__share_link_as_text">Link als Text teilen</string>
  <string name="share__share_screenshot">Bildschirmfoto teilen</string>
  <string name="share__take_screenshot">Bildschirmfoto speichern</string>
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@ -15,6 +15,9 @@
  <string name="pref_title__sub_nav_slider">Control deslizante de navegación</string>
  <string name="pref_desc__sub_nav_slider">Control de visibilidad de las entradas en el cajón de navegación</string>
  <string name="pref_cat__visibility_nav_items">Elemento visibilidad</string>
+  <string name="pref_cat__visibility_nav_items__user">Usuario</string>
+  <string name="pref_cat__visibility_nav_items__general">General</string>
+  <string name="pref_cat__visibility_nav_items__admin">Administrador</string>
  <!-- Themes -->
  <string name="pref_title__themes">Tema y Colores</string>
  <string name="pref_desc__themes">Control de colores que se utilizan en la aplicación</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Añadir compartido por aviso</string>
  <string name="pref_desc__append_shared_via_app">Agregar una referencia a esta aplicación (\"compartida por&#8230;\") a los textos compartidos</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Diverso</string>
+  <string name="pref_title__wipe_settings">Reinicio completo</string>
+  <string name="pref_desc__wipe_settings">Borrar localmente toda la configuración relacionada con la aplicación y cerrar sesión en todas las cuentas</string>
+  <string name="dialog_content__wipe_settings">Esto restablecerá todas las modificaciones en la configuración a sus valores predeterminados y se desconectará de todos los pods. Las imágenes descargadas permanecerán intactas. ¿Está seguro de que desea continuar?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -45,6 +45,7 @@
  <string name="nav_help_license">Sobre | Ayuda</string>
  <string name="nav_followed_tags">Etiquetas seguidas</string>
  <string name="nav_public_activities">Actividad pública</string>
+  <string name="nav_reports">Informes</string>
  <string name="share__share_link_as_text">Compartir enlace como texto</string>
  <string name="share__share_screenshot">Compartir captura de pantalla de la página web</string>
  <string name="share__take_screenshot">Tomar captura de pantalla de la página web</string>
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@ -15,6 +15,9 @@
  <string name="pref_title__sub_nav_slider">Barre de défilement</string>
  <string name="pref_desc__sub_nav_slider">Contrôles de la visibilité des entrées dans le volet de navigation</string>
  <string name="pref_cat__visibility_nav_items">Visibilité de l’élément</string>
+  <string name="pref_cat__visibility_nav_items__user">Utilisateur</string>
+  <string name="pref_cat__visibility_nav_items__general">Général</string>
+  <string name="pref_cat__visibility_nav_items__admin">Admin</string>
  <!-- Themes -->
  <string name="pref_title__themes">Thème et couleurs</string>
  <string name="pref_desc__themes">Contrôler les couleurs utilisées pour l\'application</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Ajoutez \"partagé via …\" aux partages</string>
  <string name="pref_desc__append_shared_via_app">Ajoutez une référence à l\'application (« partagée via &#8230;\") aux textes partagés</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Divers</string>
+  <string name="pref_title__wipe_settings">Réinitialisation complète</string>
+  <string name="pref_desc__wipe_settings">Effacer localement tous les réglages relatifs à l\'application et déconnexion de tous les comptes</string>
+  <string name="dialog_content__wipe_settings">Ceci va réinitialiser tous les changements à leurs valeurs par défaut et vous déconnecter de tous les pods. Vos images téléchargées resteront intactes. Êtes-vous sûr de vouloir continuer ?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -45,6 +45,7 @@
  <string name="nav_help_license">A propos | Aide</string>
  <string name="nav_followed_tags">Hashtags suivis</string>
  <string name="nav_public_activities">Activités publiques</string>
+  <string name="nav_reports">Signalements</string>
  <string name="share__share_link_as_text">Partager le lien comme texte</string>
  <string name="share__share_screenshot">Partager la capture d\'écran d\'un site web</string>
  <string name="share__take_screenshot">Prendre une capture d\'écran d\'un site web</string>
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@ -62,6 +62,10 @@
  <string name="pref_title__append_shared_via_app">Aggiungi avviso dell\'app</string>
  <string name="pref_desc__append_shared_via_app">Aggiunge un riferimento a quest\'app (\"Condiviso da&#8230;\") nei testi condivisi</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Vario</string>
+  <string name="pref_title__wipe_settings">Reset completo</string>
+  <string name="pref_desc__wipe_settings">Elimina localmente tutte le impostazioni relative all\'app e disconnette da tutti gli account</string>
+  <string name="dialog_content__wipe_settings">Questo cancellerà tutte le impostazioni dell\'app che sono state cambiate ai loro valori predefiniti e ti disconnetterà da tutti i pod. Le immagini scaricate non verranno toccate. Sei sicuro di voler procedere?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@ -15,6 +15,9 @@
  <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
  <string name="pref_desc__sub_nav_slider">Bepalen zichtbaarheid van vermeldingen in de navigatie-lade</string>
  <string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
+  <string name="pref_cat__visibility_nav_items__user">Gebruiker</string>
+  <string name="pref_cat__visibility_nav_items__general">Algemeen</string>
+  <string name="pref_cat__visibility_nav_items__admin">Beheer</string>
  <!-- Themes -->
  <string name="pref_title__themes">Thema en kleuren</string>
  <string name="pref_desc__themes">Bepalen welke kleuren worden gebruikt in de app</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Gedeeld-via-aankondiging toevoegen</string>
  <string name="pref_desc__append_shared_via_app">Een verwijzing naar dit app (\"gedeeld door&#8230;\") toevoegen aan gedeelde teksten</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Overig</string>
+  <string name="pref_title__wipe_settings">Volledige reset</string>
+  <string name="pref_desc__wipe_settings">Verwijder alle lokale app-instellingen en log uit alle accounts</string>
+  <string name="dialog_content__wipe_settings">Dit zal al uw app-instellingen terugzetten naar de standaardwaarden en u uitloggen van alle pods. Gedownloade afbeeldingen blijven bewaard. Weet u zeker dat u wilt doorgaan?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -4,7 +4,7 @@
  <!-- App - AppName specific -->
  <string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
  <!-- Application -->
-  <string name="reload">Opnieuw laden</string>
+  <string name="reload">Herladen</string>
  <string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
  <!-- Common Words -->
  <string name="settings">Instellingen</string>
@ -45,6 +45,7 @@
  <string name="nav_help_license">Over | Help</string>
  <string name="nav_followed_tags">Gevolgde Tags</string>
  <string name="nav_public_activities">Publieke activiteiten</string>
+  <string name="nav_reports">Meldingen</string>
  <string name="share__share_link_as_text">Link delen als tekst</string>
  <string name="share__share_screenshot">Screenshot van de webpagina delen</string>
  <string name="share__take_screenshot">Neem screenshot van de webpagina</string>
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@ -15,9 +15,12 @@
  <string name="pref_title__sub_nav_slider">Pasek nawigacji</string>
  <string name="pref_desc__sub_nav_slider">Wybierz elementy widoczne w pasku nawigacji</string>
  <string name="pref_cat__visibility_nav_items">Widoczność elementu</string>
+  <string name="pref_cat__visibility_nav_items__user">Użytkownik</string>
+  <string name="pref_cat__visibility_nav_items__general">Ogólne</string>
+  <string name="pref_cat__visibility_nav_items__admin">Administracja</string>
  <!-- Themes -->
  <string name="pref_title__themes">Motywy i kolory</string>
-  <string name="pref_desc__themes">Ustaw których kolorów ma używać aplikacja</string>
+  <string name="pref_desc__themes">Ustaw jakich kolorów ma używać aplikacja</string>
  <string name="pref_title__primary_color">Kolor podstawowy</string>
  <string name="pref_desc__primary_color">Kolor pasków narzędzi</string>
  <string name="pref_title__accent_color">Kolor dodatkowy</string>
@ -33,7 +36,7 @@
  <string name="font_size_huge">Bardzo duży</string>
  <!-- Load images -->
  <string name="pref_title__load_images">Wczytuj obrazy</string>
-  <string name="pref_desc__load_images">Wyłącz wczytywanie obrazków by oszczędzać transfer</string>
+  <string name="pref_desc__load_images">Odznacz by wyłączyć wczytywanie obrazów, np. w celu oszczędzania transferu</string>
  <!-- Proxy -->
  <string name="pref_title__http_proxy_load_tor_preset">Wczytaj domyślną konfigurację Tora</string>
  <string name="pref_desc__http_proxy_load_tor_preset">Wczytaj ustawienia proxy HTTP Tora (Orbot)</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Informacja o użytej aplikacji</string>
  <string name="pref_desc__append_shared_via_app">Dodawaj do wpisów informację o użytej aplikacji (\"udostępniono za pomocą&#8230;\")</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Różne</string>
+  <string name="pref_title__wipe_settings">Całkowity restart</string>
+  <string name="pref_desc__wipe_settings">Wyczyść wszystkie lokalne ustawienia aplikacji i wyloguj ze wszystkich kont</string>
+  <string name="dialog_content__wipe_settings">Ta operacja przywróci wszystkie zmodyfikowane przez Ciebie ustawienia aplikacji do ich domyślnych wartości i wyloguje Cię ze wszystkich Podów. Na pewno chcesz to zrobić?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -45,6 +45,7 @@
  <string name="nav_help_license">Informacje | Pomoc</string>
  <string name="nav_followed_tags">Obserwowane tagi</string>
  <string name="nav_public_activities">Publiczna aktywność</string>
+  <string name="nav_reports">Zgłoszenia</string>
  <string name="share__share_link_as_text">Udostępnij odnośnik jako tekst</string>
  <string name="share__share_screenshot">Udostępnij zrzut ekranu strony internetowej</string>
  <string name="share__take_screenshot">Wykonaj zrzut ekranu strony internetowej</string>
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@ -15,6 +15,9 @@
  <string name="pref_title__sub_nav_slider">Слайдер навигации</string>
  <string name="pref_desc__sub_nav_slider">Управление видимостью записей в ящике навигации</string>
  <string name="pref_cat__visibility_nav_items">Видимость элемента</string>
+  <string name="pref_cat__visibility_nav_items__user">Пользовательские</string>
+  <string name="pref_cat__visibility_nav_items__general">Общие</string>
+  <string name="pref_cat__visibility_nav_items__admin">Для администраторов</string>
  <!-- Themes -->
  <string name="pref_title__themes">Тема и цвета</string>
  <string name="pref_desc__themes">Выбор цветов используемых в приложении</string>
@ -62,6 +65,10 @@
  <string name="pref_title__append_shared_via_app">Присоединять \"Опубликовано из\" к сообщению</string>
  <string name="pref_desc__append_shared_via_app">Присоединять ссылку на приложение (\"Опубликовано из&#8230;\") к размещенным записям</string>
  <!-- More -->
+  <string name="pref_title__sub_miscelaneous">Прочее</string>
+  <string name="pref_title__wipe_settings">Полный сброс</string>
+  <string name="pref_desc__wipe_settings">Локально стереть все параметры, относящиеся к приложению и выйти из всех учётных записей</string>
+  <string name="dialog_content__wipe_settings">Это сбросит все изменённые параметры приложения на значения по умолчанию и выйдет из аккаунтов на всех подах. Ваши загруженные изображения останутся нетронутыми. Вы уверены, что хотите продолжить?</string>
  <!-- Recently added - Please move to right section-->
  <!-- Sorry -->
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -45,6 +45,7 @@
  <string name="nav_help_license">Информация | Помощь</string>
  <string name="nav_followed_tags">Отслеживаемые хэштеги</string>
  <string name="nav_public_activities">Публичная активность</string>
+  <string name="nav_reports">Отчёты</string>
  <string name="share__share_link_as_text">Разместить ссылку как текст</string>
  <string name="share__share_screenshot">Разместить экранный снимок страницы</string>
  <string name="share__take_screenshot">Сделать экранный снимок страницы</string>