Fixed a ton of lint issues

2024-12-22 19:08:03 +01:00 · 2016-11-08 20:41:53 +01:00 · 2016-11-08 20:41:53 +01:00 · 527912e49b
commit 527912e49b
parent 72a41a0b8a
49 changed files with 29 additions and 313 deletions
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.AppBarLayout;
@ -69,11 +68,8 @@ import butterknife.OnClick;
 public class AboutActivity extends ThemedActivity
        implements IntellihideToolbarActivityListener {

-    private SectionsPagerAdapter mSectionsPagerAdapter;
-    private ViewPager mViewPager;
-
    @BindView(R.id.about__appbar)
-    AppBarLayout appBarLayout;
+    protected AppBarLayout appBarLayout;

    @BindView(R.id.main__topbar)
    protected Toolbar toolbar;
@ -100,10 +96,10 @@ public class AboutActivity extends ThemedActivity
        });
        // Create the adapter that will return a fragment for each of the three
        // primary sections of the activity.
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());

        // Set up the ViewPager with the sections adapter.
-        mViewPager = ButterKnife.findById(this, R.id.container);
+        ViewPager mViewPager = ButterKnife.findById(this, R.id.container);
        mViewPager.setAdapter(mSectionsPagerAdapter);

        tabLayout.setupWithViewPager(mViewPager);
@ -289,9 +285,8 @@ public class AboutActivity extends ThemedActivity
        }

        public String getContributorsHtml(Context context) {
-            String text = Helpers.readTextfileFromRawRessource(context, R.raw.contributors,
+            return Helpers.readTextfileFromRawRessource(context, R.raw.contributors,
                    "<font color='" + accentColor + "'><b>*</b></font> ", "<br>");
-            return text;
        }

        public String getMaintainersHtml(Context context) {
@ -390,7 +385,6 @@ public class AboutActivity extends ThemedActivity
                try {
                    PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
                    AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
-                    DiasporaUrlHelper urls = new DiasporaUrlHelper(appSettings);
                    packageName.setText(pInfo.packageName);
                    appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")"));

--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java
@ -113,10 +113,10 @@ public class AspectListFragment extends ThemedFragment implements OnSomethingCli
    }

    public static class AspectAdapter extends RecyclerView.Adapter<AspectAdapter.ViewHolder> {
-        private AppSettings appSettings;
-        private DiasporaAspect[] aspectList;
-        private List<String> aspectFavsList;
-        private OnSomethingClickListener<Object> aspectClickedListener;
+        private final AppSettings appSettings;
+        private final DiasporaAspect[] aspectList;
+        private final List<String> aspectFavsList;
+        private final OnSomethingClickListener<Object> aspectClickedListener;

        static class ViewHolder extends RecyclerView.ViewHolder {
            @BindView(R.id.recycler_view__list_item__text)
--- 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;
@ -762,7 +761,7 @@ public class MainActivity extends ThemedActivity
                if (WebHelper.isOnline(MainActivity.this)) {
                    final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-                    View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false);
+                    @SuppressLint("InflateParams") View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false);
                    final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input);
                    ThemeHelper.updateEditTextColor(input);
                    final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
@ -896,7 +895,7 @@ public class MainActivity extends ThemedActivity
            AppLog.v(this, "Set shared text; Subject: \"" + escapedSubject + "\" Body: \"" + escapedBody + "\"");
            textToBeShared = "**" + escapedSubject + "** " + escapedBody;
        } else {
-            AppLog.v(this, "Set shared text; Subject: \"" + sharedSubject + "\" Body: \"" + sharedBody + "\"");
+            AppLog.v(this, "Set shared text; Subject: \"null\" Body: \"" + sharedBody + "\"");
            textToBeShared = escapedBody;
        }
    }
@ -1112,7 +1111,7 @@ public class MainActivity extends ThemedActivity
    /**
     * Set the string that will be shared into the new-post-editor
     *
-     * @param textToBeShared
+     * @param textToBeShared text that will be shared into the post-editor
     */
    public void setTextToBeShared(String textToBeShared) {
        this.textToBeShared = textToBeShared;
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
@ -330,9 +330,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
        }

        public DiasporaPod appendMainLangs(String... values) {
-            for (String mainLang : values) {
-                this.mainLangs.add(mainLang);
-            }
+            Collections.addAll(this.mainLangs, values);
            return this;
        }

@ -347,9 +345,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
        }

        public DiasporaPod appendPodUrls(DiasporaPodUrl... values) {
-            for (DiasporaPodUrl value : values) {
-                this.podUrls.add(value);
-            }
+            Collections.addAll(this.podUrls, values);
            return this;
        }

@ -411,7 +407,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
            /**
             * Get the base url
             *
-             * @return
+             * @return base url with port
             */
            public String getBaseUrl() {
                return protocol + "://" + host + (isPortNeeded() ? port : "");
--- a/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java
@ -53,7 +53,7 @@ public class OpenExternalLinkReceiver extends BroadcastReceiver {

        AppLog.v(this, "OpenExternalLinkReceiver.onReceive(): url");

-        Uri url = null;
+        Uri url;
        try {
            String sUrl = receiveIntent.getStringExtra(MainActivity.EXTRA_URL);
            url = Uri.parse(sUrl);
--- a/app/src/main/java/com/github/dfa/diaspora_android/service/StatisticsFetchTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/service/StatisticsFetchTask.java
@ -1,95 +0,0 @@
-/*
-    This file is part of the Diaspora for Android.
-
-    Diaspora for Android is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Diaspora for Android is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with the Diaspora for Android.
-
-    If not, see <http://www.gnu.org/licenses/>.
- */
-package com.github.dfa.diaspora_android.service;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.webkit.CookieManager;
-
-import com.github.dfa.diaspora_android.App;
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import info.guardianproject.netcipher.NetCipher;
-
-/**
- * AsyncTask to fetch a users profile
- */
-public class StatisticsFetchTask extends AsyncTask<Void, Void, Void> {
-    // Code for getting the profile async without any UI/WebView
-    // TODO: This is an early version,needs to be converted to Service
-
-    private final App app;
-    private final Context context;
-    private final DiasporaUrlHelper urls;
-
-    public StatisticsFetchTask(final App app) {
-        this.context = app.getApplicationContext();
-        this.app = app;
-        this.urls = new DiasporaUrlHelper(app.getSettings());
-    }
-
-
-    @Override
-    protected Void doInBackground(Void... params) {
-        String extractedProfileData = null;
-        final CookieManager cookieManager = app.getCookieManager();
-        String cookies = cookieManager.getCookie(urls.getPodUrl());
-
-        HttpsURLConnection connection;
-        InputStream inStream;
-        try {
-            URL url = new URL(urls.getStatisticsUrl());
-            connection = NetCipher.getHttpsURLConnection(url);
-            connection.setReadTimeout(10000);
-            connection.setConnectTimeout(15000);
-            connection.setRequestMethod("GET");
-            if (cookies != null) {
-                connection.setRequestProperty("Cookie", cookies);
-            }
-            connection.connect();
-
-            inStream = connection.getInputStream();
-            BufferedReader br = new BufferedReader(new InputStreamReader(inStream));
-            String line;
-            while ((line = br.readLine()) != null) {
-                AppLog.d(this, "STATS: " + line);
-            }
-
-            try {
-                br.close();
-                inStream.close();
-            } catch (IOException e) {/*Nothing*/}
-
-            connection.disconnect();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
--- 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
@ -36,12 +36,13 @@ import butterknife.OnClick;
 import butterknife.OnItemSelected;

 /**
+ * Dialog that helps the user configure a pod
 * Created by gsantner (https://gsantner.github.io) on 06.10.16.
 */
 public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
    public static final String TAG = "com.github.dfa.diaspora_android.ui.PodSelectionDialog";

-    public static interface PodSelectionDialogResultListener {
+    public interface PodSelectionDialogResultListener {
        void onPodSelectionDialogResult(DiasporaPod pod, boolean accepted);
    }

@ -127,7 +128,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
            spinnerProfile.setVisibility(View.VISIBLE);
            String[] podUrlss = new String[podUrls.size()];
            for (int i = 0; i < podUrls.size(); podUrlss[i] = podUrls.get(i++).getBaseUrl()) ;
-            ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, podUrlss);
+            ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, podUrlss);
            spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
            spinnerProfile.setAdapter(spinnerAdapter);
        }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java
@ -8,6 +8,7 @@ import android.support.v4.graphics.ColorUtils;
 import com.github.dfa.diaspora_android.R;

 /**
+ * Class that handles Colors
 * Created by dnld on 24/02/16.
 */
 public class ColorPalette {
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java
@ -40,7 +40,6 @@ import android.widget.RadioGroup;
 import android.widget.TextView;

 import com.github.dfa.diaspora_android.R;
-import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;

 /**
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java
@ -22,7 +22,6 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
-import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;

 import com.github.dfa.diaspora_android.App;
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java
@ -10,6 +10,7 @@ import android.widget.CheckBox;
 import com.github.dfa.diaspora_android.util.AppSettings;

 /**
+ * CheckboxPreference that colors its checkbox with accent color
 * Created by vanitas on 24.10.16.
 */

--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java
@ -10,6 +10,7 @@ import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.util.AppSettings;

 /**
+ * PreferenceFragment with a colored status bar
 * Created by vanitas on 24.10.16.
 */

--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java
@ -129,9 +129,9 @@ public class AppLog {

        public static Log instance;
        private AppSettings appSettings;
-        private DateFormat dateFormat;
-        private ArrayList<String> logBuffer;
-        private ArrayList<Observer> observers;
+        private final DateFormat dateFormat;
+        private final ArrayList<String> logBuffer;
+        private final ArrayList<Observer> observers;

        private Log() {
            this(null);
--- 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
@ -172,7 +172,7 @@ public class AppSettings {


    // TODO: Remove legacy at some time ;)
-    public void upgradeLegacyPoddomain() {
+    private void upgradeLegacyPoddomain() {
        String legacy = getString(prefPod, R.string.pref_key__poddomain_legacy, "");
        if (!legacy.equals("")) {
            DiasporaPod pod = new DiasporaPod();
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
@ -86,7 +86,7 @@ public class Helpers {

    public static String readTextfileFromRawRessource(Context context, int rawRessourceId, String linePrefix, String linePostfix) {
        StringBuilder sb = new StringBuilder();
-        String line = "";
+        String line;
        BufferedReader br = null;
        linePrefix = linePrefix == null ? "" : linePrefix;
        linePostfix = linePostfix == null ? "" : linePostfix;
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
@ -29,11 +29,9 @@ import com.github.dfa.diaspora_android.activity.MainActivity;

 public class CustomWebViewClient extends WebViewClient {
    private final App app;
-    private WebView webView;

    public CustomWebViewClient(App app, WebView webView) {
        this.app = app;
-        this.webView = webView;
    }

    //Open non-diaspora links in customtab/external browser
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
@ -24,6 +24,7 @@ import android.widget.ProgressBar;
 import com.github.dfa.diaspora_android.util.AppLog;

 /**
+ * WebChromeClient that handles sharing text to diaspora*
 * Created by vanitas on 26.09.16.
 */

--- a/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java
@ -24,6 +24,7 @@ import android.webkit.WebView;
 import android.widget.ProgressBar;

 /**
+ * WebChromeClient that allows uploading images
 * Created by vanitas on 26.09.16.
 */

@ -35,11 +36,6 @@ public class FileUploadWebChromeClient extends ProgressBarWebChromeClient {
        this.fileUploadCallback = fileUploadCallback;
    }

-    @Override
-    public void onProgressChanged(WebView wv, int progress) {
-        super.onProgressChanged(wv, progress);
-    }
-
    //For Android 4.1/4.2 only. DO NOT REMOVE!
    @SuppressWarnings("unused")
    protected void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java
@ -94,7 +94,7 @@ public class CustomTabActivityHelper {
    /**
     * Register a Callback to be called when connected or disconnected from the Custom Tabs Service
     *
-     * @param connectionCallback
+     * @param connectionCallback callback
     */
    public void setConnectionCallback(ConnectionCallback connectionCallback) {
        this.mConnectionCallback = connectionCallback;
--- a/app/src/main/res/drawable/ic_arrow_forward_black_48px.xml
+++ b/app/src/main/res/drawable/ic_arrow_forward_black_48px.xml
@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_email_colored_48px.xml
+++ b/app/src/main/res/drawable/ic_email_colored_48px.xml
@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF5300" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_share_black_24px.xml
+++ b/app/src/main/res/drawable/ic_share_black_24px.xml
@ -1,19 +0,0 @@
-<?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:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M18 16.08c-.76 0-1.44 .3 -1.96 .77 L8.91 12.7c.05-.23 .09 -.46 .09
-.7s-.04-.47-.09-.7l7.05-4.11c.54 .5 1.25 .81 2.04 .81 1.66 0 3-1.34
-3-3s-1.34-3-3-3-3 1.34-3 3c0 .24 .04 .47 .09 .7L8.04 9.81C7.5 9.31 6.79 9 6
-9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05 .21 -.08
-.43 -.08 .65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31
-2.92-2.92s-1.31-2.92-2.92-2.92z" />
-</vector>
-
--- a/app/src/main/res/drawable/ic_short_text_black_24px.xml
+++ b/app/src/main/res/drawable/ic_short_text_black_24px.xml
@ -1,14 +0,0 @@
-<?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="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
-19 19 17.59 13.41 12z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Navigations Slider</string>
  <string name="pref_desc__sub_nav_slider">Konfiguration der Sichtbarkeit von Einträgen im Navigation-Slider</string>
-  <string name="pref_cat__visibility_nav_items">Sichtbarkeit der Einträge</string>
  <string name="pref_cat__visibility_nav_items__user">Nutzer</string>
  <string name="pref_cat__visibility_nav_items__general">Generelles</string>
  <string name="pref_cat__visibility_nav_items__admin">Administrator</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[geteilt durch #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Aktualisieren</string>
-  <string name="new_notifications">Ungelesene Benachrichtigung. Lesen?</string>
  <!-- Common Words -->
  <string name="settings">Einstellungen</string>
  <string name="notifications">Benachrichtigungen</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Weitergesagt</string>
  <string name="notifications__started_sharing">Angefangen zu teilen</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Pod auswählen</string>
-  <string name="filter_hint">Pod-Adresse eingeben</string>
-  <string name="confirm_url">Pod-Adresse bestätigen</string>
-  <string name="search_for_pod">Pods durchsuchen&#8230;</string>
-  <string name="podlist_source_note">Anmerkung: Die Podliste wird aus den sicheren Pods, die bei  https://podupti.me gelistet sind generiert.</string>
-  <string name="valid_pod">Bitte eine gültige Pod-Adresse (Url) eingeben</string>
  <string name="podlist_error">Fehler: Konnte die Podliste nicht abfragen!</string>
  <string name="no_internet">Entschuldigung, du musst mit dem Internet verbunden sein, um fortzufahren.</string>
  <string name="confirmation">Bestätigung</string>
-  <string name="confirm_pod">Möchtest du wirklich \nhttps://%1$s\nals deinen Diaspora Pod auswählen?</string>
  <string name="confirm_exit">Möchtest du die App verlassen?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Mehr</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">In externem Browser öffnen&#8230;</string>
  <string name="context_menu_copy_link">Linkadresse kopieren</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Warnung: Proxy konnte nicht aktiviert werden&#8230;</string>
  <string name="unable_to_load_image">Konnte Bild nicht laden…</string>
-  <string name="all_tags">Alle Tags</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto
        gespeichert werden kann. Danach solltest du die Anwendung komplett schließen oder das Gerät neu starten.
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Control deslizante de navegación</string>
  <string name="pref_desc__sub_nav_slider">Control de visibilidad de las entradas en el cajón de navegación</string>
-  <string name="pref_cat__visibility_nav_items">Elemento visibilidad</string>
  <string name="pref_cat__visibility_nav_items__user">Usuario</string>
  <string name="pref_cat__visibility_nav_items__general">General</string>
  <string name="pref_cat__visibility_nav_items__admin">Administrador</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[compartido vía #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Recargar</string>
-  <string name="new_notifications">Notificación sin leer. ¿Quieres leerla?</string>
  <!-- Common Words -->
  <string name="settings">Configuración</string>
  <string name="notifications">Notificaciones</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Recompartido</string>
  <string name="notifications__started_sharing">Empezado Compartir</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Seleccionar Pod</string>
-  <string name="filter_hint">Introduce el dominio del Pod</string>
-  <string name="confirm_url">Confirma la url del Pod</string>
-  <string name="search_for_pod">Buscar por Pod&#8230;</string>
-  <string name="podlist_source_note">Nota: La lista de Pods esta integrada por Pods seguros listados en https://podupti.me. Puedes ingresar en el campo de edición cualquier Pod no listado.</string>
-  <string name="valid_pod">Por favor, introduce un nombre de dominio válido</string>
  <string name="podlist_error">Error: ¡No se pudo recuperar la lista de pods!</string>
  <string name="no_internet">Lo sentimos, debe estar conectado a internet para continuar</string>
  <string name="confirmation">Confirmación</string>
-  <string name="confirm_pod">¿Realmente desea usar\nhttps://%1$s\ncomo su Pod de Diaspora?</string>
  <string name="confirm_exit">¿Desea salir?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Más</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">Abrir en un navegador externo&#8230;</string>
  <string name="context_menu_copy_link">Copiar dirección al portapapeles</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Advertencia: No se pudo establecer proxy de la red</string>
  <string name="unable_to_load_image">No se pudo cargar la imagen</string>
-  <string name="all_tags">Todas las etiquetas</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
  <string name="permissions_image">Debe conceder \"Permiso de acceso al almacenamiento\" para guardar imágenes. Después, debe cerrar completamente la aplicación o reiniciar el aparato. Si usted no permite el almacenamiento  pero quiere guardar imágenes en otro momento, puede conceder el permiso más tarde.  Por favor abra: ajustes del sistema -aplicaciones- Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Barre de défilement</string>
  <string name="pref_desc__sub_nav_slider">Contrôles de la visibilité des entrées dans le volet de navigation</string>
-  <string name="pref_cat__visibility_nav_items">Visibilité de l’élément</string>
  <string name="pref_cat__visibility_nav_items__user">Utilisateur</string>
  <string name="pref_cat__visibility_nav_items__general">Général</string>
  <string name="pref_cat__visibility_nav_items__admin">Admin</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[partagé via #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Rafraîchir</string>
-  <string name="new_notifications">Notifications non lues. Lire ?</string>
  <!-- Common Words -->
  <string name="settings">Paramètres</string>
  <string name="notifications">Notifications</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Repartagés</string>
  <string name="notifications__started_sharing">A commencé à partager</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Selectionnez un Pod</string>
-  <string name="filter_hint">Entrez le nom de domaine du pod</string>
-  <string name="confirm_url">Confirmez l\'url du pod</string>
-  <string name="search_for_pod">Recherche de Pod&#8230;</string>
-  <string name="podlist_source_note">Note : la liste est générée à partir de la liste des pods sécurisés depuis https://podupti.me. Vous pouvez entrer l\'url d\'un pod non listé.</string>
-  <string name="valid_pod">Veuillez entrer un nom de domaine valide</string>
  <string name="podlist_error">Erreur : impossible de récupérer la liste des pods !</string>
  <string name="no_internet">Désolé, vous devez être connecté à Internet pour continuer</string>
  <string name="confirmation">Confirmation</string>
-  <string name="confirm_pod">Voulez-vous vraiment utiliser\nhttps://%1$s\ncomme pod Diaspora ?</string>
  <string name="confirm_exit">Souhaitez-vous quitter ?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Plus</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">Ouvrir dans un navigateur externe&#8230;</string>
  <string name="context_menu_copy_link">Copier le lien dans le presse-papier</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Attention: connexion au proxy impossible&#8230;</string>
  <string name="unable_to_load_image">Impossible de récupérer l\'image</string>
-  <string name="all_tags">Tout Tags</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les captures d\'écrans. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez utiliser la fonctionnalité de prise de capture d\'écran plus tard, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
  <string name="permissions_image">Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder/téléverser les images. Ensuite, vous devriez        fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images        ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications -        Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \".</string>
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Menù di navigazione</string>
  <string name="pref_desc__sub_nav_slider">Controlla la visibilità degli elementi nel menù di navigazione</string>
-  <string name="pref_cat__visibility_nav_items">Visibilità degli elementi</string>
  <!-- Themes -->
  <string name="pref_title__themes">Tema e colori</string>
  <string name="pref_desc__themes">Scegli quali colori usare nell\'app</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[condiviso con #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Ricarica</string>
-  <string name="new_notifications">C\'è una notifica non letta. La vuoi leggere?</string>
  <!-- Common Words -->
  <string name="settings">Impostazioni</string>
  <string name="notifications">Notifiche</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Ha ricondiviso</string>
  <string name="notifications__started_sharing">Ha iniziato a condividere con te</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Seleziona pod</string>
-  <string name="filter_hint">Inserisci dominio del pod</string>
-  <string name="confirm_url">Conferma URL del pod</string>
-  <string name="search_for_pod">Ricerca per pod&#8230;</string>
-  <string name="podlist_source_note">Nota: l\'elenco dei pod sicuri si trova su https://podupti.me. Si può inserire nel relativo campo qualsiasi pod non presente nell\'elenco.</string>
-  <string name="valid_pod">Inserisci un dominio valido</string>
  <string name="podlist_error">Errore: impossibile ottenere la lista dei pod!</string>
  <string name="no_internet">Devi essere connesso ad internet per proseguire</string>
  <string name="confirmation">Conferma</string>
-  <string name="confirm_pod">Vuoi veramente usare\nhttps://%1$s\ncome tuo pod di Diaspora?</string>
  <string name="confirm_exit">Vuoi veramente uscire?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Altro</string>
@ -66,9 +58,7 @@
  <string name="context_menu_open_external_browser">Apri nel browser&#8230;</string>
  <string name="context_menu_copy_link">Copia link negli appunti</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Attenzione: impossibile impostare proxy di rete&#8230;</string>
  <string name="unable_to_load_image">Impossibile caricare immagine</string>
-  <string name="all_tags">Tutti i tag</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Devi garantire il permesso di accesso alla memoria per poter salvare gli screenshot. Dopodiché devi
        chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la 
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">ナビゲーション スライダー</string>
  <string name="pref_desc__sub_nav_slider">ナビゲーションドロワー内のエントリーの表示を制御します</string>
-  <string name="pref_cat__visibility_nav_items">アイテムの表示</string>
  <!-- Themes -->
  <string name="pref_title__themes">テーマと色</string>
  <string name="pref_desc__themes">アプリ全体で使用される色を制御します</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[#DiasporaForAndroid でシェア]*</string>
  <!-- Application -->
  <string name="reload">再読み込み</string>
-  <string name="new_notifications">未読の通知。読みますか?</string>
  <!-- Common Words -->
  <string name="settings">設定</string>
  <string name="notifications">通知</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">リシェアしました</string>
  <string name="notifications__started_sharing">シェアを始めました</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">ポッドを選択</string>
-  <string name="filter_hint">ポッドのドメインを入力</string>
-  <string name="confirm_url">ポッドの URL を確認</string>
-  <string name="search_for_pod">ポッドの検索&#8230;</string>
-  <string name="podlist_source_note">注意: ポットリストは、https://podupti.me に記載されているセキュリティで保護されたポッドが表示されます。表示されていないポッドを編集フィールドに入力することができます。</string>
-  <string name="valid_pod">有効なドメインを入力してください</string>
  <string name="podlist_error">エラー: ポッドのリストを取得できませんでした!</string>
  <string name="no_internet">申し訳ありません。続行するにはインターネットに接続する必要があります</string>
  <string name="confirmation">確認</string>
-  <string name="confirm_pod">Diaspora のポッドとして\nhttps://%1$s\nを使用してもよろしいですか?</string>
  <string name="confirm_exit">終了しますか?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">さらに</string>
@ -66,9 +58,7 @@
  <string name="context_menu_open_external_browser">外部ブラウザーで開く&#8230;</string>
  <string name="context_menu_copy_link">リンクアドレスをクリップボードへコピー</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">警告: ネットワーク プロキシを設定できませんでした&#8230;</string>
  <string name="unable_to_load_image">画像を読み込むことができません</string>
-  <string name="all_tags">すべてのタグ</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">スクリーン ショットを保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後でスクリーン ショット機能を使用する場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
  <string name="permissions_image">画像を保存/アップロードするために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。</string>
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@ -11,7 +11,6 @@
  <string name="search">ಹುಡುಕಿ</string>
  <!-- Notifications dropdown menu -->
  <!-- Pod Activity -->
-  <string name="title_activity_pods">ಪೋಡ್ ಆಯ್ಕೆಮಾಡಿಕೊಳ್ಳಿ</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="new_post">ಹೊಸ ಪೊಸ್ಟ್</string>
  <string name="action_go_to_top">ಮೇಲಕ್ಕೆ ಹೋಗಿ</string>
@ -21,6 +20,5 @@
  <string name="context_menu_share_image">ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
  <string name="context_menu_copy_link">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಕೊಂಡಿಯನ್ನು ನಕಲಿಸಿ</string>
  <!-- More from MainActivity -->
-  <string name="all_tags">ಎಲ್ಲಾ ಟ್ಯಾಗ್‌ಗಳು</string>
  <!-- Permissions -->
 </resources>
--- a/app/src/main/res/values-ml/strings-preferences.xml
+++ b/app/src/main/res/values-ml/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">നാവിഗേഷൻ സ്ലൈഡർ</string>
  <string name="pref_desc__sub_nav_slider">നാവിഗേഷൻ ഡ്രാവറിൽ കാണേണ്ട എൻട്രികൾ നിയന്ത്രിക്കൂ</string>
-  <string name="pref_cat__visibility_nav_items">ഇനത്തിന്റെ കാഴ്ച</string>
  <!-- Themes -->
  <!-- Notifications dropdown -->
  <!-- Font size -->
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[ #DiasporaForAndroid ഉപയോഗിച്ച് ഷെയർ ചെയ്തത്]*</string>
  <!-- Application -->
  <string name="reload">റീലോഡ്</string>
-  <string name="new_notifications">വായിക്കാത്ത അറിയിപ്പുകളുണ്ട്. വായിക്കുന്നുവോ?</string>
  <!-- Common Words -->
  <string name="settings">സജ്ജീകരണങ്ങൾ</string>
  <string name="notifications">അറിയിപ്പുകൾ</string>
@ -21,15 +20,9 @@
  <string name="search">തിരയുക</string>
  <!-- Notifications dropdown menu -->
  <!-- Pod Activity -->
-  <string name="title_activity_pods">പോഡ് തിരഞ്ഞെടുക്കുക</string>
-  <string name="filter_hint">പോഡ് അഡ്രസ് രേഖപ്പെടുത്തുക</string>
-  <string name="confirm_url">പോഡ് അഡ്രസ് ഉറപ്പാക്കുക</string>
-  <string name="podlist_source_note">അറിയിപ്പ് : പോഡുകളുടെ ലിസ്റ്റ്  https://podupti.me യിൽ നിന്നാണ്‌ ലഭിക്കുന്നത്. തിരുത്തൽ വരുത്താനുള്ളയിടത്തിൽ മറ്റു പോഡുകളുടെ അഡ്രസ് നൽകാം.</string>
-  <string name="valid_pod">ശരിയായ ഒരു അഡ്രസ് നൽകുക</string>
  <string name="podlist_error">തെറ്റ്: പോഡുകളുടെ ലിസ്റ്റ് ലഭിക്കുന്നില്ല!</string>
  <string name="no_internet">ക്ഷമിക്കണം, തുടരുവാൻ ഇൻറർനെറ്റുമായി ബന്ധപ്പെട്ടിരിക്കണം</string>
  <string name="confirmation">ഉറപ്പിക്കൽ</string>
-  <string name="confirm_pod">\nhttps://%1$s\nനിങ്ങളുടെ ഡയാസ്പൊറ പോഡായി ഉപയോഗിക്കണമെന്ന് ഉറപ്പാണോ?</string>
  <string name="confirm_exit">പുറത്തേക്കു പോകണമോ?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">കൂടുതൽ</string>
@ -57,9 +50,7 @@
  <string name="context_menu_open_external_browser">പുറമേയുള്ള ബ്രൗസറിൽ തുറക്കുക&#8230;</string>
  <string name="context_menu_copy_link">ലിങ്ക് അഡ്രസ് ക്ലിപ്ബോർഡിലേക്ക് കോപ്പി ചെയ്യുക</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">മുന്നറിയിപ്പ്: നെറ്റ്‌വർക്ക് പ്രോക്സി സെറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല&#8230;</string>
  <string name="unable_to_load_image">ചിത്രം ലോഡ്‌ ചെയ്യാൻ കഴിയുന്നില്ല</string>
-  <string name="all_tags">എല്ലാ ടാഗുകളും</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">സ്‌ക്രീനിന്റെ ചിത്രങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾ \"സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം\" നൽകണം. അതിനുശേഷം താങ്കൾ        പ്രയോഗത്തെ പൂർണമായും നിർത്തുകയോ മൊബൈൽ റീസ്റ്റാർട്ട് ചെയ്യുകയോ വേണം. സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം നൽകാതെ        മറ്റൊരവസരത്തിൽ സ്‌ക്രീനിന്റെ ചിത്രത്തങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾക്ക് അപ്പോൾ അനുവാദം നൽകാം. ഇതിനായി സജ്ജീകരണങ്ങളിലെ പ്രയോഗങ്ങളിൽ നിന്ന്        ഡയസ്പോറ തിരഞ്ഞെടുക്കുക. എന്നിട്ട്‌ അനുവാദങ്ങളിൽ \"റൈറ്റ് സ്റ്റോറേജ് അനുവാദം\" നൽകുക.</string>
  <string name="permissions_image">ചിത്രങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾ \"സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം\" നൽകണം. അതിനുശേഷം താങ്കൾ        പ്രയോഗത്തെ പൂർണമായും നിർത്തുകയോ മൊബൈൽ റീസ്റ്റാർട്ട് ചെയ്യുകയോ വേണം. സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം നൽകാതെ        മറ്റൊരവസരത്തിൽ ചിത്രത്തങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾക്ക് അപ്പോൾ അനുവാദം നൽകാം. ഇതിനായി സജ്ജീകരണങ്ങളിലെ പ്രയോഗങ്ങളിൽ നിന്ന്        ഡയസ്പോറ തിരഞ്ഞെടുക്കുക. എന്നിട്ട്‌ അനുവാദങ്ങളിൽ \"റൈറ്റ് സ്റ്റോറേജ് അനുവാദം\" നൽകുക.</string>
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
  <string name="pref_desc__sub_nav_slider">Bepalen zichtbaarheid van vermeldingen in de navigatie-lade</string>
-  <string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
  <string name="pref_cat__visibility_nav_items__user">Gebruiker</string>
  <string name="pref_cat__visibility_nav_items__general">Algemeen</string>
  <string name="pref_cat__visibility_nav_items__admin">Beheer</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Herladen</string>
-  <string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
  <!-- Common Words -->
  <string name="settings">Instellingen</string>
  <string name="notifications">Meldingen</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Opnieuw gedeeld</string>
  <string name="notifications__started_sharing">Begonnen te delen</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Selecteer Pod</string>
-  <string name="filter_hint">Voer pod domein</string>
-  <string name="confirm_url">Bevestigen pod url</string>
-  <string name="search_for_pod">Zoek Pod&#8230;</string>
-  <string name="podlist_source_note">Opmerking: De podlijst is gevuld met beveiligde pods vermeld op https://podupti.me. U kunt in het bewerk veld elke pod invullen die niet in de lijst staat.</string>
-  <string name="valid_pod">Voer een geldige domeinnaam in</string>
  <string name="podlist_error">Fout: Kan niet de podlijst ophalen!</string>
  <string name="no_internet">Sorry, u moet verbinding met internet hebben om verder te gaan</string>
  <string name="confirmation">Bevestiging</string>
-  <string name="confirm_pod">Wilt u echt \nhttps://%1$s\n als uw Diaspora pod gebruiken?</string>
  <string name="confirm_exit">Wilt u afsluiten?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Meer</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">Geopend in externe browser&#8230;</string>
  <string name="context_menu_copy_link">Link-adres kopiëren naar Klembord</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Waarschuwing: Kan niet netwerk proxy instellen&#8230;</string>
  <string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
-  <string name="all_tags">Alle tags</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - Diaspora. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\".</string>
  <string name="permissions_image">U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - Diaspora. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\".</string>
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Pasek nawigacji</string>
  <string name="pref_desc__sub_nav_slider">Wybierz elementy widoczne w pasku nawigacji</string>
-  <string name="pref_cat__visibility_nav_items">Widoczność elementu</string>
  <string name="pref_cat__visibility_nav_items__user">Użytkownik</string>
  <string name="pref_cat__visibility_nav_items__general">Ogólne</string>
  <string name="pref_cat__visibility_nav_items__admin">Administracja</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[udostępnione za pomocą #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Odśwież</string>
-  <string name="new_notifications">Nieprzeczytane powiadomienia. Chcesz je przeczytać?</string>
  <!-- Common Words -->
  <string name="settings">Ustawienia</string>
  <string name="notifications">Powiadomienia</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Powtórzenia</string>
  <string name="notifications__started_sharing">Zaczęli się z Tobą dzielić</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Wybierz Pod</string>
-  <string name="filter_hint">Wprowadź domenę poda</string>
-  <string name="confirm_url">Potwierdzić adres url poda</string>
-  <string name="search_for_pod">Wyszukaj Pod&#8230;</string>
-  <string name="podlist_source_note">Uwaga: Na liście znajdują się Pody dodane do https://podupti.me i wspierające bezpieczne połączenia. Możesz także podać adres jakiegokolwiek innego Poda.</string>
-  <string name="valid_pod">Wprowadź prawidłową nazwę domeny</string>
  <string name="podlist_error">Błąd: Nie można pobrać listy podów!</string>
  <string name="no_internet">Przepraszam, musisz być podłączony do Internetu, aby kontynuować</string>
  <string name="confirmation">Potwierdzenie</string>
-  <string name="confirm_pod">Czy naprawdę chcesz używać\nhttps://%1$s \njako Twój Pod Diaspory?</string>
  <string name="confirm_exit">Czy chcesz zakończyć?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Więcej</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">Otwórz w zewnętrznej przeglądarce&#8230;</string>
  <string name="context_menu_copy_link">Skopiuj adres odnośnika do schowka</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Ostrzeżenie: Nie udało się ustawić proxy&#8230;</string>
  <string name="unable_to_load_image">Nie udało się wczytać obrazu</string>
-  <string name="all_tags">Wszystkie tagi</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">By móc zapisywać zrzuty ekranu musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - Diaspora. W sekcji uprawnień zaznacz \"Pamięć\".</string>
  <string name="permissions_image">By móc zapisywać/wysyłać obrazy musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - Diaspora. W sekcji uprawnień zaznacz \"Pamięć\".</string>
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Controle deslizante de navegação</string>
  <string name="pref_desc__sub_nav_slider">Visibilidade do controle de entradas na gaveta de navegação</string>
-  <string name="pref_cat__visibility_nav_items">Visibilidade de item</string>
  <!-- Themes -->
  <!-- Notifications dropdown -->
  <!-- Font size -->
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[compartilhado por #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Atualizar</string>
-  <string name="new_notifications">Notificação não lida. Quer ler?</string>
  <!-- Common Words -->
  <string name="settings">Opções</string>
  <string name="notifications">Notificações</string>
@ -21,15 +20,9 @@
  <string name="search">Buscar</string>
  <!-- Notifications dropdown menu -->
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Selecione o Pod</string>
-  <string name="filter_hint">Insira o domínio do Pod</string>
-  <string name="confirm_url">Confirme a URL do Pod</string>
-  <string name="podlist_source_note">OBS: A lista de pods é gerada por pods seguros do https://podupti.me. Você pode adicionar qualquer pod não listado.</string>
-  <string name="valid_pod">Por favor insira um nome de domínio válido</string>
  <string name="podlist_error">Erro: Não conseguimos recuperar a lista de pods!</string>
  <string name="no_internet">Desculpe, que você deve estar conectado à Internet para prosseguir</string>
  <string name="confirmation">Confirmação</string>
-  <string name="confirm_pod">Você realmente quer usar\nhttps://%1$s\no seu Pod diáspora?</string>
  <string name="confirm_exit">Deseja sair?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_followed_tags">Tags selecionadas</string>
@ -55,9 +48,7 @@
  <string name="context_menu_open_external_browser">Abrir em navegador externo&#8230;</string>
  <string name="context_menu_copy_link">Copiar link para área de transferência</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Aviso: Não foi possível definir proxy de rede&#8230;</string>
  <string name="unable_to_load_image">Não é possível carregar a imagem</string>
-  <string name="all_tags">Todas as tags</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Você deve conceder \"Permissão de armazenamento\" para salvar screenshots. Depois disso você deve fechar o app completamente ou reiniciar o telefone. Se você não permitir o acesso de armazenamento, mas deseja usar a função de captura de tela em um momento posterior, você pode conceder a permissão mais tarde. Por favor, abra: configurações - aplicativos - Diaspora. Na seção permissões, você pode conceder a permissão de armazenamento \"gravar\".</string>
  <string name="permissions_image">Você deve conceder \"Permissão de armazenamento\" para salvar imagens. Depois disso você deve fechar o app completamente ou reiniciar o telefone. Se você não permitir o acesso de armazenamento, mas deseja salvar imagens em um momento posterior, você pode conceder a permissão mais tarde. Por favor, abra: configurações - aplicativos - Diaspora. Na seção permissões, você pode conceder a permissão de armazenamento \"gravar\".</string>
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@ -14,7 +14,6 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Слайдер навигации</string>
  <string name="pref_desc__sub_nav_slider">Управление видимостью записей в ящике навигации</string>
-  <string name="pref_cat__visibility_nav_items">Видимость элемента</string>
  <string name="pref_cat__visibility_nav_items__user">Пользовательские</string>
  <string name="pref_cat__visibility_nav_items__general">Общие</string>
  <string name="pref_cat__visibility_nav_items__admin">Для администраторов</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -5,7 +5,6 @@
  <string name="shared_by_diaspora_android">*[опубликовано из #DiasporaForAndroid]*</string>
  <!-- Application -->
  <string name="reload">Перезагрузить</string>
-  <string name="new_notifications">Непрочитанное уведомление. Хотите прочитать его?</string>
  <!-- Common Words -->
  <string name="settings">Настройки</string>
  <string name="notifications">Уведомления</string>
@ -29,16 +28,9 @@
  <string name="notifications__reshared">Поделились</string>
  <string name="notifications__started_sharing">Добавили вас</string>
  <!-- Pod Activity -->
-  <string name="title_activity_pods">Выберите под</string>
-  <string name="filter_hint">Введите адрес пода</string>
-  <string name="confirm_url">Подтвердите URL пода</string>
-  <string name="search_for_pod">Поиска пода&#8230;</string>
-  <string name="podlist_source_note">Примечание: список подов формируется на основании списка безопасных подов с https://podupti.me. Вы можете ввести в поле для ввода любой под не из списка.</string>
-  <string name="valid_pod">Пожалуйста, введите корректное имя домена</string>
  <string name="podlist_error">Ошибка: не удалось получить список подов!</string>
  <string name="no_internet">Извините, вы должны быть подключены к Интернету, чтобы продолжить</string>
  <string name="confirmation">Подтверждение</string>
-  <string name="confirm_pod">Вы действительно хотите использовать\nhttps://%1$s\nв качестве вашего пода в Диаспоре?</string>
  <string name="confirm_exit">Вы действительно хотите выйти?</string>
  <!-- Drawer, Menu, Toolbar, ContextMenu -->
  <string name="nav_menu_more">Дополнительно</string>
@ -67,9 +59,7 @@
  <string name="context_menu_open_external_browser">Открыть во внешнем браузере&#8230;</string>
  <string name="context_menu_copy_link">Копировать адрес ссылки в буфер обмена</string>
  <!-- More from MainActivity -->
-  <string name="toast_set_proxy_failed">Предупреждение: Не удалось установить сетевой прокси&#8230;</string>
  <string name="unable_to_load_image">Не удается загрузить изображение</string>
-  <string name="all_tags">Все теги</string>
  <!-- Permissions -->
  <string name="permissions_screenshot">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения скриншотов. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите использовать функцию скриншотов позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки  - приложения - Диаспора. В разделе разрешения можно предоставить «разрешение на запись в хранилище».</string>
  <string name="permissions_image">Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения изображений. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите сохранять изображения позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки  - приложения - Диаспора. В разделе разрешения можно предоставить «разрешение на запись в хранилище».</string>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -5,13 +5,10 @@
    <dimen name="activity_horizontal_margin">16dp</dimen>
    <dimen name="activity_horizontal_margin_half">8dp</dimen>
    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
-    <dimen name="appbar_padding_top">8dp</dimen>
    <dimen name="bottom_toolbar_height">45dp</dimen>

    <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
     https://developer.android.com/design/patterns/navigation-drawer.html -->
-    <dimen name="navigation_drawer_width">250dp</dimen>


    <dimen name="textsize_badge_count">11sp</dimen>
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <integer name="fade_time">1300</integer>
-    <integer name="splash_delay">1500</integer>
 </resources>
--- a/app/src/main/res/values/strings-about.xml
+++ b/app/src/main/res/values/strings-about.xml
@ -62,5 +62,4 @@
    <string name="fragment_license__misc_leafpic_button">Tell me more</string>
    <string name="fragment_licesen__misc_leafpic_link" translatable="false">https://github.com/HoraApps/LeafPic</string>

-    <string name="lorem_ipsum" translatable="false">Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht? Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht?</string>
 </resources>
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@ -5,13 +5,10 @@
    <string name="pref_key__current_pod_0" translatable="false">pref_key__current_pod_0</string>
    <string name="pref_key__font_size" translatable="false">pref_key_font_size</string>
    <string name="pref_key__intellihide_toolbars" translatable="false">pref_key_intellihide_toolbars</string>
-    <string name="pref_catkey__pod_settings" translatable="false">pref_key_category_pod_settings</string>
-    <string name="pref_catkey__category_visuals" translatable="false">pref_key_category_visuals</string>
    <string name="pref_key__personal_settings" translatable="false">pref_key_personal_settings</string>
    <string name="pref_key__manage_tags" translatable="false">pref_key_manage_tags</string>
    <string name="pref_key__manage_contacts" translatable="false">pref_key_manage_contacts</string>
    <string name="pref_key__change_account" translatable="false">pref_key_change_account</string>
-    <string name="pref_catkey__network" translatable="false">pref_key_category_network</string>
    <string name="pref_key__load_images" translatable="false">pref_key_load_images</string>
    <string name="pref_key__clear_cache" translatable="false">pref_key_clear_cache</string>
    <string name="pref_key__chrome_custom_tabs_enabled" translatable="false">pref_key__chrome_custom_tabs_enabled</string>
@ -33,7 +30,6 @@
    <string name="pref_key__proxy_was_enabled" translatable="false">wasProxyEnabled</string>

    <!-- Navigiation Slider -->
-    <string name="pref_catkey__visibility_nav" translatable="false">pref_catkey__visibility_navslider</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>
@ -59,7 +55,6 @@
    <string name="pref_key__podprofile_notification_count" translatable="false">podUserProfile_NotificationCount</string>

    <!-- More -->
-    <string name="pref_catkey__category_more" translatable="false">pref_catkey__category_more</string>
    <string name="pref_key__logging_spam_enabled" translatable="false">pref_key__logging_spam_enabled</string>
    <string name="pref_key__logging_enabled" translatable="false">pref_key__logging_enabled</string>
    <string name="pref_key__wipe_settings" translatable="false">pref_key__wipe_settings</string>
@ -74,7 +69,6 @@
    <!-- Navigiation Slider -->
    <string name="pref_title__sub_nav_slider">Navigation Slider</string>
    <string name="pref_desc__sub_nav_slider">Control visibility of entries in the navigation drawer</string>
-    <string name="pref_cat__visibility_nav_items">Item visibility</string>
    <string name="pref_cat__visibility_nav_items__user">User</string>
    <string name="pref_cat__visibility_nav_items__general">General</string>
    <string name="pref_cat__visibility_nav_items__admin">Admin</string>
@ -175,7 +169,6 @@
    <string name="pref_key__title__network" translatable="false">pref_key__title__network</string>
    <string name="pref_key__title__more" translatable="false">pref_key__title__more</string>
    <string name="pref_key__title__debugging" translatable="false">pref_key__title__debugging</string>
-    <string name="pref_key__title__visibility_nav" translatable="false">pref_key__title__visibility_nav</string>
    <string name="pref_key__title__proxy" translatable="false">pref_key__title__proxy</string>
    <string name="pref_key__title__themes" translatable="false">pref_key__title__themes</string>

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -9,11 +9,9 @@


    <!-- Application -->
-    <string name="prefix_https" translatable="false">https://</string>
    <string name="navigation_drawer_open">Open navigation drawer</string>
    <string name="navigation_drawer_close">Close navigation drawer</string>
    <string name="reload">Reload</string>
-    <string name="new_notifications">Unread notification. Want to read it?</string>

    <!-- Common Words -->
    <string name="settings">Settings</string>
@ -42,17 +40,10 @@


    <!-- Pod Activity -->
-    <string name="title_activity_pods">Select Pod</string>
-    <string name="filter_hint">Enter pod domain</string>
-    <string name="confirm_url">Confirm pod url</string>
-    <string name="search_for_pod">Search for Pod…</string>
-    <string name="podlist_source_note">Note: The podlist is populated by secure pods listed on https://podupti.me. You can enter in the edit field any pod not listed.</string>
-    <string name="valid_pod">Please enter a valid domain name</string>
    <string name="podlist_error">Error: Could not retrieve list of pods!</string>

    <string name="no_internet">Sorry, you must be connected to the Internet to proceed</string>
    <string name="confirmation">Confirmation</string>
-    <string name="confirm_pod">Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?</string>
    <string name="confirm_exit">Do you want to exit?</string>


@ -64,7 +55,6 @@
    <string name="nav_activities" translatable="false">@string/activities</string>
    <string name="nav_aspects" translatable="false">@string/aspects</string>
    <string name="nav_profile" translatable="false">@string/profile</string>
-    <string name="nav_settings" translatable="false">@string/settings</string>
    <string name="nav_menu_more">More</string>
    <string name="nav_help_license">About | Help</string>
    <string name="nav_followed_tags">Followed Tags</string>
@ -102,9 +92,7 @@


    <!-- More from MainActivity -->
-    <string name="toast_set_proxy_failed">Warning: Could not set network proxy…</string>
    <string name="unable_to_load_image">Unable to load image</string>
-    <string name="all_tags">All tags</string>

    <!-- Permissions -->
    <string name="permissions_screenshot">You must grant \"Access Storage Permission\" to save screenshots. After that you should