From e95082cefbf704485179c60c63d6a4c399aca445 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Wed, 2 Nov 2016 17:10:29 +0100 Subject: [PATCH 1/4] Download podlist at build time --- .gitignore | 1 + CONTRIBUTORS.txt | 1 + app/build.gradle | 26 +- app/src/main/res/raw/podlist.json | 1286 ------------------ app/src/main/res/values-pl/strings-about.xml | 2 +- 5 files changed, 28 insertions(+), 1288 deletions(-) delete mode 100644 app/src/main/res/raw/podlist.json diff --git a/.gitignore b/.gitignore index d4dfb2ef..ed1538b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +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 ############## ### Common ### diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1bdb3c08..965a4288 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -12,4 +12,5 @@ Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation Airon90 (https://diasp.eu/u/airon90): Italian translation Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions Martín Vukovic (martinvukovic@protonmail.com): Diaspora Native WebApp +Paweł Szymon Kosiński (pskosinski): Polish translation SansPseudoFix (https://github.com/SansPseudoFix): French translation diff --git a/app/build.gradle b/app/build.gradle index 39d4444b..190e5920 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,5 +76,29 @@ task copyRepoFiles(type: Copy) { } } + // Download Podlist + final String PODLIST_PATH = "app/src/main/res/raw/podlist.json" + final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json' + downloadFile(PODLIST_PATH, PODLIST_URL, false) + + // Do if we build in release (signed apk) mode + android.applicationVariants.all { v -> + if (v.buildType.name == "release"){ + v.assemble.doFirst { + downloadFile(PODLIST_PATH, PODLIST_URL, true) + } + } + } } -tasks.copyRepoFiles.execute() + +def downloadFile(filePath, url, downloadIfExists ) { + def f = new File(filePath) + if (f.exists() && downloadIfExists){ + f.delete(); + } + if (!f.exists()) { + new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }} + } +} + +tasks.copyRepoFiles.execute() \ No newline at end of file diff --git a/app/src/main/res/raw/podlist.json b/app/src/main/res/raw/podlist.json deleted file mode 100644 index 0073808f..00000000 --- a/app/src/main/res/raw/podlist.json +++ /dev/null @@ -1,1286 +0,0 @@ -{ - "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": "austriapod.at"}], - "name": "austriapod.at", - "mainLangs": ["de"], - "id": 38103 - }, - { - "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": "canfly.org"}], - "name": "canfly.org", - "mainLangs": [], - "id": 49516 - }, - { - "score": 20, - "podUrls": [{"host": "community.kanalinseln.de"}], - "name": "community.kanalinseln.de", - "mainLangs": ["de"], - "id": 37468 - }, - { - "score": -22, - "podUrls": [{"host": "cryptospora.net"}], - "name": "cryptospora.net", - "mainLangs": [], - "id": 46568 - }, - { - "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": 20, - "podUrls": [{"host": "diaspora.digitalismus.org"}], - "name": "digitalismus.org", - "mainLangs": [], - "id": 21515 - }, - { - "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.fr33.co"}], - "name": "fr33.co", - "mainLangs": [], - "id": 46565 - }, - { - "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": 0, - "podUrls": [{"host": "diaspora.mazi.tk"}], - "name": "mazi.tk", - "mainLangs": [], - "id": 16191 - }, - { - "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.sceal.ie"}], - "name": "sceal.ie", - "mainLangs": [], - "id": 38240 - }, - { - "score": 20, - "podUrls": [{"host": "diaspora.schrauger.com"}], - "name": "schrauger.com", - "mainLangs": [], - "id": 25745 - }, - { - "score": 0, - "podUrls": [{"host": "diaspora.slowb.ro"}], - "name": "slowb.ro", - "mainLangs": [], - "id": 24365 - }, - { - "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.undernet.uy"}], - "name": "undernet.uy", - "mainLangs": [], - "id": 14710 - }, - { - "score": 0, - "podUrls": [{"host": "diaspora.unixcorn.org"}], - "name": "unixcorn.org", - "mainLangs": [], - "id": 43416 - }, - { - "score": 20, - "podUrls": [{"host": "diaspora.weenmebrown.com"}], - "name": "weenmebrown.com", - "mainLangs": [], - "id": 37065 - }, - { - "score": 0, - "podUrls": [{"host": "diaspora.xcelor8.com"}], - "name": "xcelor8.com", - "mainLangs": [], - "id": 27412 - }, - { - "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": 0, - "podUrls": [{"host": "diasporanet.tk"}], - "name": "diasporanet.tk", - "mainLangs": [], - "id": 27962 - }, - { - "score": 20, - "podUrls": [{"host": "diasporapr.tk"}], - "name": "diasporapr.tk", - "mainLangs": [], - "id": 12020 - }, - { - "score": 0, - "podUrls": [{"host": "diasporausa.com"}], - "name": "diasporausa.com", - "mainLangs": [], - "id": 46740 - }, - { - "score": 20, - "podUrls": [{"host": "diasporing.ch"}], - "name": "Diasporing.ch", - "mainLangs": ["de"], - "id": 8471 - }, - { - "score": 0, - "podUrls": [{"host": "dissociateduse.rs"}], - "name": "dissociateduse.rs", - "mainLangs": [], - "id": 37634 - }, - { - "score": 20, - "podUrls": [{"host": "distributed.chat"}], - "name": "distributed.chat", - "mainLangs": [], - "id": 43459 - }, - { - "score": 0, - "podUrls": [{"host": "eat.egregious.ly"}], - "name": "eat.egregious.ly", - "mainLangs": [], - "id": 14227 - }, - { - "score": 20, - "podUrls": [{"host": "ege.land"}], - "name": "ege.land", - "mainLangs": [], - "id": 7825 - }, - { - "score": 0, - "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": 0, - "podUrls": [{"host": "friendica.tk"}], - "name": "friendica.tk", - "mainLangs": [], - "id": 27402 - }, - { - "score": 20, - "podUrls": [{"host": "home.enslaver.net"}], - "name": "home.enslaver.net", - "mainLangs": [], - "id": 13758 - }, - { - "score": 20, - "podUrls": [{"host": "idoru.pl"}], - "name": "idoru.pl", - "mainLangs": [], - "id": 40630 - }, - { - "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": "kosmospora.net"}], - "name": "kosmospora.net", - "mainLangs": [], - "id": 46869 - }, - { - "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": 0, - "podUrls": [{"host": "libertypod.org"}], - "name": "libertypod.org", - "mainLangs": [], - "id": 33200 - }, - { - "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": 0, - "podUrls": [{"host": "londor.be"}], - "name": "londor.be", - "mainLangs": [], - "id": 32281 - }, - { - "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": 0, - "podUrls": [{"host": "parteidervernunft.com"}], - "name": "parteidervernunft.com", - "mainLangs": [], - "id": 31558 - }, - { - "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": 0, - "podUrls": [{"host": "pod.comin.dk"}], - "name": "comin.dk", - "mainLangs": [], - "id": 29446 - }, - { - "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.dobs.at"}], - "name": "dobs.at", - "mainLangs": ["de"], - "id": 48725 - }, - { - "score": 0, - "podUrls": [{"host": "pod.dragondreaming.de"}], - "name": "dragondreaming.de", - "mainLangs": ["de"], - "id": 16107 - }, - { - "score": 0, - "podUrls": [{"host": "pod.gaialabs.ch"}], - "name": "gaialabs.ch", - "mainLangs": ["de"], - "id": 45384 - }, - { - "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.hfrc.de"}], - "name": "hfrc.de", - "mainLangs": ["de"], - "id": 45746 - }, - { - "score": 20, - "podUrls": [{"host": "pod.hoizi.net"}], - "name": "hoizi.net", - "mainLangs": [], - "id": 27479 - }, - { - "score": 0, - "podUrls": [{"host": "pod.infoduv.fr"}], - "name": "infoduv.fr", - "mainLangs": ["fr"], - "id": 26836 - }, - { - "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": 0, - "podUrls": [{"host": "pod.kepow.org"}], - "name": "kepow.org", - "mainLangs": [], - "id": 32151 - }, - { - "score": 20, - "podUrls": [{"host": "pod.liebeleu.de"}], - "name": "liebeleu.de", - "mainLangs": ["de"], - "id": 29566 - }, - { - "score": 0, - "podUrls": [{"host": "pod.neikos.me"}], - "name": "neikos.me", - "mainLangs": [], - "id": 9248 - }, - { - "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": 0, - "podUrls": [{"host": "pod.readme.is"}], - "name": "readme.is", - "mainLangs": [], - "id": 32854 - }, - { - "score": 0, - "podUrls": [{"host": "pod.richtig.koeln"}], - "name": "richtig.koeln", - "mainLangs": [], - "id": 38790 - }, - { - "score": 20, - "podUrls": [{"host": "pod.roocita.com"}], - "name": "roocita.com", - "mainLangs": [], - "id": 47269 - }, - { - "score": 20, - "podUrls": [{"host": "pod.ros-it.ch"}], - "name": "ros-it.ch", - "mainLangs": ["de"], - "id": 17574 - }, - { - "score": 20, - "podUrls": [{"host": "pod.sccn.club"}], - "name": "sccn.club", - "mainLangs": [], - "id": 19070 - }, - { - "score": 20, - "podUrls": [{"host": "pod.sertelon.fr"}], - "name": "sertelon.fr", - "mainLangs": ["fr"], - "id": 15234 - }, - { - "score": 0, - "podUrls": [{"host": "pod.shouldit.work"}], - "name": "shouldit.work", - "mainLangs": [], - "id": 47610 - }, - { - "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": 0, - "podUrls": [{"host": "pod.undreaming.org"}], - "name": "undreaming.org", - "mainLangs": [], - "id": 40460 - }, - { - "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": 0, - "podUrls": [{"host": "realms.the-wizard.co.za"}], - "name": "realms.the-wizard.co.za", - "mainLangs": [], - "id": 7065 - }, - { - "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": 0, - "podUrls": [{"host": "social.sum7.de"}], - "name": "sum7.de", - "mainLangs": ["de"], - "id": 8983 - }, - { - "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": 0, - "podUrls": [{"host": "united.zkp.fr"}], - "name": "united.zkp.fr", - "mainLangs": ["fr"], - "id": 25677 - }, - { - "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": -15, - "podUrls": [{"host": "diaspora.mike-jones.me.uk"}], - "name": "mike-jones.me.uk", - "mainLangs": [], - "id": 8574 - }, - { - "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 - }, - { - "score": 0, - "podUrls": [{"host": "share.naturalnews.com"}], - "name": "share.naturalnews.com", - "mainLangs": ["en"], - "id": 12817 - } - ], - "timestamp": 1478036915038 -} diff --git a/app/src/main/res/values-pl/strings-about.xml b/app/src/main/res/values-pl/strings-about.xml index 78d4af3c..aa051962 100644 --- a/app/src/main/res/values-pl/strings-about.xml +++ b/app/src/main/res/values-pl/strings-about.xml @@ -15,7 +15,7 @@ Wersja systemu Android: %1$s Nazwa urządzenia: %1$s Nazwa kodowa: %1$s - Nazwa profilu na Podzie: %1$s + Alias Poda: %1$s Domena Poda: %1$s Log debugowania został skopiowany do schowka Lista bibliotek zewnętrznych From bc925e1a1e2e66f7575d52b956d657c642ecb7b4 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Fri, 4 Nov 2016 03:08:59 +0100 Subject: [PATCH 2/4] Release v0.2.0 --- CONTRIBUTORS.txt | 5 +- README.md | 3 - app/build.gradle | 57 ++++++++++--------- app/src/main/AndroidManifest.xml | 43 -------------- .../activity/MainActivity.java | 7 +-- .../activity/SettingsActivity.java | 4 +- .../DiasporaUserProfileChangedListener.java | 12 ++-- .../diaspora_android/util/AppSettings.java | 4 +- .../util/DiasporaUrlHelper.java | 2 +- .../diaspora_android/web/BrowserFragment.java | 1 + app/src/main/res/values-es/strings-about.xml | 34 +++++++++++ app/src/main/res/values-it/strings-about.xml | 3 + .../res/values-it/strings-preferences.xml | 5 ++ .../res/xml/preferences__sub_debugging.xml | 2 +- 14 files changed, 94 insertions(+), 88 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 965a4288..63761195 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -11,6 +11,7 @@ Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation Airon90 (https://diasp.eu/u/airon90): Italian translation Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions -Martín Vukovic (martinvukovic@protonmail.com): Diaspora Native WebApp -Paweł Szymon Kosiński (pskosinski): Polish translation +Martín Vukovic (martinvukovic AT protonmail DOT com): Diaspora Native WebApp +Nacho Fernández (nacho_f AT joindiaspora DOT com): Spanish translation +pskosinski (email AT pskosinski DOT pl): Polish translation SansPseudoFix (https://github.com/SansPseudoFix): French translation diff --git a/README.md b/README.md index 3ef91253..cc8704d6 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,3 @@ Diaspora for Android requires access to the Internet and to external storage to ## Maintainers - gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c)) - vanitasvitae ([GitHub](https://github.com/vanitasvitae), [Diaspora](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c)) - -## Acknowledgements -- We took some inspiration and code from [LeafPic](https://github.com/HoraApps/LeafPic), big thanks to Donald Shtjefni and the LeafPic Team! diff --git a/app/build.gradle b/app/build.gradle index 190e5920..540eda92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,11 +9,11 @@ android { applicationId "com.github.dfa.diaspora_android" minSdkVersion 17 targetSdkVersion 24 - versionCode 8 - versionName "0.1.6-next" + versionCode 9 + versionName "0.2.0" setProperty("archivesBaseName", "diasporaAndroid__${versionName}__") - vectorDrawables.useSupportLibrary=true + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -27,10 +27,10 @@ android { } } +// Additional repositories repositories { maven { - //Color picker - url "http://dl.bintray.com/dasar/maven" + url "http://dl.bintray.com/dasar/maven" //Color picker } } @@ -44,23 +44,32 @@ dependencies { // Android standard libs compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 24.2.1 + compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0 compile 'com.android.support:support-v4:24.2.1' - compile "com.android.support:customtabs:24.2.1" + compile 'com.android.support:customtabs:24.2.1' // More libraries compile 'com.jakewharton:butterknife:8.0.1' compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1' - compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar') //Color picker + compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar') apt 'com.jakewharton:butterknife-compiler:8.0.1' } +// ##################### +// Groovy Coding Area +// ##################### +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) { - String[] copyFiles = ["README.md", "LICENSE.md", "CHANGELOG.md"] - from rootProject.files(copyFiles) - into 'src/main/res/raw' + + // Copy files over to raw dir + from rootProject.files(ROOT_TO_RAW_COPYFILES) + into RAW_DIR.replaceFirst("app/", "") rename { String fileName -> fileName.replace(fileName, fileName.toLowerCase()) } @@ -76,29 +85,25 @@ task copyRepoFiles(type: Copy) { } } - // Download Podlist - final String PODLIST_PATH = "app/src/main/res/raw/podlist.json" - final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json' + // Download PodList downloadFile(PODLIST_PATH, PODLIST_URL, false) - // Do if we build in release (signed apk) mode - android.applicationVariants.all { v -> - if (v.buildType.name == "release"){ - v.assemble.doFirst { - downloadFile(PODLIST_PATH, PODLIST_URL, true) - } + // 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) } } } -def downloadFile(filePath, url, downloadIfExists ) { +// Downloads a file +def downloadFile(filePath, url, downloadIfExists) { def f = new File(filePath) - if (f.exists() && downloadIfExists){ - f.delete(); - } + f.exists() && downloadIfExists && f.delete(); if (!f.exists()) { - new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }} + new URL(url).withInputStream { i -> f.withOutputStream { it << i } } } } -tasks.copyRepoFiles.execute() \ No newline at end of file +tasks.copyRepoFiles.execute() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d78beabb..fe8e3163 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,12 +75,9 @@ - - - @@ -99,17 +96,14 @@ - - - @@ -122,101 +116,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,7 +188,6 @@ - @@ -236,7 +196,6 @@ - @@ -244,11 +203,9 @@ - - diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 72661e1b..f5153fd7 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -34,7 +34,6 @@ import android.support.customtabs.CustomTabsSession; import android.support.design.widget.AppBarLayout; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.view.GravityCompat; @@ -462,7 +461,7 @@ public class MainActivity extends ThemedActivity @Override public void run() { ContextMenuWebView wv = ((DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG)).getWebView(); - if(wv != null) { + if (wv != null) { wv.clearCache(true); } } @@ -486,7 +485,7 @@ public class MainActivity extends ThemedActivity return; } //Catch split screen recreation - if(action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) { + if (action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) { return; } @@ -581,7 +580,7 @@ public class MainActivity extends ThemedActivity LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL)); invalidateOptionsMenu(); this.appSettings = getAppSettings(); - if(appSettings.isIntellihideToolbars()) { + if (appSettings.isIntellihideToolbars()) { enableToolbarHiding(); } else { disableToolbarHiding(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java index 268c11a1..b1c599d2 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java @@ -131,9 +131,9 @@ public class SettingsActivity extends ThemedActivity { @Override public void onBackPressed() { ThemedPreferenceFragment top = getTopFragment(); - if(top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) { + if (top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) { ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings(); - if(oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) { + if (oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) { Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java index 4de59701..5b748875 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java @@ -27,29 +27,33 @@ import com.github.dfa.diaspora_android.data.DiasporaUserProfile; public interface DiasporaUserProfileChangedListener { /** * Called when the DiasporaUserProfile name changed + * * @param diasporaUserProfile The profile - * @param name The new name + * @param name The new name */ void onUserProfileNameChanged(DiasporaUserProfile diasporaUserProfile, String name); /** * Called when the DiasporaUserProfile avatarUrl changed + * * @param diasporaUserProfile The profile - * @param avatarUrl The new name + * @param avatarUrl The new name */ void onUserProfileAvatarChanged(DiasporaUserProfile diasporaUserProfile, String avatarUrl); /** * Called when the DiasporaUserProfile notificationCount changed + * * @param diasporaUserProfile The profile - * @param notificationCount The new notificationCount + * @param notificationCount The new notificationCount */ void onNotificationCountChanged(DiasporaUserProfile diasporaUserProfile, int notificationCount); /** * Called when the DiasporaUserProfile unreadMessageCount changed + * * @param diasporaUserProfile The profile - * @param unreadMessageCount The new unreadMessageCount + * @param unreadMessageCount The new unreadMessageCount */ void onUnreadMessageCountChanged(DiasporaUserProfile diasporaUserProfile, int unreadMessageCount); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java index 668ee668..bb7ffac4 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java @@ -19,9 +19,9 @@ import android.content.Context; import android.content.SharedPreferences; import com.github.dfa.diaspora_android.R; +import com.github.dfa.diaspora_android.data.DiasporaAspect; import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod; import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl; -import com.github.dfa.diaspora_android.data.DiasporaAspect; import com.github.dfa.diaspora_android.web.ProxyHandler; import org.json.JSONException; @@ -329,7 +329,7 @@ public class AppSettings { } public boolean isLoggingEnabled() { - return getBoolean(prefApp, R.string.pref_key__logging_enabled, true); + return getBoolean(prefApp, R.string.pref_key__logging_enabled, false); } public boolean isLoggingSpamEnabled() { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java index 10edd275..7eea373a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java @@ -20,8 +20,8 @@ package com.github.dfa.diaspora_android.util; import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.R; -import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod; import com.github.dfa.diaspora_android.data.DiasporaAspect; +import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod; /** * Helper class that provides easy access to specific urls related to diaspora diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java index 0460e428..e362fd09 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java @@ -130,6 +130,7 @@ public class BrowserFragment extends ThemedFragment { webSettings.setAllowFileAccess(false); webSettings.setUseWideViewPort(true); webSettings.setLoadWithOverviewMode(true); + webSettings.setUserAgentString("Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"); webSettings.setDomStorageEnabled(true); webSettings.setMinimumFontSize(appSettings.getMinimumFontSize()); webSettings.setLoadsImagesAutomatically(appSettings.isLoadImages()); diff --git a/app/src/main/res/values-es/strings-about.xml b/app/src/main/res/values-es/strings-about.xml index 54191dc5..c8b437e0 100644 --- a/app/src/main/res/values-es/strings-about.xml +++ b/app/src/main/res/values-es/strings-about.xml @@ -2,6 +2,40 @@ + Acerca de + Licencia + Depurando + Aplicación + Dispositivo + Pod de Diaspora + Depurar registro + Depurar registro (Detallado) + Versión aplicación:%1$s + Nombre del paquete: %1$s + Versión de Android: %1$s + Nombre del dispositivo: %1$s + Nombre clave: %1$s + Nombre de perfil del pod: %1$s + Dominio del pod:%1$s + Registro de depuración copiado al portapapeles + Usadas bibliotecas de terceros + +DiasporaForAndroid es su aplicación complementaria para explorar la red social Diaspora. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social. <br><br> + +Diaspora utiliza Markdown para dar formato a las publicaciones. Puede encontrar más informaciónat<br> + +El desarrollo de DiasporaForAndroid es libre en sentido de libertad y sigue las ideas del proyecto Diaspora.<br> + +Puede encontrar el código fuente en Github: <br> +https://github.com/Diaspora-for-Android/diaspora-android <br> <br> + +Si encuentra algún problema o tiene alguna sugerencia, puede utilizar nuestro gestor de errores en el enlace de arriba. +También puede publicar su pregunta utilizando la etiqueta #DFAQ en Diaspora. <br> <br> + +¿Esta aplicación no está disponible en su idioma? Compruebe nuestro proyecto en Crowdin.com y ¡ayúdenos a traducirlo!<br> +https://crowdin.com/project/diaspora-for-android <br> <br> + +¡No dude en hablarle a sus amigos de #DiasporaforAndroid! diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml index c093915e..3d9d3390 100644 --- a/app/src/main/res/values-it/strings-about.xml +++ b/app/src/main/res/values-it/strings-about.xml @@ -14,6 +14,9 @@ Nome pacchetto: %1$s Versione Android: %1$s Nome dispositivo: %1$s + Codename: %1$s + Pod alias: %1$s + Dominio pod: %1$s Log di debug copiato negli appunti Librerie di terze parti usate diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml index 60303579..d58afca0 100644 --- a/app/src/main/res/values-it/strings-preferences.xml +++ b/app/src/main/res/values-it/strings-preferences.xml @@ -28,6 +28,9 @@ Dimensione font + Normale + Grosso + Immenso Carica immagini Disabilita il caricamento delle immagini per risparmiare la rete dati @@ -39,6 +42,8 @@ Usa il proxy con i dati di Diaspora per eludere i firewall.\nPotrebbe essere necessario il riavvio Host Porta + App è necessario riavviare per disattivare l\'utilizzo del proxy + Orbot proxy preset caricato Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili! diff --git a/app/src/main/res/xml/preferences__sub_debugging.xml b/app/src/main/res/xml/preferences__sub_debugging.xml index 6cafda0c..1bbea14f 100644 --- a/app/src/main/res/xml/preferences__sub_debugging.xml +++ b/app/src/main/res/xml/preferences__sub_debugging.xml @@ -5,7 +5,7 @@ android:title="@string/pref_title__sub_logging"> Date: Fri, 4 Nov 2016 10:47:33 +0100 Subject: [PATCH 3/4] start of 0.2.0-next --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 540eda92..1b99d571 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.github.dfa.diaspora_android" minSdkVersion 17 targetSdkVersion 24 - versionCode 9 - versionName "0.2.0" + versionCode 10 + versionName "0.2.0-next" setProperty("archivesBaseName", "diasporaAndroid__${versionName}__") vectorDrawables.useSupportLibrary = true From d17d89f7f9a51bb247a1a055eedee0273ba26c0b Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Fri, 4 Nov 2016 23:28:57 +0100 Subject: [PATCH 4/4] Fixed lint issues (suppressed, where they cant be fixed) --- app/src/main/AndroidManifest.xml | 7 +++++-- .../diaspora_android/activity/SettingsActivity.java | 2 ++ .../dfa/diaspora_android/ui/PodSelectionDialog.java | 11 +++++++++++ app/src/main/res/layout/main__nav_header.xml | 5 +++-- app/src/main/res/layout/podselection__dialog.xml | 7 +++++-- app/src/main/res/menu/main__menu_bottom.xml | 3 ++- app/src/main/res/menu/main__menu_top.xml | 3 ++- .../menu/main__menu_top__notifications_dropdown.xml | 3 ++- app/src/main/res/menu/stream__menu_bottom.xml | 4 +++- app/src/main/res/menu/stream__menu_top.xml | 2 -- app/src/main/res/values/color.xml | 4 +++- app/src/main/res/values/strings.xml | 2 ++ 12 files changed, 40 insertions(+), 13 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fe8e3163..67edd76a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.github.dfa.diaspora_android" + tools:ignore="GoogleAppIndexingWarning"> @@ -15,7 +17,8 @@ + android:authorities="com.github.dfa.diaspora_android.mainactivity" + android:exported="false"/> Primary Color, 2 -> Accent Color */ + @SuppressLint("InflateParams") public void showColorPickerDialog(final int type) { final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings(); final Context context = getActivity(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java index 663ae5f4..3286d7ea 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java @@ -1,6 +1,7 @@ package com.github.dfa.diaspora_android.ui; +import android.annotation.SuppressLint; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; @@ -9,6 +10,7 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.RadioGroup; @@ -93,6 +95,12 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { @BindView(R.id.podselection__dialog__text_protocol) TextView textProtocol; + @BindView(R.id.podselection__dialog__btn_ok) + Button btnOk; + + @BindView(R.id.podselection__dialog__btn_cancel) + Button btnCancel; + private PodSelectionDialogResultListener resultListener; private View root; private DiasporaPod pod = new DiasporaPod(); @@ -100,6 +108,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { @NonNull @Override + @SuppressLint("InflateParams") public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); LayoutInflater inflater = getActivity().getLayoutInflater(); @@ -135,6 +144,8 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { textProfile.setTextColor(ThemeHelper.getAccentColor()); textProtocol.setTextColor(ThemeHelper.getAccentColor()); textTorPreset.setTextColor(ThemeHelper.getAccentColor()); + btnOk.setTextColor(ThemeHelper.getAccentColor()); + btnCancel.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateEditTextColor(editPodAddress); ThemeHelper.updateEditTextColor(editPodName); diff --git a/app/src/main/res/layout/main__nav_header.xml b/app/src/main/res/layout/main__nav_header.xml index d3294497..39003d1e 100644 --- a/app/src/main/res/layout/main__nav_header.xml +++ b/app/src/main/res/layout/main__nav_header.xml @@ -1,9 +1,9 @@ @@ -36,7 +36,8 @@ android:layout_marginEnd="@dimen/activity_horizontal_margin_half" android:layout_marginStart="@dimen/activity_horizontal_margin" android:scaleType="fitCenter" - android:src="@drawable/ic_launcher" /> + android:src="@drawable/ic_launcher" + tools:ignore="ContentDescription" /> + android:text="@string/http" /> + android:text="@string/https" />