Code auto reformatting; Update TR, PodList

2024-11-22 04:12:08 +01:00 · 2016-10-14 01:26:56 +02:00 · 2016-10-14 01:26:56 +02:00 · 71d8b886f6
commit 71d8b886f6
parent 110598ea85
70 changed files with 450 additions and 364 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,7 +6,7 @@ android:
    - tools
    - tools # TODO https://github.com/travis-ci/travis-ci/issues/6193
    - platform-tools
-    - build-tools-24.0.2
+    - build-tools-24.0.3
    - android-24
    - extra-android-m2repository
 before_cache:
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -241,6 +241,10 @@
                <data android:host="wk3.org" android:scheme="https" />
                <data android:host="www.datataffel.dk" android:scheme="https" />
                <data android:host="www.diasporaix.de" android:scheme="https" />
+                <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" />
                <!--@@@ PODLIST END-->
            </intent-filter>

--- a/app/src/main/java/com/github/dfa/diaspora_android/App.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/App.java
@ -28,8 +28,6 @@ import android.webkit.CookieSyncManager;
 import android.webkit.WebView;

 import com.github.dfa.diaspora_android.data.AppSettings;
-import com.github.dfa.diaspora_android.data.DiasporaPodList;
-import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
 import com.github.dfa.diaspora_android.data.PodUserProfile;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AvatarImageLoader;
--- 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
@ -40,7 +40,6 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
@ -69,19 +68,18 @@ import com.github.dfa.diaspora_android.fragment.HashtagListFragment;
 import com.github.dfa.diaspora_android.fragment.PodSelectionFragment;
 import com.github.dfa.diaspora_android.listener.WebUserProfileChangedListener;
 import com.github.dfa.diaspora_android.receiver.OpenExternalLinkReceiver;
-import com.github.dfa.diaspora_android.util.ProxyHandler;
 import com.github.dfa.diaspora_android.receiver.UpdateTitleReceiver;
 import com.github.dfa.diaspora_android.ui.BadgeDrawable;
 import com.github.dfa.diaspora_android.ui.IntellihideToolbarActivityListener;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.CustomTabHelpers.CustomTabActivityHelper;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-import com.github.dfa.diaspora_android.util.theming.ThemeHelper;
+import com.github.dfa.diaspora_android.util.ProxyHandler;
 import com.github.dfa.diaspora_android.util.WebHelper;
+import com.github.dfa.diaspora_android.util.theming.ThemeHelper;

 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;

 public class MainActivity extends ThemedActivity
        implements NavigationView.OnNavigationItemSelectedListener,
@ -199,6 +197,7 @@ public class MainActivity extends ThemedActivity

        if (!appSettings.hasPod()) {
            AppLog.d(this, "We have no pod. Show PodSelectionFragment");
+            updateNavigationViewEntryVisibilities();
            showFragment(getFragment(PodSelectionFragment.TAG));
        } else {
            AppLog.d(this, "Pod found. Handle intents.");
@ -248,6 +247,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Show DiasporaStreamFragment if necessary and load URL url
+     *
     * @param url URL to load in the DiasporaStreamFragment
     */
    public void openDiasporaUrl(String url) {
@ -261,6 +261,7 @@ public class MainActivity extends ThemedActivity
     * Get an instance of the CustomFragment with the tag fragmentTag.
     * If there was no instance so far, create a new one and add it to the FragmentManagers pool.
     * If there is no Fragment with the corresponding Tag, return the top fragment.
+     *
     * @param fragmentTag tag
     * @return corresponding Fragment
     */
@ -296,6 +297,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Show the Fragment fragment in R.id.fragment_container. If the fragment was already visible, do nothing.
+     *
     * @param fragment Fragment to show
     */
    protected void showFragment(CustomFragment fragment) {
@ -380,13 +382,14 @@ public class MainActivity extends ThemedActivity
        navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());

        // Top bar
-        if (appSettings.getPod() == null) {
+        if (!appSettings.hasPod()) {
            navMenu.setGroupVisible(navMenu.findItem(R.id.nav_exit).getGroupId(), false);
        }
    }

    /**
     * Forward incoming intents to handleIntent()
+     *
     * @param intent incoming
     */
    @Override
@ -397,6 +400,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Handle intents and execute intent specific actions
+     *
     * @param intent intent to get handled
     */
    private void handleIntent(Intent intent) {
@ -457,6 +461,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Handle activity results
+     *
     * @param requestCode reqCode
     * @param resultCode  resCode
     * @param data        data
@ -469,6 +474,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Return the fragment which is currently displayed in R.id.fragment_container
+     *
     * @return top fragment or null if there is none displayed
     */
    private CustomFragment getTopFragment() {
@ -552,6 +558,7 @@ public class MainActivity extends ThemedActivity
    /**
     * Clear and repopulate top and bottom toolbar.
     * Also add menu items of the displayed fragment
+     *
     * @param menu top toolbar
     * @return boolean
     */
@ -582,6 +589,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Set the notification and messages counter in the top toolbar
+     *
     * @param menu menu
     * @return boolean
     */
@ -604,6 +612,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Handle clicks on the optionsmenu
+     *
     * @param item item
     * @return boolean
     */
@ -702,6 +711,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Update the profile name in the navigation slider
+     *
     * @param name name
     */
    @Override
@ -712,6 +722,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Update the profile picture in the navigation slider
+     *
     * @param avatarUrl url of the new profile pic
     */
    @Override
@ -722,6 +733,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Handle hashtag clicks. Open the new-post-url and inject the clicked hashtag into the post-editor
+     *
     * @param intent intent
     */
    private void handleHashtag(Intent intent) {
@ -736,6 +748,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Open the new-post-url and inject text that was shared into the app into the post editors text field
+     *
     * @param intent shareTextIntent
     */
    private void handleSendText(Intent intent) {
@ -794,6 +807,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Share an image shared to the app via diaspora
+     *
     * @param intent shareImageIntent
     */
    //TODO: Implement some day
@ -810,6 +824,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Invalidate the top toolbar to update the notification counter
+     *
     * @param notificationCount new notification count
     */
    @Override
@ -821,6 +836,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Invalidate the top toolbar to update the unread messages counter
+     *
     * @param unreadMessageCount new unread messages count
     */
    @Override
@ -953,6 +969,7 @@ public class MainActivity extends ThemedActivity

    /**
     * React to results of requestPermission
+     *
     * @param requestCode  resCode
     * @param permissions  requested permissions
     * @param grantResults granted results
@ -978,6 +995,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Return the string that will be shared into the new-post-editor
+     *
     * @return String
     */
    public String getTextToBeShared() {
@ -986,6 +1004,7 @@ public class MainActivity extends ThemedActivity

    /**
     * Set the string that will be shared into the new-post-editor
+     *
     * @param textToBeShared
     */
    public void setTextToBeShared(String textToBeShared) {
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/ThemedActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ThemedActivity.java
@ -48,6 +48,7 @@ public abstract class ThemedActivity extends AppCompatActivity {
        updateRecentAppColor();
        applyColorToViews();
    }
+
    protected abstract void applyColorToViews();

    /**
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/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.util.ProxyHandler;
 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.util.ProxyHandler;

 import org.json.JSONException;
 import org.json.JSONObject;
@ -264,6 +264,7 @@ public class AppSettings {
    public void setProxyHttpHost(String value) {
        setString(prefApp, R.string.pref_key__http_proxy_host, value);
    }
+
    /**
     * Default value: 0
     *
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java
@ -20,11 +20,9 @@ package com.github.dfa.diaspora_android.data;

 import android.os.Handler;

-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.Log;
-
 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.listener.WebUserProfileChangedListener;
+import com.github.dfa.diaspora_android.util.AppLog;

 import org.json.JSONArray;
 import org.json.JSONException;
@ -173,6 +171,7 @@ public class PodUserProfile {

    /**
     * Sets the avatar, returns true if this was a new one, false if already the old one
+     *
     * @param avatarUrl url
     * @return true if new avatar url
     */
--- a/app/src/main/java/com/github/dfa/diaspora_android/fragment/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/fragment/BrowserFragment.java
@ -41,10 +41,10 @@ import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.data.AppSettings;
-import com.github.dfa.diaspora_android.util.ProxyHandler;
 import com.github.dfa.diaspora_android.ui.ContextMenuWebView;
-import com.github.dfa.diaspora_android.util.theming.ThemeHelper;
 import com.github.dfa.diaspora_android.util.AppLog;
+import com.github.dfa.diaspora_android.util.ProxyHandler;
+import com.github.dfa.diaspora_android.util.theming.ThemeHelper;
 import com.github.dfa.diaspora_android.webview.CustomWebViewClient;
 import com.github.dfa.diaspora_android.webview.ProgressBarWebChromeClient;

--- a/app/src/main/java/com/github/dfa/diaspora_android/fragment/CustomFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/fragment/CustomFragment.java
@ -34,6 +34,7 @@ public abstract class CustomFragment extends Fragment {

    /**
     * We have an optionsMenu
+     *
     * @param savedInstanceState state
     */
    @Override
@ -44,12 +45,14 @@ public abstract class CustomFragment extends Fragment {

    /**
     * Return the tag used to identify the Fragment.
+     *
     * @return tag
     */
    public abstract String getFragmentTag();

    /**
     * Add fragment-dependent options to the bottom options toolbar
+     *
     * @param menu     bottom menu
     * @param inflater inflater
     */
@ -58,6 +61,7 @@ public abstract class CustomFragment extends Fragment {
    /**
     * Return true if the fragment reacted to a back button press, false else.
     * In case the fragment returned false, the parent activity should handle the backPress.
+     *
     * @return did we react to the back press?
     */
    public abstract boolean onBackPressed();
--- a/app/src/main/java/com/github/dfa/diaspora_android/fragment/DiasporaStreamFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/fragment/DiasporaStreamFragment.java
@ -44,12 +44,12 @@ import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.data.PodUserProfile;
-import com.github.dfa.diaspora_android.webview.DiasporaStreamWebChromeClient;
-import com.github.dfa.diaspora_android.webview.FileUploadWebChromeClient;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 import com.github.dfa.diaspora_android.util.Helpers;
 import com.github.dfa.diaspora_android.util.WebHelper;
+import com.github.dfa.diaspora_android.webview.DiasporaStreamWebChromeClient;
+import com.github.dfa.diaspora_android.webview.FileUploadWebChromeClient;

 import org.json.JSONException;

@ -228,6 +228,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
        public String getSharedText() {
            return ((MainActivity) getActivity()).getTextToBeShared();
        }
+
        @Override
        public void setSharedText(String shared) {
            ((MainActivity) getActivity()).setTextToBeShared(shared);
@ -261,7 +262,8 @@ public class DiasporaStreamFragment extends BrowserFragment {
                }
            }
            AppLog.v(this, "onOpenFileChooser");
-            if (imageUploadFilePathCallbackNew != null) imageUploadFilePathCallbackNew.onReceiveValue(null);
+            if (imageUploadFilePathCallbackNew != null)
+                imageUploadFilePathCallbackNew.onReceiveValue(null);
            imageUploadFilePathCallbackNew = filePathCallback;
            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
            if (takePictureIntent.resolveActivity(getContext().getPackageManager()) != null) {
--- a/app/src/main/java/com/github/dfa/diaspora_android/fragment/PodSelectionFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/fragment/PodSelectionFragment.java
@ -251,8 +251,8 @@ public class PodSelectionFragment extends CustomFragment implements SearchView.O

            MainActivity mainActivity = (MainActivity) getActivity();
            DiasporaUrlHelper urlHelper = new DiasporaUrlHelper(appSettings);
-            mainActivity.openDiasporaUrl(urlHelper.getSignInUrl());
            mainActivity.invalidateOptionsMenu();
+            mainActivity.openDiasporaUrl(urlHelper.getSignInUrl());
        }
    }

--- a/app/src/main/java/com/github/dfa/diaspora_android/task/GetPodsService.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/GetPodsService.java
@ -27,16 +27,12 @@ import android.support.v4.content.LocalBroadcastManager;
 import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.util.AppLog;

-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;

 import javax.net.ssl.HttpsURLConnection;

--- a/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java
@ -22,12 +22,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
 import android.support.annotation.Nullable;
-
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.Log;
 import android.widget.ImageView;

-import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.util.AppLog;

 import java.io.FileOutputStream;
 import java.io.IOException;
--- a/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java
@ -20,13 +20,11 @@ package com.github.dfa.diaspora_android.task;

 import android.content.Context;
 import android.os.AsyncTask;
-
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.Log;
 import android.webkit.CookieManager;

 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.data.PodUserProfile;
+import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;

 import java.io.BufferedReader;
--- a/app/src/main/java/com/github/dfa/diaspora_android/task/StatisticsFetchTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/StatisticsFetchTask.java
@ -20,12 +20,10 @@ package com.github.dfa.diaspora_android.task;

 import android.content.Context;
 import android.os.AsyncTask;
-
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.Log;
 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;
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/IntellihideToolbarActivityListener.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/IntellihideToolbarActivityListener.java
@ -9,6 +9,8 @@ import android.support.design.widget.AppBarLayout;

 public interface IntellihideToolbarActivityListener {
    int toolbarDefaultScrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP;
+
    void enableToolbarHiding();
+
    void disableToolbarHiding();
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java
@ -26,7 +26,6 @@ import android.support.customtabs.CustomTabsClient;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.customtabs.CustomTabsServiceConnection;
 import android.support.customtabs.CustomTabsSession;
-import android.util.Log;

 import java.util.List;

@ -68,6 +67,7 @@ public class CustomTabActivityHelper {

    /**
     * Unbinds the Activity from the Custom Tabs Service
+     *
     * @param activity the activity that is connected to the service
     */
    public void unbindCustomTabsService(Activity activity) {
@ -93,6 +93,7 @@ public class CustomTabActivityHelper {

    /**
     * Register a Callback to be called when connected or disconnected from the Custom Tabs Service
+     *
     * @param connectionCallback
     */
    public void setConnectionCallback(ConnectionCallback connectionCallback) {
@ -101,6 +102,7 @@ public class CustomTabActivityHelper {

    /**
     * Binds the Activity to the Custom Tabs Service
+     *
     * @param activity the activity to be binded to the service
     */
    public void bindCustomTabsService(Activity activity) {
@ -161,7 +163,6 @@ public class CustomTabActivityHelper {
     */
    public interface CustomTabFallback {
        /**
-         *
         * @param activity The Activity that wants to open the Uri
         * @param uri      The uri to be opened by the fallback
         */
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabsHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabsHelper.java
@ -26,7 +26,6 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.support.customtabs.CustomTabsService;
 import android.text.TextUtils;
-import android.util.Log;

 import com.github.dfa.diaspora_android.util.AppLog;

@ -47,13 +46,14 @@ public class CustomTabsHelper {

    private static String sPackageNameToUse;

-    private CustomTabsHelper() {}
+    private CustomTabsHelper() {
+    }

    /**
     * Goes through all apps that handle VIEW intents and have a warmup service. Picks
     * the one chosen by the user if there is one, otherwise makes a best effort to return a
     * valid package name.
-     *
+     * <p>
     * This is <strong>not</strong> threadsafe.
     *
     * @param context {@link Context} to use for accessing {@link PackageManager}.
@ -107,6 +107,7 @@ public class CustomTabsHelper {

    /**
     * Used to check whether there is a specialized handler for a given intent.
+     *
     * @param intent The intent to check with.
     * @return Whether there is a specialized handler for the given intent.
     */
--- 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
@ -21,7 +21,6 @@ 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.AppSettings;
-import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
 import com.github.dfa.diaspora_android.data.PodAspect;

@ -215,6 +214,7 @@ public class DiasporaUrlHelper {

    /**
     * Return a url that points to the statistics page of the pod.
+     *
     * @return https://(pod-domain.tld)/statistics
     */
    public String getStatisticsUrl() {
@ -223,6 +223,7 @@ public class DiasporaUrlHelper {

    /**
     * Return a url that points to the sign in page of the pod.
+     *
     * @return https://(pod-domain.tld)/users/sign_in
     */
    public String getSignInUrl() {
@ -231,6 +232,7 @@ public class DiasporaUrlHelper {

    /**
     * Return a url that points to the personal settings page of the pod.
+     *
     * @return https://(pod-domain.tld)/user/edit
     */
    public String getPersonalSettingsUrl() {
@ -239,6 +241,7 @@ public class DiasporaUrlHelper {

    /**
     * Return a url that points to the manage tags page of the pod.
+     *
     * @return https://(pod-domain.tld)/tag_followings/manage
     */
    public String getManageTagsUrl() {
@ -247,6 +250,7 @@ public class DiasporaUrlHelper {

    /**
     * Return a url that points to the manage tags page of the pod.
+     *
     * @return https://(pod-domain.tld)/contacts
     */
    public String getManageContactsUrl() {
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/Log.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Log.java
@ -43,6 +43,7 @@ public class Log extends Observable {
    private Log() {
        this(null);
    }
+
    private Log(AppSettings appSettings) {
        if (appSettings != null) {
            //TODO: Store/Restore logBuffer between app starts
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/WebHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/WebHelper.java
@ -29,7 +29,6 @@ import android.webkit.WebView;
 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.data.AppSettings;
-import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.data.PodAspect;
 import com.github.dfa.diaspora_android.data.PodUserProfile;

--- a/app/src/main/java/com/github/dfa/diaspora_android/util/theming/ThemeHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/theming/ThemeHelper.java
@ -54,7 +54,8 @@ public class ThemeHelper {
    }

    public static ThemeHelper getInstance() {
-        if(instance == null) throw new IllegalStateException("ThemeHelper must be initialized using getInstance(AppSettings) before it can be used!");
+        if (instance == null)
+            throw new IllegalStateException("ThemeHelper must be initialized using getInstance(AppSettings) before it can be used!");
        return instance;
    }

--- a/app/src/main/java/com/github/dfa/diaspora_android/webview/DiasporaStreamWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/webview/DiasporaStreamWebChromeClient.java
@ -57,6 +57,7 @@ public class DiasporaStreamWebChromeClient extends FileUploadWebChromeClient {

    public interface SharedTextCallback {
        String getSharedText();
+
        void setSharedText(String shared);
    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/webview/FileUploadWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/webview/FileUploadWebChromeClient.java
@ -42,8 +42,7 @@ public class FileUploadWebChromeClient extends ProgressBarWebChromeClient {

    //For Android 4.1/4.2 only. DO NOT REMOVE!
    @SuppressWarnings("unused")
-    protected void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture)
-    {
+    protected void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
        fileUploadCallback.legacyImageUpload(uploadMsg, acceptType, capture);
    }

@ -54,6 +53,7 @@ public class FileUploadWebChromeClient extends ProgressBarWebChromeClient {

    public interface FileUploadCallback {
        boolean imageUpload(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams);
+
        void legacyImageUpload(ValueCallback<Uri> uploadMsg, String acceptType, String capture);
    }
 }
--- a/app/src/main/res/layout/about__activity.xml
+++ b/app/src/main/res/layout/about__activity.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/main_content"
@ -16,24 +15,23 @@
        android:theme="@style/AppTheme.AppBarOverlay">

        <LinearLayout
+            android:id="@+id/appbar_linear_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:id="@+id/appbar_linear_layout"
-            android:orientation="vertical"
            android:background="?attr/colorPrimary"
+            android:orientation="vertical"
            app:layout_scrollFlags="scroll|enterAlways|snap"
            app:popupTheme="@style/AppTheme.PopupOverlay">

            <android.support.v7.widget.Toolbar
+                android:id="@+id/main__topbar"
                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/main__topbar"/>
+                android:layout_height="wrap_content" />

            <android.support.design.widget.TabLayout
                android:id="@+id/tabs"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                />
+                android:layout_height="wrap_content" />

        </LinearLayout>
    </android.support.design.widget.AppBarLayout>
--- a/app/src/main/res/layout/about__fragment_about.xml
+++ b/app/src/main/res/layout/about__fragment_about.xml
@ -19,16 +19,16 @@

        <TextView
            android:id="@+id/fragment_about__app_name"
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textAlignment="center"
            android:text="@string/diaspora_for_android"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:textAlignment="center" />

        <TextView
+            android:id="@+id/fragment_about__app_version"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_about__app_version"/>
+            android:layout_height="wrap_content" />

        <android.support.v4.widget.Space
            android:layout_width="match_parent"
@ -36,10 +36,10 @@

        <com.github.dfa.diaspora_android.ui.HtmlTextView
            android:id="@+id/fragment_about__about_text"
+            style="@android:style/TextAppearance.DeviceDefault.Small"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_about__about_content"
-            style="@android:style/TextAppearance.DeviceDefault.Small"
-            android:linksClickable="true" />
+            android:linksClickable="true"
+            android:text="@string/fragment_about__about_content" />
    </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
--- a/app/src/main/res/layout/about__fragment_debug.xml
+++ b/app/src/main/res/layout/about__fragment_debug.xml
@ -20,74 +20,77 @@
        <!-- APP SECTION -->
        <TextView
            android:id="@+id/fragment_debug__section_app"
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_debug__section_app"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_debug__section_app" />

        <TextView
+            android:id="@+id/fragment_debug__package_name"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_debug__package_name"/>
+            android:layout_height="wrap_content" />

        <TextView
+            android:id="@+id/fragment_debug__app_version"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_debug__app_version"/>
+            android:layout_height="wrap_content" />

        <!-- DEVICE SECTION -->
        <TextView
            android:id="@+id/fragment_debug__section_device"
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_debug__section_device"
            android:paddingTop="@dimen/activity_vertical_margin"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_debug__section_device" />

        <TextView
+            android:id="@+id/fragment_debug__android_version"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_debug__android_version"/>
+            android:layout_height="wrap_content" />

        <TextView
+            android:id="@+id/fragment_debug__device_name"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_debug__device_name"/>
+            android:layout_height="wrap_content" />

        <!-- POD SECTION -->
        <TextView
            android:id="@+id/fragment_debug__section_pod"
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_debug__section_pod"
            android:paddingTop="@dimen/activity_vertical_margin"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_debug__section_pod" />

        <TextView
+            android:id="@+id/fragment_debug__pod_domain"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragment_debug__pod_domain"/>
+            android:layout_height="wrap_content" />

        <!-- LOG SECTION -->
        <TextView
            android:id="@+id/fragment_debug__section_log"
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_debug__section_log"
            android:paddingTop="@dimen/activity_vertical_margin"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_debug__section_log" />
+
        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="wrap_content">
+
            <HorizontalScrollView
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
+
                <TextView
+                    android:id="@+id/fragment_debug__log_box"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:clickable="true"
-                    android:longClickable="true"
-                    android:id="@+id/fragment_debug__log_box" />
+                    android:longClickable="true" />
            </HorizontalScrollView>
        </ScrollView>
    </LinearLayout>
--- a/app/src/main/res/layout/about__fragment_license.xml
+++ b/app/src/main/res/layout/about__fragment_license.xml
@ -16,32 +16,33 @@
        <android.support.v4.widget.Space
            android:layout_width="match_parent"
            android:layout_height="@dimen/activity_vertical_margin" />
+
        <TextView
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_license__copyright_years"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_license__copyright_years" />

        <com.github.dfa.diaspora_android.ui.HtmlTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
            android:id="@+id/fragment_license__licensetext"
-            android:text="@string/fragment_license__license_content"
            style="@android:style/TextAppearance.DeviceDefault.Small"
-            android:linksClickable="true" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:linksClickable="true"
+            android:text="@string/fragment_license__license_content" />

        <TextView
+            style="@android:style/TextAppearance.DeviceDefault.Large"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/fragment_license__3rd_party_libs_title"
            android:paddingTop="@dimen/activity_vertical_margin"
-            style="@android:style/TextAppearance.DeviceDefault.Large"/>
+            android:text="@string/fragment_license__3rd_party_libs_title" />

        <com.github.dfa.diaspora_android.ui.HtmlTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
            android:id="@+id/fragment_license__3rdparty"
            style="@android:style/TextAppearance.DeviceDefault.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
            android:linksClickable="true" />
    </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
--- a/app/src/main/res/layout/browser__fragment.xml
+++ b/app/src/main/res/layout/browser__fragment.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

--- a/app/src/main/res/layout/color_picker__dialog.xml
+++ b/app/src/main/res/layout/color_picker__dialog.xml
@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
    <FrameLayout
        android:id="@+id/color_picker_dialog__title_background"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">
+
        <TextView
            android:id="@+id/color_picker_dialog__title"
-            android:layout_margin="20dp"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large.Inverse"
-            />
+            android:layout_margin="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large.Inverse" />
    </FrameLayout>
+
    <uz.shift.colorpicker.LineColorPicker
        android:id="@+id/color_picker_dialog__base_picker"
        android:layout_width="match_parent"
        android:layout_height="60dp"
-        android:layout_marginTop="20dp"
        android:layout_margin="10dp"
+        android:layout_marginTop="20dp"
        app:orientation="horizontal" />
+
    <uz.shift.colorpicker.LineColorPicker
        android:id="@+id/color_picker_dialog__shade_picker"
        android:layout_width="match_parent"
        android:layout_height="40dp"
-        android:layout_marginTop="30dp"
        android:layout_margin="10dp"
        android:layout_marginBottom="10dp"
+        android:layout_marginTop="30dp"
        app:orientation="horizontal" />

 </LinearLayout>
--- a/app/src/main/res/layout/hashtag_list__fragment.xml
+++ b/app/src/main/res/layout/hashtag_list__fragment.xml
@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
+
    <android.support.v4.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent">
+
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="vertical">
+
            <android.support.v7.widget.RecyclerView
                android:id="@+id/fragment_followed_tags__recycler_view"
-                android:scrollbars="vertical"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
+                android:scrollbars="vertical"
                app:layout_behavior="@string/appbar_scrolling_view_behavior" />

            <!-- Offset -->
--- a/app/src/main/res/layout/main__activity.xml
+++ b/app/src/main/res/layout/main__activity.xml
@ -19,10 +19,10 @@
        android:layout_height="match_parent"
        android:layout_gravity="start"
        android:fitsSystemWindows="true"
-        app:itemTextColor="@color/primary_text"
-        app:paddingEnd="0dp"
-        app:paddingStart="0dp"
        app:headerLayout="@layout/main__nav_header"
-        app:menu="@menu/main__navdrawer" />
+        app:itemTextColor="@color/primary_text"
+        app:menu="@menu/main__navdrawer"
+        app:paddingEnd="0dp"
+        app:paddingStart="0dp" />

 </android.support.v4.widget.DrawerLayout>
--- a/app/src/main/res/layout/main__app_bar.xml
+++ b/app/src/main/res/layout/main__app_bar.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
--- a/app/src/main/res/layout/main__nav_header.xml
+++ b/app/src/main/res/layout/main__nav_header.xml
@ -3,9 +3,9 @@
    android:id="@+id/nav_drawer"
    android:layout_width="wrap_content"
    android:layout_height="110dp"
+    android:background="@color/colorPrimary"
    android:gravity="bottom"
    android:orientation="vertical"
-    android:background="@color/colorPrimary"
    android:theme="@style/ThemeOverlay.AppCompat.Dark">

    <!--
--- a/app/src/main/res/layout/podselection__dialog.xml
+++ b/app/src/main/res/layout/podselection__dialog.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
--- a/app/src/main/res/layout/recycler_view__list_item.xml
+++ b/app/src/main/res/layout/recycler_view__list_item.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recycler_view__list_item__root"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:id="@+id/recycler_view__list_item__root"
    android:orientation="vertical">

    <View
--- a/app/src/main/res/layout/settings__activity.xml
+++ b/app/src/main/res/layout/settings__activity.xml
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
    android:layout_width="match_parent"
+    android:layout_height="match_parent"
    android:orientation="vertical">
+
    <android.support.design.widget.AppBarLayout
        android:id="@+id/settings__appbar"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/ui__dialog_search__people_tags.xml
+++ b/app/src/main/res/layout/ui__dialog_search__people_tags.xml
@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:layout_gravity="center_horizontal"
-    android:paddingStart="@dimen/activity_horizontal_margin_half" android:paddingEnd="@dimen/activity_horizontal_margin_half">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingEnd="@dimen/activity_horizontal_margin_half"
+    android:paddingStart="@dimen/activity_horizontal_margin_half">

    <EditText
        android:id="@+id/dialog_search__input"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:singleLine="true"
        android:hint="@string/app_hashtag"
-        />
+        android:maxLines="1" />
 </LinearLayout>
--- a/app/src/main/res/raw/podlist.json
+++ b/app/src/main/res/raw/podlist.json
@ -1,7 +1,7 @@
 {
  "pods": [
    {
-      "active6": 10775,
+      "active6": 11683,
      "score": 20,
      "podUrls": [
        {"host": "joindiaspora.com"},
@ -16,7 +16,7 @@
      "id": 38077
    },
    {
-      "active6": 7260,
+      "active6": 7194,
      "score": 20,
      "podUrls": [{"host": "pod.geraspora.de"}],
      "name": "Geraspora",
@ -24,15 +24,15 @@
      "id": 24783
    },
    {
-      "active6": 0,
-      "score": 0,
+      "active6": 3712,
+      "score": 20,
      "podUrls": [{"host": "diasp.org"}],
      "name": "diasporg*",
      "mainLangs": [],
      "id": 12688
    },
    {
-      "active6": 9039,
+      "active6": 9849,
      "score": 20,
      "podUrls": [{"host": "framasphere.org"}],
      "name": "Framasphere",
@ -40,7 +40,7 @@
      "id": 38776
    },
    {
-      "active6": 540,
+      "active6": 519,
      "score": 20,
      "podUrls": [{"host": "nerdpol.ch"}],
      "name": "nerdpol.ch*",
@ -48,7 +48,7 @@
      "id": 17343
    },
    {
-      "active6": 859,
+      "active6": 858,
      "score": 20,
      "podUrls": [{"host": "despora.de"}],
      "name": "Despora*",
@ -56,7 +56,7 @@
      "id": 6695
    },
    {
-      "active6": 626,
+      "active6": 611,
      "score": 20,
      "podUrls": [
        {"host": "sechat.org"},
@ -87,7 +87,7 @@
      "id": 25432
    },
    {
-      "active6": 179,
+      "active6": 175,
      "score": 20,
      "podUrls": [{"host": "berlinspora.de"}],
      "name": "berlinspora.de",
@ -159,7 +159,7 @@
      "id": 13926
    },
    {
-      "active6": 146,
+      "active6": 143,
      "score": 20,
      "podUrls": [{"host": "diasp.ca"}],
      "name": "diasp.ca",
@ -199,7 +199,7 @@
      "id": 4343
    },
    {
-      "active6": 199,
+      "active6": 214,
      "score": 20,
      "podUrls": [{"host": "diasp.nl"}],
      "name": "diasp.nl",
@ -207,7 +207,7 @@
      "id": 33262
    },
    {
-      "active6": 234,
+      "active6": 217,
      "score": 20,
      "podUrls": [{"host": "diaspod.de"}],
      "name": "diaspod.de",
@ -231,7 +231,7 @@
      "id": 13402
    },
    {
-      "active6": 30,
+      "active6": 34,
      "score": 20,
      "podUrls": [{"host": "diaspora.bohramt.de"}],
      "name": "bohramt.de",
@ -247,7 +247,7 @@
      "id": 22994
    },
    {
-      "active6": 27,
+      "active6": 26,
      "score": 20,
      "podUrls": [{"host": "diaspora.deadhexagon.com"}],
      "name": "deadhexagon.com",
@ -256,7 +256,7 @@
    },
    {
      "active6": 0,
-      "score": 12,
+      "score": 20,
      "podUrls": [{"host": "diaspora.digi-merc.org"}],
      "name": "digi-merc.org",
      "mainLangs": [],
@ -303,7 +303,7 @@
      "id": 12684
    },
    {
-      "active6": 102,
+      "active6": 100,
      "score": 20,
      "podUrls": [{"host": "diaspora.hzsogood.net"}],
      "name": "hzsogood.net",
@ -311,7 +311,7 @@
      "id": 3651
    },
    {
-      "active6": 78,
+      "active6": 69,
      "score": 20,
      "podUrls": [{"host": "diaspora.kapper.net"}],
      "name": "kapper.net",
@ -319,7 +319,7 @@
      "id": 40765
    },
    {
-      "active6": 155,
+      "active6": 146,
      "score": 20,
      "podUrls": [{"host": "diaspora.koehn.com"}],
      "name": "koehn.com",
@ -375,7 +375,7 @@
      "id": 9863
    },
    {
-      "active6": 278,
+      "active6": 272,
      "score": 20,
      "podUrls": [{"host": "diaspora.permutationsofchaos.com"}],
      "name": "permutationsofchaos.com",
@ -383,7 +383,7 @@
      "id": 1513
    },
    {
-      "active6": 61,
+      "active6": 50,
      "score": 20,
      "podUrls": [{"host": "diaspora.pimpmypony.eu"}],
      "name": "pimpmypony.eu",
@ -407,7 +407,7 @@
      "id": 12139
    },
    {
-      "active6": 59,
+      "active6": 57,
      "score": 20,
      "podUrls": [{"host": "diaspora.poleni.com"}],
      "name": "poleni.com",
@ -415,7 +415,7 @@
      "id": 1154
    },
    {
-      "active6": 179,
+      "active6": 181,
      "score": 20,
      "podUrls": [{"host": "diaspora.psyco.fr"}],
      "name": "psyco.fr",
@ -423,8 +423,8 @@
      "id": 31397
    },
    {
-      "active6": 0,
-      "score": 0,
+      "active6": 307,
+      "score": 20,
      "podUrls": [{"host": "diaspora.punkbeer.me"}],
      "name": "punkbeer.me",
      "mainLangs": [],
@ -471,7 +471,7 @@
      "id": 24365
    },
    {
-      "active6": 0,
+      "active6": 74,
      "score": 20,
      "podUrls": [{"host": "diaspora.soh.re"}],
      "name": "soh.re",
@ -479,7 +479,7 @@
      "id": 39183
    },
    {
-      "active6": 38,
+      "active6": 37,
      "score": 20,
      "podUrls": [{"host": "diaspora.subsignal.org"}],
      "name": "subsignal.org",
@ -495,7 +495,7 @@
      "id": 46672
    },
    {
-      "active6": 23,
+      "active6": 30,
      "score": 20,
      "podUrls": [{"host": "diaspora.u4u.org"}],
      "name": "u4u.org",
@ -543,7 +543,7 @@
      "id": 18248
    },
    {
-      "active6": 394,
+      "active6": 374,
      "score": 20,
      "podUrls": [{"host": "diasporabrazil.org"}],
      "name": "diasporabrazil.org",
@ -575,7 +575,7 @@
      "id": 46740
    },
    {
-      "active6": 9,
+      "active6": 20,
      "score": 20,
      "podUrls": [{"host": "diasporing.ch"}],
      "name": "Diasporing.ch",
@ -623,7 +623,7 @@
      "id": 11247
    },
    {
-      "active6": 220,
+      "active6": 235,
      "score": 20,
      "podUrls": [{"host": "espora.social"}],
      "name": "espora.social",
@ -639,7 +639,7 @@
      "id": 41690
    },
    {
-      "active6": 174,
+      "active6": 171,
      "score": 20,
      "podUrls": [{"host": "flokk.no"}],
      "name": "flokk.no",
@ -647,7 +647,7 @@
      "id": 45658
    },
    {
-      "active6": 193,
+      "active6": 177,
      "score": 20,
      "podUrls": [{"host": "freehuman.fr"}],
      "name": "freehuman.fr",
@ -671,7 +671,7 @@
      "id": 13758
    },
    {
-      "active6": 71,
+      "active6": 74,
      "score": 20,
      "podUrls": [{"host": "idoru.pl"}],
      "name": "idoru.pl",
@ -679,7 +679,7 @@
      "id": 40630
    },
    {
-      "active6": 65,
+      "active6": 67,
      "score": 20,
      "podUrls": [{"host": "iliketoast.net"}],
      "name": "iliketoast.net",
@ -703,7 +703,7 @@
      "id": 32786
    },
    {
-      "active6": 70,
+      "active6": 68,
      "score": 20,
      "podUrls": [{"host": "karmasphe.re"}],
      "name": "karmasphe.re",
@ -719,7 +719,7 @@
      "id": 46869
    },
    {
-      "active6": 25,
+      "active6": 26,
      "score": 20,
      "podUrls": [{"host": "laba.mba"}],
      "name": "laba.mba",
@ -727,7 +727,7 @@
      "id": 32393
    },
    {
-      "active6": 147,
+      "active6": 145,
      "score": 20,
      "podUrls": [{"host": "liberdade.digital"}],
      "name": "liberdade.digital",
@ -743,7 +743,7 @@
      "id": 33200
    },
    {
-      "active6": 39,
+      "active6": 42,
      "score": 20,
      "podUrls": [{"host": "librenet.co.za"}],
      "name": "librenet.co.za",
@ -751,7 +751,7 @@
      "id": 14862
    },
    {
-      "active6": 177,
+      "active6": 175,
      "score": 20,
      "podUrls": [{"host": "librenet.gr"}],
      "name": "librenet.gr",
@ -775,7 +775,7 @@
      "id": 16366
    },
    {
-      "active6": 663,
+      "active6": 643,
      "score": 20,
      "podUrls": [{"host": "mondiaspora.net"}],
      "name": "mondiaspora.net",
@ -807,7 +807,7 @@
      "id": 31558
    },
    {
-      "active6": 37,
+      "active6": 39,
      "score": 20,
      "podUrls": [{"host": "pe.spbstu.ru"}],
      "name": "pe.spbstu.ru",
@ -815,8 +815,8 @@
      "id": 39808
    },
    {
-      "active6": 0,
-      "score": 0,
+      "active6": 111,
+      "score": 20,
      "podUrls": [{"host": "pod.4ray.co"}],
      "name": "4ray.co",
      "mainLangs": [],
@ -872,7 +872,7 @@
    },
    {
      "active6": 13,
-      "score": 14,
+      "score": 20,
      "podUrls": [{"host": "pod.dapor.net"}],
      "name": "dapor.net",
      "mainLangs": [],
@ -904,7 +904,7 @@
    },
    {
      "active6": 0,
-      "score": 0,
+      "score": 20,
      "podUrls": [{"host": "pod.disroot.org"}],
      "name": "disroot.org",
      "mainLangs": [],
@ -959,7 +959,7 @@
      "id": 36615
    },
    {
-      "active6": 58,
+      "active6": 56,
      "score": 20,
      "podUrls": [{"host": "pod.hashtagueule.fr"}],
      "name": "hashtagueule.fr",
@ -1031,7 +1031,7 @@
      "id": 9248
    },
    {
-      "active6": 109,
+      "active6": 104,
      "score": 20,
      "podUrls": [{"host": "pod.nomorestars.com"}],
      "name": "nomorestars.com",
@ -1039,7 +1039,7 @@
      "id": 31958
    },
    {
-      "active6": 398,
+      "active6": 401,
      "score": 20,
      "podUrls": [{"host": "pod.orkz.net"}],
      "name": "orkz.net",
@ -1047,7 +1047,7 @@
      "id": 41604
    },
    {
-      "active6": 32,
+      "active6": 35,
      "score": 20,
      "podUrls": [{"host": "pod.ponk.pink"}],
      "name": "ponk.pink",
@ -1063,7 +1063,7 @@
      "id": 21338
    },
    {
-      "active6": 94,
+      "active6": 90,
      "score": 20,
      "podUrls": [{"host": "pod.psynet.su"}],
      "name": "psynet.su",
@ -1127,7 +1127,7 @@
      "id": 47610
    },
    {
-      "active6": 5,
+      "active6": 6,
      "score": 20,
      "podUrls": [{"host": "pod.storel.li"}],
      "name": "storel.li",
@ -1143,7 +1143,7 @@
      "id": 20115
    },
    {
-      "active6": 51,
+      "active6": 52,
      "score": 20,
      "podUrls": [{"host": "pod.thomasdalichow.de"}],
      "name": "thomasdalichow.de",
@ -1160,14 +1160,14 @@
    },
    {
      "active6": 1,
-      "score": 11,
+      "score": 20,
      "podUrls": [{"host": "pod.volt.io"}],
      "name": "volt.io",
      "mainLangs": [],
      "id": 19139
    },
    {
-      "active6": 48,
+      "active6": 50,
      "score": 20,
      "podUrls": [{"host": "podbay.net"}],
      "name": "podbay.net",
@ -1191,7 +1191,7 @@
      "id": 6398
    },
    {
-      "active6": 88,
+      "active6": 91,
      "score": 20,
      "podUrls": [{"host": "pubpod.alqualonde.org"}],
      "name": "pubpod.alqualonde.org",
@ -1215,7 +1215,7 @@
      "id": 41788
    },
    {
-      "active6": 108,
+      "active6": 104,
      "score": 20,
      "podUrls": [{"host": "ruhrspora.de"}],
      "name": "ruhrspora.de",
@ -1239,15 +1239,15 @@
      "id": 39003
    },
    {
-      "active6": 1,
-      "score": -18,
+      "active6": 3,
+      "score": 20,
      "podUrls": [{"host": "social.acclaro.digital"}],
      "name": "acclaro.digital",
      "mainLangs": [],
      "id": 33853
    },
    {
-      "active6": 23,
+      "active6": 22,
      "score": 20,
      "podUrls": [{"host": "social.baldr.io"}],
      "name": "baldr.io",
@ -1263,7 +1263,7 @@
      "id": 37517
    },
    {
-      "active6": 85,
+      "active6": 87,
      "score": 20,
      "podUrls": [{"host": "social.elaon.de"}],
      "name": "elaon.de",
@ -1279,7 +1279,7 @@
      "id": 48421
    },
    {
-      "active6": 21,
+      "active6": 19,
      "score": 20,
      "podUrls": [{"host": "social.mbuto.me"}],
      "name": "mbuto.me",
@ -1295,7 +1295,7 @@
      "id": 8983
    },
    {
-      "active6": 176,
+      "active6": 178,
      "score": 20,
      "podUrls": [{"host": "socializer.cc"}],
      "name": "socializer.cc",
@ -1319,7 +1319,7 @@
      "id": 29359
    },
    {
-      "active6": 49,
+      "active6": 45,
      "score": 20,
      "podUrls": [{"host": "sysad.org"}],
      "name": "sysad.org",
@ -1335,7 +1335,7 @@
      "id": 5276
    },
    {
-      "active6": 4222,
+      "active6": 4150,
      "score": 20,
      "podUrls": [{"host": "therealtalk.org"}],
      "name": "therealtalk.org",
@ -1343,7 +1343,7 @@
      "id": 26786
    },
    {
-      "active6": 47,
+      "active6": 43,
      "score": 20,
      "podUrls": [{"host": "thinkopen.net"}],
      "name": "thinkopen.net",
@ -1351,7 +1351,7 @@
      "id": 7366
    },
    {
-      "active6": 92,
+      "active6": 93,
      "score": 20,
      "podUrls": [{"host": "tippentappen.de"}],
      "name": "tippentappen.de",
@ -1375,7 +1375,7 @@
      "id": 5842
    },
    {
-      "active6": 312,
+      "active6": 314,
      "score": 20,
      "podUrls": [{"host": "wk3.org"}],
      "name": "wk3.org",
@ -1383,7 +1383,7 @@
      "id": 39292
    },
    {
-      "active6": 45,
+      "active6": 46,
      "score": 20,
      "podUrls": [{"host": "www.datataffel.dk"}],
      "name": "datataffel.dk",
@ -1397,7 +1397,39 @@
      "name": "diasporaix.de",
      "mainLangs": ["de"],
      "id": 26219
+    },
+    {
+      "active6": 0,
+      "score": 20,
+      "podUrls": [{"host": "diaspora.hofud.com"}],
+      "name": "hofud.com",
+      "mainLangs": [],
+      "id": 10983
+    },
+    {
+      "active6": 0,
+      "score": 20,
+      "podUrls": [{"host": "diaspora.softwarelivre.org"}],
+      "name": "softwarelivre.org",
+      "mainLangs": [],
+      "id": 33510
+    },
+    {
+      "active6": 0,
+      "score": 13,
+      "podUrls": [{"host": "confetticake.club"}],
+      "name": "confetticake.club",
+      "mainLangs": [],
+      "id": 41623
+    },
+    {
+      "active6": 0,
+      "score": -15,
+      "podUrls": [{"host": "diaspora.mike-jones.me.uk"}],
+      "name": "mike-jones.me.uk",
+      "mainLangs": [],
+      "id": 8574
    }
  ],
-  "timestamp": 1475804650123
+  "timestamp": 1476399808521
 }
--- a/app/src/main/res/values-cs/strings-preferences.xml
+++ b/app/src/main/res/values-cs/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -15,12 +16,6 @@
  <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>
  <!-- Themes -->
-  <string name="pref_title__themes">Farbschema</string>
-  <string name="pref_desc__themes">Einstellungen des Farbdesigns</string>
-  <string name="pref_title__primary_color">Primärfarbe</string>
-  <string name="pref_desc__primary_color">Färbung der Werkzeugleisten</string>
-  <string name="pref_title__accent_color">Akzentfarbe</string>
-  <string name="pref_desc__accent_color">Färbung der Details</string>
  <!-- Font size -->
  <string name="pref_title__font_size">Schriftgröße</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -30,9 +25,6 @@
  <!-- Proxy -->
  <string name="pref_title__sub_proxy">Proxy</string>
  <string name="pref_title__proxy_enabled">Aktiviere Netzwerkproxy</string>
-  <string name="pref_desc__http_proxy_enabled">Nutze einen Proxyserver, um Firewalls zu umgehen</string>
-  <string name="pref_title__http_proxy_host">Host</string>
-  <string name="pref_title__http_proxy_port">Port</string>
  <!-- Chrome custom tabs -->
  <string name="pref_title__chrome_custom_tabs_enabled">Chrome Custom Tabs</string>
  <string name="pref_desc__chrome_custom_tabs_enabled">Externe Links mit Chrome Custom Tabs öffnen. Chromium oder Google Chrome muss für dieses Feature installiert sein.\nWICHTIGER HINWEIS: Chrome Custom Tabs verwenden die konfigurierten Proxy-Server nicht!</string>
--- a/app/src/main/res/values-el/strings-preferences.xml
+++ b/app/src/main/res/values-el/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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>
+  <!-- Themes -->
  <!-- Font size -->
  <string name="pref_title__font_size">Tamaño de letra</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -22,9 +24,6 @@
  <string name="pref_desc__load_images">Desactivar la carga de de imágenes a datos móviles seguros</string>
  <!-- Proxy -->
  <string name="pref_title__proxy_enabled">Activar Proxy</string>
-  <string name="pref_desc__http_proxy_enabled">El tráfico proxificado de Diaspora para evitar firewalls.\nPuede necesitar reiniciarse</string>
-  <string name="pref_title__http_proxy_host">Anfitrión</string>
-  <string name="pref_title__http_proxy_port">Puerto</string>
  <!-- Chrome custom tabs -->
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Configuración personal</string>
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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>
+  <!-- Themes -->
  <!-- Font size -->
  <string name="pref_title__font_size">Taille de la police</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -21,13 +23,16 @@
  <string name="pref_title__load_images">Charger les images</string>
  <string name="pref_desc__load_images">Désactiver le chargements des images pour préserver la data mobile</string>
  <!-- Proxy -->
+  <string name="pref_title__http_proxy_load_tor_preset">Charger la pré-configuration Tor</string>
+  <string name="pref_desc__http_proxy_load_tor_preset">Charger les paramètres proxy pour Tor (Orbot) HTTP Proxy</string>
  <string name="pref_title__sub_proxy">Proxy</string>
  <string name="pref_title__proxy_enabled">Activer Proxy</string>
-  <string name="pref_desc__http_proxy_enabled">Serveur Proxy.\n(Nécessite un redémarrage)</string>
+  <string name="pref_desc__http_proxy_enabled">Proxy pour diaspora pour contourner les pare-feux.\nPeut nécessiter un redémarrage</string>
  <string name="pref_title__http_proxy_host">Hôte</string>
  <string name="pref_title__http_proxy_port">Port</string>
  <!-- Chrome custom tabs -->
  <string name="pref_title__chrome_custom_tabs_enabled">Onglets personnalisés de Chrome</string>
+  <string name="pref_desc__chrome_custom_tabs_enabled">Ouvrir les liens externes avec les onglets personnalisés de Chrome. Chomium ou Google Chrome doit être installé pour cette fonctionnalité. \nNOTE IMPORTANTE : les onglets personnalisés de Chrome n\'utilisent pas les serveurs proxy configurés !</string>
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Paramètres personnels</string>
  <string name="pref_desc__personal_settings">Ouvrir vos paramètres de compte diaspora</string>
--- a/app/src/main/res/values-hi/strings-preferences.xml
+++ b/app/src/main/res/values-hi/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-hu/strings-preferences.xml
+++ b/app/src/main/res/values-hu/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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 -->
  <!-- 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 -->
@ -23,11 +25,11 @@
  <!-- Proxy -->
  <string name="pref_title__sub_proxy">Proxy</string>
  <string name="pref_title__proxy_enabled">Attiva proxy</string>
-  <string name="pref_desc__http_proxy_enabled">Traffico del proxy di Diaspora per bypassare i firewall.\nPuò essere necessario il riavvio dell\'app</string>
  <string name="pref_title__http_proxy_host">Host</string>
  <string name="pref_title__http_proxy_port">Porta</string>
  <!-- Chrome custom tabs -->
  <string name="pref_title__chrome_custom_tabs_enabled">Schede personalizzate di Chrome</string>
+  <string name="pref_desc__chrome_custom_tabs_enabled">Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili!</string>
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Impostazioni personali</string>
  <string name="pref_desc__personal_settings">Apri le impostazioni del tuo account Diaspora</string>
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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 -->
  <!-- Font size -->
  <string name="pref_title__font_size">フォントサイズ</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -21,6 +23,8 @@
  <string name="pref_title__load_images">画像の読み込み</string>
  <string name="pref_desc__load_images">安全なモバイルデータのため、画像の読み込みを無効にします</string>
  <!-- Proxy -->
+  <string name="pref_title__http_proxy_load_tor_preset">Tor プリセットを読み込む</string>
+  <string name="pref_desc__http_proxy_load_tor_preset">Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます</string>
  <string name="pref_title__sub_proxy">プロキシ</string>
  <string name="pref_title__proxy_enabled">プロキシを有効にする</string>
  <string name="pref_desc__http_proxy_enabled">Diaspora の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります</string>
@ -28,6 +32,7 @@
  <string name="pref_title__http_proxy_port">ポート</string>
  <!-- Chrome custom tabs -->
  <string name="pref_title__chrome_custom_tabs_enabled">Chrome カスタムタブ</string>
+  <string name="pref_desc__chrome_custom_tabs_enabled">Chrome のカスタム タブで外部リンクを開きます。この機能は Chromium または Google Chrome をインストールする必要があります。\n重要な注意: Chrome のカスタム タブは構成されているプロキシ サーバーを使用しません!</string>
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">個人用設定</string>
  <string name="pref_desc__personal_settings">Diaspora アカウント設定を開きます</string>
--- a/app/src/main/res/values-kn/strings-preferences.xml
+++ b/app/src/main/res/values-kn/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-ml/strings-preferences.xml
+++ b/app/src/main/res/values-ml/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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 -->
  <!-- Font size -->
  <string name="pref_title__font_size">ഫോണ്ട് സൈസ്</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -22,9 +24,6 @@
  <string name="pref_desc__load_images">മൊബൈൽ ഡാറ്റ ഉപഭോഗം കുറയ്ക്കാനായി ചിത്രങ്ങൾ ലോഡ് ചെയ്യാതിരിക്കുക</string>
  <!-- Proxy -->
  <string name="pref_title__proxy_enabled">പ്രോക്സി അനുവദിക്കൂ</string>
-  <string name="pref_desc__http_proxy_enabled">ഫയർവാളുകളെ മറികടക്കാൻ ഡയസ്പോറ ട്രാഫിക് പ്രോക്സി ചെയ്യൂ.\nപുനരാരംഭിക്കേണ്ടി വന്നേക്കാം</string>
-  <string name="pref_title__http_proxy_host">ആഥിതേയൻ</string>
-  <string name="pref_title__http_proxy_port">പോർട്ട്</string>
  <!-- Chrome custom tabs -->
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">സ്വകാര്യ സജ്ജീകരണങ്ങൾ</string>
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -13,6 +14,7 @@
  <!-- Navigiation Slider -->
  <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
  <string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
+  <!-- Themes -->
  <!-- Font size -->
  <string name="pref_title__font_size">Lettergrootte</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -21,9 +23,6 @@
  <string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
  <!-- Proxy -->
  <string name="pref_title__proxy_enabled">Proxy inschakelen</string>
-  <string name="pref_desc__http_proxy_enabled">Gebruik een Proxy voor Diaspora om de firewalls te omzeilen.\nRestart nodig</string>
-  <string name="pref_title__http_proxy_host">Host</string>
-  <string name="pref_title__http_proxy_port">Poort</string>
  <!-- Chrome custom tabs -->
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Persoonlijke instellingen</string>
--- a/app/src/main/res/values-no/strings-preferences.xml
+++ b/app/src/main/res/values-no/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -11,6 +12,7 @@
  <string name="pref_cat__pod_settings">Ustawienia poda</string>
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <string name="pref_title__font_size">Rozmiar czcionki</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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 -->
  <!-- Font size -->
  <string name="pref_title__font_size">Tamanho da fonte</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -22,9 +24,6 @@
  <string name="pref_desc__load_images">Desabilitar o carregamento de imagens para economizar seus créditos</string>
  <!-- Proxy -->
  <string name="pref_title__proxy_enabled">Habilitar o Proxy</string>
-  <string name="pref_desc__http_proxy_enabled">Usar proxy para o tráfego da diáspora para contornar firewalls.\nPode requerer reinicialização</string>
-  <string name="pref_title__http_proxy_host">Servidor</string>
-  <string name="pref_title__http_proxy_port">Porta</string>
  <!-- Chrome custom tabs -->
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Configurações pessoais</string>
--- a/app/src/main/res/values-pt/strings-preferences.xml
+++ b/app/src/main/res/values-pt/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
@ -14,6 +15,7 @@
  <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 -->
  <!-- Font size -->
  <string name="pref_title__font_size">Размер шрифта</string>
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
@ -22,9 +24,6 @@
  <string name="pref_desc__load_images">Отключить загрузку изображений для экономии траффика</string>
  <!-- Proxy -->
  <string name="pref_title__proxy_enabled">Использовать прокси</string>
-  <string name="pref_desc__http_proxy_enabled">Перенаправить трафик Диаспоры в обход брандмауэров.\nМожет потребовать перезапуска</string>
-  <string name="pref_title__http_proxy_host">Хост</string>
-  <string name="pref_title__http_proxy_port">Порт</string>
  <!-- Chrome custom tabs -->
  <!-- Diaspora Settings -->
  <string name="pref_title__personal_settings">Личные настройки</string>
--- a/app/src/main/res/values-sv/strings-preferences.xml
+++ b/app/src/main/res/values-sv/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->
--- a/app/src/main/res/values-tr/strings-preferences.xml
+++ b/app/src/main/res/values-tr/strings-preferences.xml
@ -2,12 +2,14 @@
 <!--Generated by crowdin.com-->
 <resources>
  <!-- Key Names (Untranslatable) -->
+  <!-- Themes -->
  <!-- Navigiation Slider -->
  <!-- PodProfile -->
  <!-- More -->
  <!-- Category Titles -->
  <!-- Visuals -->
  <!-- Navigiation Slider -->
+  <!-- Themes -->
  <!-- Font size -->
  <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
  <!-- Load images -->