1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 12:22:08 +01:00

Release v0.2.0

This commit is contained in:
Gregor Santner 2016-11-04 03:08:59 +01:00
parent e95082cefb
commit bc925e1a1e
14 changed files with 94 additions and 88 deletions

View file

@ -11,6 +11,7 @@
Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation
Airon90 (https://diasp.eu/u/airon90): Italian translation Airon90 (https://diasp.eu/u/airon90): Italian translation
Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions
Martín Vukovic (martinvukovic@protonmail.com): Diaspora Native WebApp Martín Vukovic (martinvukovic AT protonmail DOT com): Diaspora Native WebApp
Paweł Szymon Kosiński (pskosinski): Polish translation 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 SansPseudoFix (https://github.com/SansPseudoFix): French translation

View file

@ -41,6 +41,3 @@ Diaspora for Android requires access to the Internet and to external storage to
## Maintainers ## Maintainers
- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c)) - 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)) - 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!

View file

@ -9,11 +9,11 @@ android {
applicationId "com.github.dfa.diaspora_android" applicationId "com.github.dfa.diaspora_android"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 24 targetSdkVersion 24
versionCode 8 versionCode 9
versionName "0.1.6-next" versionName "0.2.0"
setProperty("archivesBaseName", "diasporaAndroid__${versionName}__") setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")
vectorDrawables.useSupportLibrary=true vectorDrawables.useSupportLibrary = true
} }
buildTypes { buildTypes {
release { release {
@ -27,10 +27,10 @@ android {
} }
} }
// Additional repositories
repositories { repositories {
maven { maven {
//Color picker url "http://dl.bintray.com/dasar/maven" //Color picker
url "http://dl.bintray.com/dasar/maven"
} }
} }
@ -44,23 +44,32 @@ dependencies {
// Android standard libs // Android standard libs
compile 'com.android.support:appcompat-v7:24.2.1' 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:support-v4:24.2.1'
compile "com.android.support:customtabs:24.2.1" compile 'com.android.support:customtabs:24.2.1'
// More libraries // More libraries
compile 'com.jakewharton:butterknife:8.0.1' compile 'com.jakewharton:butterknife:8.0.1'
compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
compile 'info.guardianproject.netcipher:netcipher-webkit: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' 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) { task copyRepoFiles(type: Copy) {
String[] copyFiles = ["README.md", "LICENSE.md", "CHANGELOG.md"]
from rootProject.files(copyFiles) // Copy files over to raw dir
into 'src/main/res/raw' from rootProject.files(ROOT_TO_RAW_COPYFILES)
into RAW_DIR.replaceFirst("app/", "")
rename { String fileName -> rename { String fileName ->
fileName.replace(fileName, fileName.toLowerCase()) fileName.replace(fileName, fileName.toLowerCase())
} }
@ -76,28 +85,24 @@ task copyRepoFiles(type: Copy) {
} }
} }
// Download Podlist // 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) downloadFile(PODLIST_PATH, PODLIST_URL, false)
// Do if we build in release (signed apk) mode // Application variants
android.applicationVariants.all { v -> android.applicationVariants.all { v ->
if (v.buildType.name == "release"){ // Do if we build in release (signed apk) mode
v.assemble.doFirst { if (v.buildType.name == "release") {
downloadFile(PODLIST_PATH, PODLIST_URL, true) downloadFile(PODLIST_PATH, PODLIST_URL, true)
}
} }
} }
} }
def downloadFile(filePath, url, downloadIfExists ) { // Downloads a file
def downloadFile(filePath, url, downloadIfExists) {
def f = new File(filePath) def f = new File(filePath)
if (f.exists() && downloadIfExists){ f.exists() && downloadIfExists && f.delete();
f.delete();
}
if (!f.exists()) { if (!f.exists()) {
new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }} new URL(url).withInputStream { i -> f.withOutputStream { it << i } }
} }
} }

View file

@ -75,12 +75,9 @@
<data android:host="despora.de" android:scheme="https" /> <data android:host="despora.de" android:scheme="https" />
<data android:host="sechat.org" android:scheme="https" /> <data android:host="sechat.org" android:scheme="https" />
<data android:host="sechatqpscuj2npx.onion" android:scheme="http" /> <data android:host="sechatqpscuj2npx.onion" android:scheme="http" />
<data android:host="austriapod.at" android:scheme="https" />
<data android:host="berdaguermontes.eu" android:scheme="https" /> <data android:host="berdaguermontes.eu" android:scheme="https" />
<data android:host="berlinspora.de" android:scheme="https" /> <data android:host="berlinspora.de" android:scheme="https" />
<data android:host="canfly.org" android:scheme="https" />
<data android:host="community.kanalinseln.de" android:scheme="https" /> <data android:host="community.kanalinseln.de" android:scheme="https" />
<data android:host="cryptospora.net" android:scheme="https" />
<data android:host="d.consumium.org" android:scheme="https" /> <data android:host="d.consumium.org" android:scheme="https" />
<data android:host="dia.manuelbichler.at" android:scheme="https" /> <data android:host="dia.manuelbichler.at" android:scheme="https" />
<data android:host="dia.myocastor.de" android:scheme="https" /> <data android:host="dia.myocastor.de" android:scheme="https" />
@ -99,17 +96,14 @@
<data android:host="diaspora.com.ar" android:scheme="https" /> <data android:host="diaspora.com.ar" android:scheme="https" />
<data android:host="diaspora.deadhexagon.com" android:scheme="https" /> <data android:host="diaspora.deadhexagon.com" android:scheme="https" />
<data android:host="diaspora.digi-merc.org" android:scheme="https" /> <data android:host="diaspora.digi-merc.org" android:scheme="https" />
<data android:host="diaspora.digitalismus.org" android:scheme="https" />
<data android:host="diaspora.dorf-post.de" android:scheme="https" /> <data android:host="diaspora.dorf-post.de" android:scheme="https" />
<data android:host="diaspora.espiritolivre.org" android:scheme="https" /> <data android:host="diaspora.espiritolivre.org" android:scheme="https" />
<data android:host="diaspora.fr33.co" android:scheme="https" />
<data android:host="diaspora.horwood.biz" android:scheme="https" /> <data android:host="diaspora.horwood.biz" android:scheme="https" />
<data android:host="diaspora.hzsogood.net" android:scheme="https" /> <data android:host="diaspora.hzsogood.net" android:scheme="https" />
<data android:host="diaspora.kapper.net" android:scheme="https" /> <data android:host="diaspora.kapper.net" android:scheme="https" />
<data android:host="diaspora.koehn.com" android:scheme="https" /> <data android:host="diaspora.koehn.com" android:scheme="https" />
<data android:host="diaspora.kosebamse.com" android:scheme="https" /> <data android:host="diaspora.kosebamse.com" android:scheme="https" />
<data android:host="diaspora.lebarjack.com" android:scheme="https" /> <data android:host="diaspora.lebarjack.com" android:scheme="https" />
<data android:host="diaspora.mazi.tk" android:scheme="https" />
<data android:host="diaspora.microdata.co.uk" android:scheme="https" /> <data android:host="diaspora.microdata.co.uk" android:scheme="https" />
<data android:host="diaspora.moosje.nl" android:scheme="https" /> <data android:host="diaspora.moosje.nl" android:scheme="https" />
<data android:host="diaspora.net.gr" android:scheme="https" /> <data android:host="diaspora.net.gr" android:scheme="https" />
@ -122,101 +116,68 @@
<data android:host="diaspora.punkbeer.me" android:scheme="https" /> <data android:host="diaspora.punkbeer.me" android:scheme="https" />
<data android:host="diaspora.raven-ip.com" android:scheme="https" /> <data android:host="diaspora.raven-ip.com" android:scheme="https" />
<data android:host="diaspora.retrodigital.net" android:scheme="https" /> <data android:host="diaspora.retrodigital.net" android:scheme="https" />
<data android:host="diaspora.sceal.ie" android:scheme="https" />
<data android:host="diaspora.schrauger.com" android:scheme="https" />
<data android:host="diaspora.slowb.ro" android:scheme="https" />
<data android:host="diaspora.soh.re" android:scheme="https" /> <data android:host="diaspora.soh.re" android:scheme="https" />
<data android:host="diaspora.subsignal.org" android:scheme="https" /> <data android:host="diaspora.subsignal.org" android:scheme="https" />
<data android:host="diaspora.trash-talk.de" android:scheme="https" /> <data android:host="diaspora.trash-talk.de" android:scheme="https" />
<data android:host="diaspora.u4u.org" android:scheme="https" /> <data android:host="diaspora.u4u.org" android:scheme="https" />
<data android:host="diaspora.undernet.uy" android:scheme="https" />
<data android:host="diaspora.unixcorn.org" android:scheme="https" /> <data android:host="diaspora.unixcorn.org" android:scheme="https" />
<data android:host="diaspora.weenmebrown.com" android:scheme="https" />
<data android:host="diaspora.xcelor8.com" android:scheme="https" />
<data android:host="diasporabr.com.br" android:scheme="https" /> <data android:host="diasporabr.com.br" android:scheme="https" />
<data android:host="diasporabrazil.org" android:scheme="https" /> <data android:host="diasporabrazil.org" android:scheme="https" />
<data android:host="diasporanet.tk" android:scheme="https" />
<data android:host="diasporapr.tk" android:scheme="https" /> <data android:host="diasporapr.tk" android:scheme="https" />
<data android:host="diasporausa.com" android:scheme="https" />
<data android:host="diasporing.ch" android:scheme="https" /> <data android:host="diasporing.ch" android:scheme="https" />
<data android:host="dissociateduse.rs" android:scheme="https" />
<data android:host="distributed.chat" android:scheme="https" /> <data android:host="distributed.chat" android:scheme="https" />
<data android:host="eat.egregious.ly" android:scheme="https" />
<data android:host="ege.land" android:scheme="https" />
<data android:host="espora.com.es" android:scheme="https" /> <data android:host="espora.com.es" android:scheme="https" />
<data android:host="espora.social" android:scheme="https" /> <data android:host="espora.social" android:scheme="https" />
<data android:host="failure.net" android:scheme="https" /> <data android:host="failure.net" android:scheme="https" />
<data android:host="flokk.no" android:scheme="https" /> <data android:host="flokk.no" android:scheme="https" />
<data android:host="freehuman.fr" android:scheme="https" /> <data android:host="freehuman.fr" android:scheme="https" />
<data android:host="friendica.tk" android:scheme="https" />
<data android:host="home.enslaver.net" android:scheme="https" />
<data android:host="idoru.pl" android:scheme="https" />
<data android:host="iliketoast.net" android:scheme="https" /> <data android:host="iliketoast.net" android:scheme="https" />
<data android:host="jons.gr" android:scheme="https" /> <data android:host="jons.gr" android:scheme="https" />
<data android:host="kapok.se" android:scheme="https" /> <data android:host="kapok.se" android:scheme="https" />
<data android:host="karmasphe.re" android:scheme="https" /> <data android:host="karmasphe.re" android:scheme="https" />
<data android:host="kosmospora.net" android:scheme="https" />
<data android:host="laba.mba" android:scheme="https" /> <data android:host="laba.mba" android:scheme="https" />
<data android:host="liberdade.digital" android:scheme="https" /> <data android:host="liberdade.digital" android:scheme="https" />
<data android:host="libertypod.org" android:scheme="https" />
<data android:host="librenet.co.za" android:scheme="https" /> <data android:host="librenet.co.za" android:scheme="https" />
<data android:host="librenet.gr" android:scheme="https" /> <data android:host="librenet.gr" android:scheme="https" />
<data android:host="londor.be" android:scheme="https" />
<data android:host="misamigos.online" android:scheme="https" /> <data android:host="misamigos.online" android:scheme="https" />
<data android:host="mondiaspora.net" android:scheme="https" /> <data android:host="mondiaspora.net" android:scheme="https" />
<data android:host="networkwizard.de" android:scheme="https" /> <data android:host="networkwizard.de" android:scheme="https" />
<data android:host="nx-pod.de" android:scheme="https" /> <data android:host="nx-pod.de" android:scheme="https" />
<data android:host="parteidervernunft.com" android:scheme="https" />
<data android:host="pe.spbstu.ru" android:scheme="https" /> <data android:host="pe.spbstu.ru" android:scheme="https" />
<data android:host="pod.4ray.co" android:scheme="https" /> <data android:host="pod.4ray.co" android:scheme="https" />
<data android:host="pod.8n1.org" android:scheme="https" /> <data android:host="pod.8n1.org" android:scheme="https" />
<data android:host="pod.alterworld.info" android:scheme="https" /> <data android:host="pod.alterworld.info" android:scheme="https" />
<data android:host="pod.asap-soft.com" android:scheme="https" /> <data android:host="pod.asap-soft.com" android:scheme="https" />
<data android:host="pod.cannyfoxx.me" android:scheme="https" /> <data android:host="pod.cannyfoxx.me" android:scheme="https" />
<data android:host="pod.comin.dk" android:scheme="https" />
<data android:host="pod.cyberdungeon.de" android:scheme="https" /> <data android:host="pod.cyberdungeon.de" android:scheme="https" />
<data android:host="pod.dapor.net" android:scheme="https" /> <data android:host="pod.dapor.net" android:scheme="https" />
<data android:host="pod.datenknoten.me" android:scheme="https" /> <data android:host="pod.datenknoten.me" android:scheme="https" />
<data android:host="pod.diaspora.software" android:scheme="https" /> <data android:host="pod.diaspora.software" android:scheme="https" />
<data android:host="pod.dirkomatik.de" android:scheme="https" /> <data android:host="pod.dirkomatik.de" android:scheme="https" />
<data android:host="pod.disroot.org" android:scheme="https" /> <data android:host="pod.disroot.org" android:scheme="https" />
<data android:host="pod.dobs.at" android:scheme="https" />
<data android:host="pod.dragondreaming.de" android:scheme="https" />
<data android:host="pod.gaialabs.ch" android:scheme="https" />
<data android:host="pod.gedankenausbruch.com" android:scheme="https" /> <data android:host="pod.gedankenausbruch.com" android:scheme="https" />
<data android:host="pod.gleisnetze.de" android:scheme="https" /> <data android:host="pod.gleisnetze.de" android:scheme="https" />
<data android:host="pod.goodsharing.at" android:scheme="https" /> <data android:host="pod.goodsharing.at" android:scheme="https" />
<data android:host="pod.hashtagueule.fr" android:scheme="https" /> <data android:host="pod.hashtagueule.fr" android:scheme="https" />
<data android:host="pod.hfrc.de" android:scheme="https" />
<data android:host="pod.hoizi.net" android:scheme="https" /> <data android:host="pod.hoizi.net" android:scheme="https" />
<data android:host="pod.infoduv.fr" android:scheme="https" />
<data android:host="pod.itabs.nl" android:scheme="https" /> <data android:host="pod.itabs.nl" android:scheme="https" />
<data android:host="pod.jpope.org" android:scheme="https" /> <data android:host="pod.jpope.org" android:scheme="https" />
<data android:host="pod.kepow.org" android:scheme="https" />
<data android:host="pod.liebeleu.de" android:scheme="https" /> <data android:host="pod.liebeleu.de" android:scheme="https" />
<data android:host="pod.neikos.me" android:scheme="https" />
<data android:host="pod.nomorestars.com" android:scheme="https" /> <data android:host="pod.nomorestars.com" android:scheme="https" />
<data android:host="pod.orkz.net" android:scheme="https" /> <data android:host="pod.orkz.net" android:scheme="https" />
<data android:host="pod.ponk.pink" android:scheme="https" /> <data android:host="pod.ponk.pink" android:scheme="https" />
<data android:host="pod.promedol.com" android:scheme="https" /> <data android:host="pod.promedol.com" android:scheme="https" />
<data android:host="pod.psynet.su" android:scheme="https" /> <data android:host="pod.psynet.su" android:scheme="https" />
<data android:host="pod.readme.is" android:scheme="https" />
<data android:host="pod.richtig.koeln" android:scheme="https" />
<data android:host="pod.roocita.com" android:scheme="https" /> <data android:host="pod.roocita.com" android:scheme="https" />
<data android:host="pod.ros-it.ch" android:scheme="https" />
<data android:host="pod.sccn.club" android:scheme="https" />
<data android:host="pod.sertelon.fr" android:scheme="https" /> <data android:host="pod.sertelon.fr" android:scheme="https" />
<data android:host="pod.shouldit.work" android:scheme="https" />
<data android:host="pod.storel.li" android:scheme="https" /> <data android:host="pod.storel.li" android:scheme="https" />
<data android:host="pod.tchncs.de" android:scheme="https" /> <data android:host="pod.tchncs.de" android:scheme="https" />
<data android:host="pod.thomasdalichow.de" android:scheme="https" /> <data android:host="pod.thomasdalichow.de" android:scheme="https" />
<data android:host="pod.undreaming.org" android:scheme="https" />
<data android:host="pod.volt.io" android:scheme="https" /> <data android:host="pod.volt.io" android:scheme="https" />
<data android:host="podbay.net" android:scheme="https" /> <data android:host="podbay.net" android:scheme="https" />
<data android:host="poddery.com" android:scheme="https" /> <data android:host="poddery.com" android:scheme="https" />
<data android:host="podricing.pw" android:scheme="https" /> <data android:host="podricing.pw" android:scheme="https" />
<data android:host="pubpod.alqualonde.org" android:scheme="https" /> <data android:host="pubpod.alqualonde.org" android:scheme="https" />
<data android:host="realms.the-wizard.co.za" android:scheme="https" />
<data android:host="revreso.de" android:scheme="https" /> <data android:host="revreso.de" android:scheme="https" />
<data android:host="ruhrspora.de" android:scheme="https" /> <data android:host="ruhrspora.de" android:scheme="https" />
<data android:host="russiandiaspora.org" android:scheme="https" /> <data android:host="russiandiaspora.org" android:scheme="https" />
@ -227,7 +188,6 @@
<data android:host="social.elaon.de" android:scheme="https" /> <data android:host="social.elaon.de" android:scheme="https" />
<data android:host="social.lanham.id.au" android:scheme="https" /> <data android:host="social.lanham.id.au" android:scheme="https" />
<data android:host="social.mbuto.me" android:scheme="https" /> <data android:host="social.mbuto.me" android:scheme="https" />
<data android:host="social.sum7.de" android:scheme="https" />
<data android:host="socializer.cc" android:scheme="https" /> <data android:host="socializer.cc" android:scheme="https" />
<data android:host="spora.zone" android:scheme="https" /> <data android:host="spora.zone" android:scheme="https" />
<data android:host="subvillage.de" android:scheme="https" /> <data android:host="subvillage.de" android:scheme="https" />
@ -236,7 +196,6 @@
<data android:host="therealtalk.org" android:scheme="https" /> <data android:host="therealtalk.org" android:scheme="https" />
<data android:host="thinkopen.net" android:scheme="https" /> <data android:host="thinkopen.net" android:scheme="https" />
<data android:host="tippentappen.de" android:scheme="https" /> <data android:host="tippentappen.de" android:scheme="https" />
<data android:host="united.zkp.fr" android:scheme="https" />
<data android:host="whatsnewz.com" android:scheme="https" /> <data android:host="whatsnewz.com" android:scheme="https" />
<data android:host="wk3.org" android:scheme="https" /> <data android:host="wk3.org" android:scheme="https" />
<data android:host="www.datataffel.dk" android:scheme="https" /> <data android:host="www.datataffel.dk" android:scheme="https" />
@ -244,11 +203,9 @@
<data android:host="diaspora.hofud.com" android:scheme="https" /> <data android:host="diaspora.hofud.com" android:scheme="https" />
<data android:host="diaspora.softwarelivre.org" android:scheme="https" /> <data android:host="diaspora.softwarelivre.org" android:scheme="https" />
<data android:host="confetticake.club" android:scheme="https" /> <data android:host="confetticake.club" android:scheme="https" />
<data android:host="diaspora.mike-jones.me.uk" android:scheme="https" />
<data android:host="diaspote.org" android:scheme="https" /> <data android:host="diaspote.org" android:scheme="https" />
<data android:host="diaspora.zone" android:scheme="https" /> <data android:host="diaspora.zone" android:scheme="https" />
<data android:host="pod.userzap.de" android:scheme="https" /> <data android:host="pod.userzap.de" android:scheme="https" />
<data android:host="share.naturalnews.com" android:scheme="https" />
<!--@@@ PODLIST END--> <!--@@@ PODLIST END-->
</intent-filter> </intent-filter>

View file

@ -34,7 +34,6 @@ import android.support.customtabs.CustomTabsSession;
import android.support.design.widget.AppBarLayout; import android.support.design.widget.AppBarLayout;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.view.GravityCompat; import android.support.v4.view.GravityCompat;
@ -462,7 +461,7 @@ public class MainActivity extends ThemedActivity
@Override @Override
public void run() { public void run() {
ContextMenuWebView wv = ((DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG)).getWebView(); ContextMenuWebView wv = ((DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG)).getWebView();
if(wv != null) { if (wv != null) {
wv.clearCache(true); wv.clearCache(true);
} }
} }
@ -486,7 +485,7 @@ public class MainActivity extends ThemedActivity
return; return;
} }
//Catch split screen recreation //Catch split screen recreation
if(action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) { if (action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
return; return;
} }
@ -581,7 +580,7 @@ public class MainActivity extends ThemedActivity
LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL)); LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));
invalidateOptionsMenu(); invalidateOptionsMenu();
this.appSettings = getAppSettings(); this.appSettings = getAppSettings();
if(appSettings.isIntellihideToolbars()) { if (appSettings.isIntellihideToolbars()) {
enableToolbarHiding(); enableToolbarHiding();
} else { } else {
disableToolbarHiding(); disableToolbarHiding();

View file

@ -131,9 +131,9 @@ public class SettingsActivity extends ThemedActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
ThemedPreferenceFragment top = getTopFragment(); ThemedPreferenceFragment top = getTopFragment();
if(top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) { if (top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings(); 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(); Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show();
} }
} }

View file

@ -27,29 +27,33 @@ import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
public interface DiasporaUserProfileChangedListener { public interface DiasporaUserProfileChangedListener {
/** /**
* Called when the DiasporaUserProfile name changed * Called when the DiasporaUserProfile name changed
*
* @param diasporaUserProfile The profile * @param diasporaUserProfile The profile
* @param name The new name * @param name The new name
*/ */
void onUserProfileNameChanged(DiasporaUserProfile diasporaUserProfile, String name); void onUserProfileNameChanged(DiasporaUserProfile diasporaUserProfile, String name);
/** /**
* Called when the DiasporaUserProfile avatarUrl changed * Called when the DiasporaUserProfile avatarUrl changed
*
* @param diasporaUserProfile The profile * @param diasporaUserProfile The profile
* @param avatarUrl The new name * @param avatarUrl The new name
*/ */
void onUserProfileAvatarChanged(DiasporaUserProfile diasporaUserProfile, String avatarUrl); void onUserProfileAvatarChanged(DiasporaUserProfile diasporaUserProfile, String avatarUrl);
/** /**
* Called when the DiasporaUserProfile notificationCount changed * Called when the DiasporaUserProfile notificationCount changed
*
* @param diasporaUserProfile The profile * @param diasporaUserProfile The profile
* @param notificationCount The new notificationCount * @param notificationCount The new notificationCount
*/ */
void onNotificationCountChanged(DiasporaUserProfile diasporaUserProfile, int notificationCount); void onNotificationCountChanged(DiasporaUserProfile diasporaUserProfile, int notificationCount);
/** /**
* Called when the DiasporaUserProfile unreadMessageCount changed * Called when the DiasporaUserProfile unreadMessageCount changed
*
* @param diasporaUserProfile The profile * @param diasporaUserProfile The profile
* @param unreadMessageCount The new unreadMessageCount * @param unreadMessageCount The new unreadMessageCount
*/ */
void onUnreadMessageCountChanged(DiasporaUserProfile diasporaUserProfile, int unreadMessageCount); void onUnreadMessageCountChanged(DiasporaUserProfile diasporaUserProfile, int unreadMessageCount);
} }

View file

@ -19,9 +19,9 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import com.github.dfa.diaspora_android.R; 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;
import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl; 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 com.github.dfa.diaspora_android.web.ProxyHandler;
import org.json.JSONException; import org.json.JSONException;
@ -329,7 +329,7 @@ public class AppSettings {
} }
public boolean isLoggingEnabled() { 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() { public boolean isLoggingSpamEnabled() {

View file

@ -20,8 +20,8 @@ package com.github.dfa.diaspora_android.util;
import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.R; 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.DiasporaAspect;
import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
/** /**
* Helper class that provides easy access to specific urls related to diaspora * Helper class that provides easy access to specific urls related to diaspora

View file

@ -130,6 +130,7 @@ public class BrowserFragment extends ThemedFragment {
webSettings.setAllowFileAccess(false); webSettings.setAllowFileAccess(false);
webSettings.setUseWideViewPort(true); webSettings.setUseWideViewPort(true);
webSettings.setLoadWithOverviewMode(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.setDomStorageEnabled(true);
webSettings.setMinimumFontSize(appSettings.getMinimumFontSize()); webSettings.setMinimumFontSize(appSettings.getMinimumFontSize());
webSettings.setLoadsImagesAutomatically(appSettings.isLoadImages()); webSettings.setLoadsImagesAutomatically(appSettings.isLoadImages());

View file

@ -2,6 +2,40 @@
<!--Generated by crowdin.com--> <!--Generated by crowdin.com-->
<resources> <resources>
<!-- License & help (large amount of text) --> <!-- License & help (large amount of text) -->
<string name="about_activity__title_about_app">Acerca de</string>
<string name="about_activity__title_about_license">Licencia</string>
<string name="about_activity__title_debug_info">Depurando</string>
<string name="fragment_debug__section_app">Aplicación</string>
<string name="fragment_debug__section_device">Dispositivo</string>
<string name="fragment_debug__section_pod">Pod de Diaspora</string>
<string name="fragment_debug__section_log">Depurar registro</string>
<string name="fragment_debug__section_log_spam">Depurar registro (Detallado)</string>
<string name="fragment_debug__app_version">Versión aplicación:%1$s</string>
<string name="fragment_debug__package_name">Nombre del paquete: %1$s</string>
<string name="fragment_debug__android_version">Versión de Android: %1$s</string>
<string name="fragment_debug__device_name">Nombre del dispositivo: %1$s</string>
<string name="fragment_debug__app_codename">Nombre clave: %1$s</string>
<string name="fragment_debug__pod_profile_name">Nombre de perfil del pod: %1$s</string>
<string name="fragment_debug__pod_profile_url">Dominio del pod:%1$s</string>
<string name="fragment_debug__toast_log_copied">Registro de depuración copiado al portapapeles</string>
<string name="fragment_license__3rd_party_libs_title">Usadas bibliotecas de terceros</string>
<!-- About (large amount of text) --> <!-- About (large amount of text) -->
<string name="fragment_about__about_content">
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. &lt;br&gt;&lt;br&gt;
Diaspora utiliza Markdown para dar formato a las publicaciones. Puede encontrar más informaciónat&lt;br&gt;
El desarrollo de DiasporaForAndroid es libre en sentido de libertad y sigue las ideas del proyecto Diaspora.&lt;br&gt;
Puede encontrar el código fuente en Github: &lt;br&gt;
https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
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. &lt;br&gt; &lt;br&gt;
¿Esta aplicación no está disponible en su idioma? Compruebe nuestro proyecto en Crowdin.com y ¡ayúdenos a traducirlo!&lt;br&gt;
https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
¡No dude en hablarle a sus amigos de #DiasporaforAndroid!</string>
<!-- Lorem ipsum --> <!-- Lorem ipsum -->
</resources> </resources>

View file

@ -14,6 +14,9 @@
<string name="fragment_debug__package_name">Nome pacchetto: %1$s</string> <string name="fragment_debug__package_name">Nome pacchetto: %1$s</string>
<string name="fragment_debug__android_version">Versione Android: %1$s</string> <string name="fragment_debug__android_version">Versione Android: %1$s</string>
<string name="fragment_debug__device_name">Nome dispositivo: %1$s</string> <string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
<string name="fragment_debug__app_codename">Codename: %1$s</string>
<string name="fragment_debug__pod_profile_name">Pod alias: %1$s</string>
<string name="fragment_debug__pod_profile_url">Dominio pod: %1$s</string>
<string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string> <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
<string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string> <string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string>
<!-- About (large amount of text) --> <!-- About (large amount of text) -->

View file

@ -28,6 +28,9 @@
<!-- Font size --> <!-- Font size -->
<string name="pref_title__font_size">Dimensione font</string> <string name="pref_title__font_size">Dimensione font</string>
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash --> <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<string name="font_size_normal">Normale</string>
<string name="font_size_large">Grosso</string>
<string name="font_size_huge">Immenso</string>
<!-- Load images --> <!-- Load images -->
<string name="pref_title__load_images">Carica immagini</string> <string name="pref_title__load_images">Carica immagini</string>
<string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string> <string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
@ -39,6 +42,8 @@
<string name="pref_desc__http_proxy_enabled">Usa il proxy con i dati di Diaspora per eludere i firewall.\nPotrebbe essere necessario il riavvio</string> <string name="pref_desc__http_proxy_enabled">Usa il proxy con i dati di Diaspora per eludere i firewall.\nPotrebbe essere necessario il riavvio</string>
<string name="pref_title__http_proxy_host">Host</string> <string name="pref_title__http_proxy_host">Host</string>
<string name="pref_title__http_proxy_port">Porta</string> <string name="pref_title__http_proxy_port">Porta</string>
<string name="toast__proxy_disabled__restart_required">App è necessario riavviare per disattivare l\'utilizzo del proxy</string>
<string name="toast__proxy_orbot_preset_loaded">Orbot proxy preset caricato</string>
<!-- Chrome custom tabs --> <!-- Chrome custom tabs -->
<string name="pref_desc__chrome_custom_tabs_enabled">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!</string> <string name="pref_desc__chrome_custom_tabs_enabled">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!</string>
<!-- Diaspora Settings --> <!-- Diaspora Settings -->

View file

@ -5,7 +5,7 @@
android:title="@string/pref_title__sub_logging"> android:title="@string/pref_title__sub_logging">
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:key="@string/pref_key__logging_enabled" android:key="@string/pref_key__logging_enabled"
android:title="@string/pref_title__logging_enabled"/> android:title="@string/pref_title__logging_enabled"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference