Download podlist at build time

Download podlist at build time Added drawable ic_media_video_poster.xml in order to prevent upstream nullpointer exception in the webview Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android Added navslider entry for reports Release v0.2.0 start of 0.2.0-next Merge master
2024-11-24 13:22:08 +01:00 · 2016-11-04 22:39:44 +01:00 · 2016-11-04 22:39:44 +01:00 · eeecd98208
commit eeecd98208
parent 95dbb2cd34
22 changed files with 230 additions and 1410 deletions
--- 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 ###
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@ -11,5 +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
+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
--- 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!
--- 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 10
+        versionName "0.2.0-next"
        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,5 +85,39 @@ task copyRepoFiles(type: Copy) {
        }
    }

+    // 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)
+        }
+    }
 }
+
+<<<<<<< HEAD
+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()
+=======
+// 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()
+>>>>>>> master
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -75,12 +75,9 @@
                <data android:host="despora.de" android:scheme="https" />
                <data android:host="sechat.org" android:scheme="https" />
                <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="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="cryptospora.net" 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.myocastor.de" android:scheme="https" />
@ -99,17 +96,14 @@
                <data android:host="diaspora.com.ar" 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.digitalismus.org" 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.fr33.co" 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.kapper.net" 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.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.moosje.nl" 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.raven-ip.com" 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.subsignal.org" 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.undernet.uy" 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="diasporabrazil.org" android:scheme="https" />
-                <data android:host="diasporanet.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="dissociateduse.rs" 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.social" android:scheme="https" />
                <data android:host="failure.net" android:scheme="https" />
                <data android:host="flokk.no" 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="jons.gr" android:scheme="https" />
                <data android:host="kapok.se" 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="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.gr" android:scheme="https" />
-                <data android:host="londor.be" android:scheme="https" />
                <data android:host="misamigos.online" android:scheme="https" />
                <data android:host="mondiaspora.net" android:scheme="https" />
                <data android:host="networkwizard.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="pod.4ray.co" 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.asap-soft.com" 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.dapor.net" 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.dirkomatik.de" 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.gleisnetze.de" 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.hfrc.de" 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.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.neikos.me" 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.ponk.pink" 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.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.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.shouldit.work" 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.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="podbay.net" android:scheme="https" />
                <data android:host="poddery.com" android:scheme="https" />
                <data android:host="podricing.pw" 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="ruhrspora.de" 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.lanham.id.au" 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="spora.zone" 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="thinkopen.net" 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="wk3.org" 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.softwarelivre.org" 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="diaspora.zone" android:scheme="https" />
                <data android:host="pod.userzap.de" android:scheme="https" />
-                <data android:host="share.naturalnews.com" android:scheme="https" />
                <!--@@@ PODLIST END-->
            </intent-filter>

--- 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;
@ -398,6 +397,7 @@ public class MainActivity extends ThemedActivity
        navMenu.findItem(R.id.nav_profile).setVisible(appSettings.isVisibleInNavProfile());
        navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());
        navMenu.findItem(R.id.nav_stream).setVisible(true);
+        navMenu.findItem(R.id.nav_reports).setVisible(appSettings.isVisibleInNavReports());


        // Hide whole group (for logged in use) if no pod was selected
@ -462,7 +462,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 +486,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 +581,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();
@ -1028,8 +1028,8 @@ public class MainActivity extends ThemedActivity
                } else {
                    snackbarNoInternet.show();
                }
-                break;
            }
+            break;

            case R.id.nav_public: {
                if (WebHelper.isOnline(MainActivity.this)) {
@ -1037,14 +1037,24 @@ public class MainActivity extends ThemedActivity
                } else {
                    snackbarNoInternet.show();
                }
-                break;
            }
+            break;
+
+            case R.id.nav_reports: {
+                AppLog.d(this, "NAV_REPORTS!");
+                if(WebHelper.isOnline(MainActivity.this)) {
+                    openDiasporaUrl(urls.getReportsUrl());
+                } else {
+                    snackbarNoInternet.show();
+                }
+            }
+            break;

            case R.id.nav_exit: {
                moveTaskToBack(true);
                finish();
-                break;
            }
+            break;

            case R.id.nav_settings: {
                startActivity(new Intent(this, SettingsActivity.class));
--- 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();
            }
        }
--- 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);
 }
--- 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() {
@ -380,6 +380,10 @@ public class AppSettings {
        return getBoolean(prefApp, R.string.pref_key__visibility_nav__contacts, false);
    }

+    public boolean isVisibleInNavReports() {
+        return getBoolean(prefApp, R.string.pref_key__visibility_nav__reports, false);
+    }
+
    public void setPrimaryColorSettings(int base, int shade) {
        setInt(prefApp, R.string.pref_key__primary_color_base, base);
        setInt(prefApp, R.string.pref_key__primary_color_shade, shade);
--- 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
@ -60,6 +60,7 @@ public class DiasporaUrlHelper {
    public static final String SUBURL_NOTIFICATIONS_MENTIONED = "/notifications?type=mentioned";
    public static final String SUBURL_NOTIFICATIONS_RESHARED = "/notifications?type=reshared";
    public static final String SUBURL_NOTIFICATIONS_STARTED_SHARING = "/notifications?type=started_sharing";
+    public static final String SUBURL_REPORTS = "/reports";

    public DiasporaUrlHelper(AppSettings settings) {
        this.settings = settings;
@ -273,6 +274,16 @@ public class DiasporaUrlHelper {
        return getPodUrl() + SUBURL_MANAGE_CONTACTS;
    }

+    /**
+     * Return a url that points to the report page of the pod.
+     * Note: Only admins/moderators do have access to that url.
+     *
+     * @return https://(pod-domain.tld)/reports
+     */
+    public String getReportsUrl() {
+        return getPodUrl() + SUBURL_REPORTS;
+    }
+
    public String getSuburlNotificationsAlsoCommentedUrl() {
        return getPodUrl() + SUBURL_NOTIFICATIONS_ALSO_COMMENTED;
    }
--- 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());
--- a/app/src/main/res/drawable/ic_report_black_48px.xml
+++ b/app/src/main/res/drawable/ic_report_black_48px.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-.72
+0-1.3-.58-1.3-1.3 0-.72 .58 -1.3 1.3-1.3 .72 0 1.3 .58 1.3 1.3 0 .72-.58 1.3-1.3
+1.3zm1-4.3h-2V7h2v6z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
--- a/app/src/main/res/menu/main__navdrawer.xml
+++ b/app/src/main/res/menu/main__navdrawer.xml
@ -53,6 +53,11 @@
            android:icon="@drawable/ic_public_black_48px"
            android:title="@string/nav_public_activities" />

+        <item
+            android:id="@+id/nav_reports"
+            android:icon="@drawable/ic_report_black_48px"
+            android:title="@string/nav_reports" />
+
        <item
            android:id="@+id/nav_exit"
            android:icon="@drawable/ic_cancel_black_48px"
--- a/app/src/main/res/raw/podlist.json
+++ b/app/src/main/res/raw/podlist.json
--- a/app/src/main/res/values-es/strings-about.xml
+++ b/app/src/main/res/values-es/strings-about.xml
@ -2,6 +2,40 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- 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) -->
+  <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 -->
 </resources>
--- a/app/src/main/res/values-it/strings-about.xml
+++ b/app/src/main/res/values-it/strings-about.xml
@ -14,6 +14,9 @@
  <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__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_license__3rd_party_libs_title">Librerie di terze parti usate</string>
  <!-- About (large amount of text) -->
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@ -28,6 +28,9 @@
  <!-- Font size -->
  <string name="pref_title__font_size">Dimensione font</string>
  <!-- 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 -->
  <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>
@ -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_title__http_proxy_host">Host</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 -->
  <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 -->
--- a/app/src/main/res/values-pl/strings-about.xml
+++ b/app/src/main/res/values-pl/strings-about.xml
@ -15,7 +15,7 @@
  <string name="fragment_debug__android_version">Wersja systemu Android: %1$s</string>
  <string name="fragment_debug__device_name">Nazwa urządzenia: %1$s</string>
  <string name="fragment_debug__app_codename">Nazwa kodowa: %1$s</string>
-  <string name="fragment_debug__pod_profile_name">Nazwa profilu na Podzie: %1$s</string>
+  <string name="fragment_debug__pod_profile_name">Alias Poda: %1$s</string>
  <string name="fragment_debug__pod_profile_url">Domena Poda: %1$s</string>
  <string name="fragment_debug__toast_log_copied">Log debugowania został skopiowany do schowka</string>
  <string name="fragment_license__3rd_party_libs_title">Lista bibliotek zewnętrznych</string>
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@ -34,6 +34,7 @@

    <!-- Navigiation Slider -->
    <string name="pref_catkey__visibility_nav" translatable="false">pref_catkey__visibility_navslider</string>
+    <string name="pref_cat__visibility_nav_items__general">General</string>
    <string name="pref_key__visibility_nav__exit" translatable="false">pref_key__visibility_navslider__exit</string>
    <string name="pref_key__visibility_nav__help_license" translatable="false">pref_key__visibility_nav__help_license</string>
    <string name="pref_key__visibility_nav__public_activities" translatable="false">pref_key__visibility_nav__public_activities</string>
@ -45,6 +46,8 @@
    <string name="pref_key__visibility_nav__followed_tags" translatable="false">pref_key__visibility_nav__followed_tags</string>
    <string name="pref_key__visibility_nav__profile" translatable="false">pref_key__visibility_nav__profile</string>
    <string name="pref_key__visibility_nav__contacts" translatable="false">pref_key__visibility_nav__contacts</string>
+    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
+    <string name="pref_key__visibility_nav__reports" translatable="false">pref_key__visibility_nav__report</string>

    <!-- PodProfile -->
    <string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -70,6 +70,7 @@
    <string name="nav_followed_tags">Followed Tags</string>
    <string name="nav_public_activities">Public activities</string>
    <string name="nav_contacts" translatable="false">@string/contacts</string>
+    <string name="nav_reports">Report</string>

    <string name="share__share_link_as_text">Share link as text</string>
    <string name="share__share_screenshot">Share screenshot of webpage</string>
--- 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">

        <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
            android:key="@string/pref_key__logging_enabled"
            android:title="@string/pref_title__logging_enabled"/>
        <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
--- a/app/src/main/res/xml/preferences__sub_navslider_vis.xml
+++ b/app/src/main/res/xml/preferences__sub_navslider_vis.xml
@ -1,54 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

-<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
-    android:key="@string/pref_key__title__visibility_nav"
-    android:title="@string/pref_cat__visibility_nav_items">
+    <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
+        android:key="@string/pref_key__title__visibility_nav"
+        android:title="@string/pref_cat__visibility_nav_items__general">

-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__profile"
-        android:title="@string/nav_profile"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__followed_tags"
-        android:title="@string/nav_followed_tags"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__aspects"
-        android:title="@string/nav_aspects"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key__visibility_nav__contacts"
-        android:title="@string/nav_contacts" />
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key__visibility_nav__activities"
-        android:title="@string/nav_activities"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__liked"
-        android:title="@string/nav_liked"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__commented"
-        android:title="@string/nav_commented"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key__visibility_nav__mentions"
-        android:title="@string/nav_mentions"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key__visibility_nav__public_activities"
-        android:title="@string/nav_public_activities"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key__visibility_nav__exit"
-        android:title="@string/action_exit_app"/>
-    <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key__visibility_nav__help_license"
-        android:title="@string/nav_help_license"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__profile"
+            android:title="@string/nav_profile"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__followed_tags"
+            android:title="@string/nav_followed_tags"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__aspects"
+            android:title="@string/nav_aspects"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__contacts"
+            android:title="@string/nav_contacts" />
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__activities"
+            android:title="@string/nav_activities"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__liked"
+            android:title="@string/nav_liked"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__commented"
+            android:title="@string/nav_commented"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__mentions"
+            android:title="@string/nav_mentions"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__public_activities"
+            android:title="@string/nav_public_activities"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__exit"
+            android:title="@string/action_exit_app"/>
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key__visibility_nav__help_license"
+            android:title="@string/nav_help_license"/>

-</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
+    </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
+
+    <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
+        android:title="@string/pref_cat__visibility_nav_items__admin">
+
+        <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key__visibility_nav__reports"
+            android:title="@string/nav_reports" />
+
+    </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>