Merge pull request #1120 from AntennaPod/develop

updating 1.3 branch to reflect current RC

28 files changed, 1057 insertions, 227 deletions

diff --git a/.gitignore b/.gitignore
index 5a3070e8f..2d173a26c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ out
 #transifex downloads
 changelog
 description
+contributers.py
 
 # other
 *.odg#
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 65d29f75a..f00f9e9f6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,41 +1,93 @@
-Code contributions:
+DEVELOPERS
+==========
 
-danieloeh
-patheticpat
-toggles
-ligi
-ortylp
+Alexander Terczka
+Andrew Gaul
+Andrey Krutov
+Anthony Lieuallen
+axq
+Christian Ludwig
+Christopher Szucko
+Colin Willson
+Daniel Oeh
+David Carver
+David Reiss
+Dean Brettle
+drabux
+Eoin Mcloughlin
+Ercan Erden
+Hanno Zulla
+Holger Jeromin
+James Falcon
+Jens Müller
+Johan Liesén
 LatinSuD
-wseemann
-hzulla
-andrewgaul
-peschmae0
-TomHennen
-mfietz
-volhol
-eerden
+Lee Yeong Khang
+lightonflux
+ligi
+Martin Fietz
+Martin Olsson
+mat tso
+Matthias Schütz
+Michael Kaiser
+Michael Scarito
+Mike Chelen
+Nis Wechselberg
+Paul Ortyl
+Ross Harrison
+Sam Whited
+Seth Golub
+Simon Danner
+Simon Rutishauser
+Simon Schubert
+Terence Eden
+Tim Butram
+Tobias Preuss
+Tom Hennen
+tommy watson
 twiceyuan
-rharriso
+Udi Finkelstein
+volhol
+Volker Hollich
+William Seemann
+
 
-Translations:
+TRANSLATORS
+===========
 
+Arabic: iDemo
+Azerbaijani: phoenixar
 Catalan: dvd1985
-Chinese (China): tupunco
+Chinese (China): dudeG, Felix2yu, linxiangyu, tupunco, wongsyrone, yangyang
+Czech (Czech Republic): elich, Hanzmeister, petnek, svetlemodry
 Danish: CasperHN
-Portuguese (Brazil): mbaltar, edman
-Romanian (Romania): fuzzmz
-Russian: older
-Spanish: frandavid100, Fitoschido, dvd1985
-Spanish (Spain): e2jk, dvd1985, frandavid100
-Ukrainian (Ukraine): zhenya97, older
-French: lacouture, e2jk
-Italian (Italy): m.chinni
-Czech(Czech Republic): elich
-Azerbaijani: phoenixar
-Portuguese: smarquespt
-Swedish: nilso, Bio, TwoD, bpnilsson
-Hindi: siddhusengar
 Dutch: e2jk
-Polish (Poland): Mephistofeles, shark103, tyle
-Korean: changwoo
-Hebrew: amir.dafnyman
+English: mfietz, sterylmreep
+Finnish: danieloeh
+French: cactux, ChaoticMind, clombion, e2jk, lacouture, repat, sterylmreep
+German: altegedanken, ChaoticMind, Chaquotay, HolgerJeromin, kalei, lohmann, mfietz, nilso, picsel2, repat, SAPlayer, ypid
+Greek: AlexanderKanetakis
+Hebrew (Israel): amir.dafnyman
+Hindi (India): purple.coder, siddhusengar
+Hungarian: naren93
+Indonesian: luke137
+Italian: aalex70, Guybrush88, theloca95
+Italian (Italy): aalex70, Guybrush88, m.chinni, theloca95
+Japanese: Naofumi, sh3llc4t, TranslatorG
+Kannada (India): thejeshgn
+Korean: changwoo, skcha
+Norwegian: timbast
+Norwegian Bokmål (Norway): kongk, swordfighter, timbast
+Polish: maniexx, thedead4fun
+Polish (Poland): lomapur, maniexx, Mephistofeles, shark103, tyle
+Portuguese: smarquespt
+Portuguese (Brazil): alexupits, edman, Firmino, lipefire, mbaltar, SamWilliam
+Romanian (Romania): corneliu.e, fuzzmz
+Russian (Russia): Duke_Raven, mercutiy, null, overmind88, phoenixar, skvheadless, whereisthetea, zhenya97
+Spanish: coperfix, dvd1985, Fitoschido, frandavid100, LatinSuD
+Spanish (Spain): dvd1985, e2jk, frandavid100
+Swedish (Sweden): Bio, bpnilsson, ChaoticMind, Lumen, nilso, SharpMelon, TwoD
+Turkish: brsata, overbite
+Ukrainian (Ukraine): older, zhenya97
+Vietnamese: ppanhh, vietnamesel10n
+Vietnamese (Vietnam): bizover
diff --git a/LICENSE b/LICENSE
index b047c38c8..041569700 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,21 @@
-Copyright (c) 2012 Daniel Oeh
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2012-2015 AntennaPod contributors
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/app/build.gradle b/app/build.gradle
index cd6fbd354..ed02fa642 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 
 repositories {
     mavenCentral()
@@ -17,11 +18,12 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'org.jsoup:jsoup:1.7.3'
     compile 'com.github.bumptech.glide:glide:3.6.1'
-    compile 'com.squareup.okhttp:okhttp:2.3.0'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
     compile 'com.squareup.okio:okio:1.2.0'
     compile 'de.greenrobot:eventbus:2.4.0'
     compile 'com.joanzapata.android:android-iconify:1.0.9'
+    compile 'io.reactivex:rxandroid:1.0.1'
     
     compile project(':core')
     compile project(':library:drag-sort-listview')
@@ -108,6 +110,11 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 // about.html is templatized so that we can automatically insert
diff --git a/app/proguard.cfg b/app/proguard.cfg
index 6020b5751..ee9dace54 100644
--- a/app/proguard.cfg
+++ b/app/proguard.cfg
@@ -56,6 +56,12 @@
 -dontwarn com.squareup.okhttp.**
 -dontwarn okio.**
 
+# for RxJava:
+-dontwarn sun.misc.Unsafe
+
+# for retrolambda
+-dontwarn java.lang.invoke.*
+
 -keep class android.support.v4.** { *; }
 -keep interface android.support.v4.** { *; }
 -keep class android.support.v7.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64edcc248..b6de798ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="1030100"
-    android:versionName="1.3.1">
+    android:versionCode="1030201"
+    android:versionName="1.3.2 RC1">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300
@@ -36,8 +36,7 @@
         android:label="@string/app_name"
         android:backupAgent=".core.backup.OpmlBackupAgent"
         android:restoreAnyVersion="true"
-        android:logo="@drawable/ic_launcher"
-        android:theme="@style/Theme.AntennaPod.Light">
+        android:logo="@drawable/ic_launcher">
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/>
diff --git a/app/src/main/assets/LICENSE_RX_ANDROID.txt b/app/src/main/assets/LICENSE_RX_ANDROID.txt
new file mode 100644
index 000000000..4fe2d187f
--- /dev/null
+++ b/app/src/main/assets/LICENSE_RX_ANDROID.txt
@@ -0,0 +1,200 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index e7283d860..026e3b087 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -44,8 +44,6 @@ public class PodcastApp extends Application {
 		EventDistributor.getInstance();
 
         SPAUtil.sendSPAppsQueryFeedsIntent(this);
-
-		// startService(new Intent(this, FeedMediaSizeService.class));
 	}
 
 	public static float getLogicalDensity() {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index 811628ebf..035ab2f22 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -7,6 +7,7 @@ import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * Displays the 'about' screen
@@ -18,6 +19,7 @@ public class AboutActivity extends ActionBarActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
         getSupportActionBar().hide();
         setContentView(R.layout.about);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
index d3ee08546..854358285 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
@@ -1,19 +1,23 @@
 package de.danoeh.antennapod.adapter;
 
-import android.content.res.Resources;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.joanzapata.android.iconify.Iconify;
+
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 
 /**
  * Utility methods for adapters
  */
 public class AdapterUtils {
 
+    private static final String TAG = AdapterUtils.class.getSimpleName();
+
     private AdapterUtils() {
 
     }
@@ -21,7 +25,7 @@ public class AdapterUtils {
     /**
      * Updates the contents of the TextView that shows the current playback position and the ProgressBar.
      */
-    public static void updateEpisodePlaybackProgress(FeedItem item, Resources res, TextView txtvPos, ProgressBar episodeProgress) {
+    public static void updateEpisodePlaybackProgress(FeedItem item, TextView txtvPos, ProgressBar episodeProgress) {
         FeedMedia media = item.getMedia();
         episodeProgress.setVisibility(View.GONE);
         if (media == null) {
@@ -42,8 +46,19 @@ public class AdapterUtils {
                                 - media.getPosition()));
             }
         } else if (!media.isDownloaded()) {
-            if(media.getSize() > 0) {
+            if (media.getSize() > 0) {
                 txtvPos.setText(Converter.byteToString(media.getSize()));
+            } else if(false == media.checkedOnSizeButUnknown()) {
+                txtvPos.setText("{fa-spinner}");
+                Iconify.addIcons(txtvPos);
+                NetworkUtils.getFeedMediaSizeObservable(media)
+                        .subscribe(size -> {
+                                    if (size > 0) {
+                                        txtvPos.setText(Converter.byteToString(size));
+                                    } else {
+                                        txtvPos.setText("");
+                                    }
+                        });
             } else {
                 txtvPos.setText("");
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
index 4b6ee8f91..c83b21c49 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
@@ -14,10 +14,10 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
+import com.joanzapata.android.iconify.Iconify;
 
 import java.lang.ref.WeakReference;
 
@@ -27,12 +27,15 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 
 /**
  * List adapter for the list of new episodes
  */
 public class AllEpisodesListAdapter extends BaseAdapter {
 
+    private static final String TAG = AllEpisodesListAdapter.class.getSimpleName();
+
     private final Context context;
     private final ItemAccess itemAccess;
     private final ActionButtonCallback actionButtonCallback;
@@ -117,6 +120,17 @@ public class AllEpisodesListAdapter extends BaseAdapter {
                 holder.txtvDuration.setText(Converter.getDurationStringLong(media.getDuration()));
             } else if (media.getSize() > 0) {
                 holder.txtvDuration.setText(Converter.byteToString(media.getSize()));
+            } else if(false == media.checkedOnSizeButUnknown()) {
+                holder.txtvDuration.setText("{fa-spinner}");
+                Iconify.addIcons(holder.txtvDuration);
+                NetworkUtils.getFeedMediaSizeObservable(media)
+                        .subscribe(size -> {
+                                    if (size > 0) {
+                                        holder.txtvDuration.setText(Converter.byteToString(size));
+                                    } else {
+                                        holder.txtvDuration.setText("");
+                                    }
+                        });
             } else {
                 holder.txtvDuration.setText("");
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 56e2bb1bd..507d1adbc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -91,7 +91,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
             holder.inPlaylist = (ImageView) convertView
                     .findViewById(R.id.imgvInPlaylist);
             holder.type = (ImageView) convertView.findViewById(R.id.imgvType);
-            holder.statusUnread = (View) convertView
+            holder.statusUnread = convertView
                     .findViewById(R.id.statusUnread);
             holder.episodeProgress = (ProgressBar) convertView
                     .findViewById(R.id.pbar_episode_progress);
@@ -100,6 +100,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
         } else {
             holder = (Holder) convertView.getTag();
         }
+
         if (!(getItemViewType(position) == Adapter.IGNORE_ITEM_VIEW_TYPE)) {
             convertView.setVisibility(View.VISIBLE);
             if (position == selectedItemIndex) {
@@ -139,18 +140,17 @@ public class FeedItemlistAdapter extends BaseAdapter {
                 holder.lenSize.setVisibility(View.INVISIBLE);
             } else {
 
-                AdapterUtils.updateEpisodePlaybackProgress(item, context.getResources(), holder.lenSize, holder.episodeProgress);
+                AdapterUtils.updateEpisodePlaybackProgress(item, holder.lenSize, holder.episodeProgress);
 
-                if (((ItemAccess) itemAccess).isInQueue(item)) {
+                if (itemAccess.isInQueue(item)) {
                     holder.inPlaylist.setVisibility(View.VISIBLE);
                 } else {
                     holder.inPlaylist.setVisibility(View.INVISIBLE);
                 }
 
-                if (DownloadRequester.getInstance().isDownloadingFile(
-                        item.getMedia())) {
+                if (DownloadRequester.getInstance().isDownloadingFile(item.getMedia())) {
                     holder.episodeProgress.setVisibility(View.VISIBLE);
-                    holder.episodeProgress.setProgress(((ItemAccess) itemAccess).getItemDownloadProgressPercent(item));
+                    holder.episodeProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
                 } else {
                     if(media.getPosition() == 0) {
                         holder.episodeProgress.setVisibility(View.GONE);
@@ -206,15 +206,6 @@ public class FeedItemlistAdapter extends BaseAdapter {
         ProgressBar episodeProgress;
     }
 
-    public int getSelectedItemIndex() {
-        return selectedItemIndex;
-    }
-
-    public void setSelectedItemIndex(int selectedItemIndex) {
-        this.selectedItemIndex = selectedItemIndex;
-        notifyDataSetChanged();
-    }
-
     public interface ItemAccess {
 
         boolean isInQueue(FeedItem item);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
index 60c125fda..b1dfe2ad2 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.format.DateUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,10 +14,10 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
+import com.joanzapata.android.iconify.Iconify;
 
 import java.lang.ref.WeakReference;
 
@@ -29,6 +28,7 @@ import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
 
 /**
  * List adapter for the queue.
@@ -143,6 +143,17 @@ public class QueueListAdapter extends BaseAdapter {
             } else {
                 if(media.getSize() > 0) {
                     holder.progressLeft.setText(Converter.byteToString(media.getSize()));
+                } else if(false == media.checkedOnSizeButUnknown()) {
+                    holder.progressLeft.setText("{fa-spinner}");
+                    Iconify.addIcons(holder.progressLeft);
+                    NetworkUtils.getFeedMediaSizeObservable(media)
+                            .subscribe(size -> {
+                                        if (size > 0) {
+                                            holder.progressLeft.setText(Converter.byteToString(size));
+                                        } else {
+                                            holder.progressLeft.setText("");
+                                        }
+                            });
                 } else {
                     holder.progressLeft.setText("");
                 }
diff --git a/app/src/main/templates/about.html b/app/src/main/templates/about.html
index 2aca7ca4d..887b547f4 100644
--- a/app/src/main/templates/about.html
+++ b/app/src/main/templates/about.html
@@ -56,38 +56,41 @@
 by The Apache Software Foundation, licensed under the Apache 2.0 license <a
         href="LICENSE_APACHE_COMMONS.txt">(View)</a>
 
+<h2>DragSortListView <a href="https://github.com/bauerca/drag-sort-listview">(Link)</a></h2>
+by Carl Bauer, licensed under the Apache 2.0 license <a href="LICENSE_DSLV.txt">(View)</a>
+
+<h2>EventBus <a href="https://github.com/greenrobot/EventBus">(Link)</a></h2>
+by greenrobot, licensed under the Apache 2.0 license <a href="LICENSE_EVENTBUS.txt">(View)</a>
+
 <h2>flattr4j <a href="http://www.shredzone.org/projects/flattr4j/wiki">(Link)</a></h2>
 licensed under the Apache 2.0 license <a href="LICENSE_FLATTR4J.txt">(View)</a>
 
-<h2>drag-sort-listview <a href="https://github.com/bauerca/drag-sort-listview">(Link)</a></h2>
-licensed under the Apache 2.0 license <a href="LICENSE_DSLV.txt">(View)</a>
+<h2>Glide <a href="https://github.com/bumptech/glide/">(Link)</a></h2>
+licensed under the Simplified BSD license <a href="LICENSE_GLIDE.txt">(View)</a>
 
-<h2>Presto Client <a href="http://www.aocate.com/presto/">(Link)</a></h2>
-licensed under the Apache 2.0 license <a href="LICENSE_PRESTO.txt">(View)</a>
+<h2>Iconify <a href="https://github.com/JoanZapata/android-iconify">(Link)</a></h2>
+by Joan Zapata, licensed under the Apache 2.0 license <a href="LICENSE_ANDROID_ICONIFY.txt">(View)</a>
 
 <h2>jsoup <a href="http://jsoup.org/">(Link)</a></h2>
 licensed under the MIT license <a href="LICENSE_JSOUP.txt">(View)</a>
 
-<h2>Glide <a href="https://github.com/bumptech/glide/">(Link)</a></h2>
-licensed under the Simplified BSD license <a href="LICENSE_GLIDE.txt">(View)</a>
-
-<h2>StackBlur <a href="https://github.com/kikoso/android-stackblur">(Link)</a></h2>
-licensed under the Apache 2.0 license <a href="LICENSE_STACKBLUR.txt">(View)</a>
+<h2>Material Design Icons <a href="https://github.com/google/material-design-icons">(Link)</a></h2>
+by Google, licensed under an Attribution-ShareAlike 4.0 International license <a href="LICENSE_MATERIAL_DESIGN_ICONS.txt">(View)</a>
 
 <h2>OkHttp <a href="https://github.com/square/okhttp">(Link)</a></h2>
-licensed under the Apache 2.0 license <a href="LICENSE_OKHTTP.txt">(View)</a>
+by Square, licensed under the Apache 2.0 license <a href="LICENSE_OKHTTP.txt">(View)</a>
 
 <h2>Okio <a href="https://github.com/square/okio">(Link)</a></h2>
-licensed under the Apache 2.0 license <a href="LICENSE_OKIO.txt">(View)</a>
+by Square, licensed under the Apache 2.0 license <a href="LICENSE_OKIO.txt">(View)</a>
 
-<h2>Material Design Icons <a href="https://github.com/google/material-design-icons">(Link)</a></h2>
-by Google, licensed under an Attribution-ShareAlike 4.0 International license <a href="LICENSE_MATERIAL_DESIGN_ICONS.txt">(View)</a>
+<h2>Presto Client <a href="http://www.aocate.com/presto/">(Link)</a></h2>
+licensed under the Apache 2.0 license <a href="LICENSE_PRESTO.txt">(View)</a>
 
-<h2>EventBus <a href="https://github.com/greenrobot/EventBus">(Link)</a></h2>
-by greenrobot, licensed under the Apache 2.0 license <a href="LICENSE_EVENTBUS.txt">(View)</a>
+<h2>RxAndroid <a href="https://github.com/ReactiveX/RxAndroid">(Link)</a></h2>
+licensed under the Apache 2.0 license <a href="LICENSE_RX_ANDROID.txt">(View)</a>
 
-<h2>Iconify <a href="https://github.com/JoanZapata/android-iconify">(Link)</a></h2>
-by Joan Zapata, licensed under the Apache 2.0 license <a href="LICENSE_ANDROID_ICONIFY.txt">(View)</a>
+<h2>StackBlur <a href="https://github.com/kikoso/android-stackblur">(Link)</a></h2>
+by Enrique L&oacute;pez Ma&ntilde;as, licensed under the Apache 2.0 license <a href="LICENSE_STACKBLUR.txt">(View)</a>
 
 </body>
 </html>
diff --git a/build.gradle b/build.gradle
index 363f02283..9f8861d13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/contributers.template.py b/contributers.template.py
new file mode 100755
index 000000000..3127baa0c
--- /dev/null
+++ b/contributers.template.py
@@ -0,0 +1,454 @@
+#!/usr/bin/env python3
+import requests
+import subprocess
+
+TRANSIFEX_USER = ""
+TRANSIFEX_PW = ""
+
+print('DEVELOPERS\n==========\n')
+p = subprocess.Popen("git log --format='%aN' | sort -fu", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+for line in p.stdout.readlines():
+    output = line.decode()
+    print(output, end='')
+
+language_codes = {
+    "af_NA": "Afrikaans (Namibia)",
+    "af_ZA": "Afrikaans (South Africa)",
+    "af": "Afrikaans",
+    "ak_GH": "Akan (Ghana)",
+    "ak": "Akan",
+    "sq_AL": "Albanian (Albania)",
+    "sq": "Albanian",
+    "am_ET": "Amharic (Ethiopia)",
+    "am": "Amharic",
+    "ar_DZ": "Arabic (Algeria)",
+    "ar_BH": "Arabic (Bahrain)",
+    "ar_EG": "Arabic (Egypt)",
+    "ar_IQ": "Arabic (Iraq)",
+    "ar_JO": "Arabic (Jordan)",
+    "ar_KW": "Arabic (Kuwait)",
+    "ar_LB": "Arabic (Lebanon)",
+    "ar_LY": "Arabic (Libya)",
+    "ar_MA": "Arabic (Morocco)",
+    "ar_OM": "Arabic (Oman)",
+    "ar_QA": "Arabic (Qatar)",
+    "ar_SA": "Arabic (Saudi Arabia)",
+    "ar_SD": "Arabic (Sudan)",
+    "ar_SY": "Arabic (Syria)",
+    "ar_TN": "Arabic (Tunisia)",
+    "ar_AE": "Arabic (United Arab Emirates)",
+    "ar_YE": "Arabic (Yemen)",
+    "ar": "Arabic",
+    "hy_AM": "Armenian (Armenia)",
+    "hy": "Armenian",
+    "as_IN": "Assamese (India)",
+    "as": "Assamese",
+    "asa_TZ": "Asu (Tanzania)",
+    "asa": "Asu",
+    "az_Cyrl": "Azerbaijani (Cyrillic)",
+    "az_Cyrl_AZ": "Azerbaijani (Cyrillic, Azerbaijan)",
+    "az_Latn": "Azerbaijani (Latin)",
+    "az_Latn_AZ": "Azerbaijani (Latin, Azerbaijan)",
+    "az": "Azerbaijani",
+    "bm_ML": "Bambara (Mali)",
+    "bm": "Bambara",
+    "eu_ES": "Basque (Spain)",
+    "eu": "Basque",
+    "be_BY": "Belarusian (Belarus)",
+    "be": "Belarusian",
+    "bem_ZM": "Bemba (Zambia)",
+    "bem": "Bemba",
+    "bez_TZ": "Bena (Tanzania)",
+    "bez": "Bena",
+    "bn_BD": "Bengali (Bangladesh)",
+    "bn_IN": "Bengali (India)",
+    "bn": "Bengali",
+    "bs_BA": "Bosnian (Bosnia and Herzegovina)",
+    "bs": "Bosnian",
+    "bg_BG": "Bulgarian (Bulgaria)",
+    "bg": "Bulgarian",
+    "my_MM": "Burmese (Myanmar [Burma])",
+    "my": "Burmese",
+    "ca_ES": "Catalan (Spain)",
+    "ca": "Catalan",
+    "tzm_Latn": "Central Morocco Tamazight (Latin)",
+    "tzm_Latn_MA": "Central Morocco Tamazight (Latin, Morocco)",
+    "tzm": "Central Morocco Tamazight",
+    "chr_US": "Cherokee (United States)",
+    "chr": "Cherokee",
+    "cgg_UG": "Chiga (Uganda)",
+    "cgg": "Chiga",
+    "zh": "Chinese (Simplified)",
+    "zh_CN": "Chinese (China)",
+    "zh_HK": "Chinese (Hong Kong SAR China)",
+    "zh_MO": "Chinese (Macau SAR China)",
+    "zh_MO_SG": "Chinese (Singapore)",
+    "zh_TW": "Chinese (Taiwan)",
+    "zh": "Chinese",
+    "kw_GB": "Cornish (United Kingdom)",
+    "kw": "Cornish",
+    "hr_HR": "Croatian (Croatia)",
+    "hr": "Croatian",
+    "cs_CZ": "Czech (Czech Republic)",
+    "cs": "Czech",
+    "da_DK": "Danish (Denmark)",
+    "da": "Danish",
+    "nl_BE": "Dutch (Belgium)",
+    "nl_NL": "Dutch (Netherlands)",
+    "nl": "Dutch",
+    "ebu_KE": "Embu (Kenya)",
+    "ebu": "Embu",
+    "en_AS": "English (American Samoa)",
+    "en_AU": "English (Australia)",
+    "en_BE": "English (Belgium)",
+    "en_BZ": "English (Belize)",
+    "en_BW": "English (Botswana)",
+    "en_CA": "English (Canada)",
+    "en_GU": "English (Guam)",
+    "en_HK": "English (Hong Kong SAR China)",
+    "en_IN": "English (India)",
+    "en_IE": "English (Ireland)",
+    "en_JM": "English (Jamaica)",
+    "en_MT": "English (Malta)",
+    "en_MH": "English (Marshall Islands)",
+    "en_MU": "English (Mauritius)",
+    "en_NA": "English (Namibia)",
+    "en_NZ": "English (New Zealand)",
+    "en_MP": "English (Northern Mariana Islands)",
+    "en_PK": "English (Pakistan)",
+    "en_PH": "English (Philippines)",
+    "en_SG": "English (Singapore)",
+    "en_ZA": "English (South Africa)",
+    "en_TT": "English (Trinidad and Tobago)",
+    "en_UM": "English (U.S. Minor Outlying Islands)",
+    "en_VI": "English (U.S. Virgin Islands)",
+    "en_GB": "English (United Kingdom)",
+    "en_US": "English (United States)",
+    "en_ZW": "English (Zimbabwe)",
+    "en": "English",
+    "eo": "Esperanto",
+    "et_EE": "Estonian (Estonia)",
+    "et": "Estonian",
+    "ee_GH": "Ewe (Ghana)",
+    "ee_TG": "Ewe (Togo)",
+    "ee": "Ewe",
+    "fo_FO": "Faroese (Faroe Islands)",
+    "fo": "Faroese",
+    "fil_PH": "Filipino (Philippines)",
+    "fil": "Filipino",
+    "fi_FI": "Finnish (Finland)",
+    "fi": "Finnish",
+    "fr_BE": "French (Belgium)",
+    "fr_BJ": "French (Benin)",
+    "fr_BF": "French (Burkina Faso)",
+    "fr_BI": "French (Burundi)",
+    "fr_CM": "French (Cameroon)",
+    "fr_CA": "French (Canada)",
+    "fr_CF": "French (Central African Republic)",
+    "fr_TD": "French (Chad)",
+    "fr_KM": "French (Comoros)",
+    "fr_CG": "French (Congo - Brazzaville)",
+    "fr_CD": "French (Congo - Kinshasa)",
+    "fr_CI": "French (Côte d’Ivoire)",
+    "fr_DJ": "French (Djibouti)",
+    "fr_GQ": "French (Equatorial Guinea)",
+    "fr_FR": "French (France)",
+    "fr_GA": "French (Gabon)",
+    "fr_GP": "French (Guadeloupe)",
+    "fr_GN": "French (Guinea)",
+    "fr_LU": "French (Luxembourg)",
+    "fr_MG": "French (Madagascar)",
+    "fr_ML": "French (Mali)",
+    "fr_MQ": "French (Martinique)",
+    "fr_MC": "French (Monaco)",
+    "fr_NE": "French (Niger)",
+    "fr_RW": "French (Rwanda)",
+    "fr_RE": "French (Réunion)",
+    "fr_BL": "French (Saint Barthélemy)",
+    "fr_MF": "French (Saint Martin)",
+    "fr_SN": "French (Senegal)",
+    "fr_CH": "French (Switzerland)",
+    "fr_TG": "French (Togo)",
+    "fr": "French",
+    "ff_SN": "Fulah (Senegal)",
+    "ff": "Fulah",
+    "gl_ES": "Galician (Spain)",
+    "gl": "Galician",
+    "lg_UG": "Ganda (Uganda)",
+    "lg": "Ganda",
+    "ka_GE": "Georgian (Georgia)",
+    "ka": "Georgian",
+    "de_AT": "German (Austria)",
+    "de_BE": "German (Belgium)",
+    "de_DE": "German (Germany)",
+    "de_LI": "German (Liechtenstein)",
+    "de_LU": "German (Luxembourg)",
+    "de_CH": "German (Switzerland)",
+    "de": "German",
+    "el_CY": "Greek (Cyprus)",
+    "el_GR": "Greek (Greece)",
+    "el": "Greek",
+    "gu_IN": "Gujarati (India)",
+    "gu": "Gujarati",
+    "guz_KE": "Gusii (Kenya)",
+    "guz": "Gusii",
+    "ha_Latn": "Hausa (Latin)",
+    "ha_Latn_GH": "Hausa (Latin, Ghana)",
+    "ha_Latn_NE": "Hausa (Latin, Niger)",
+    "ha_Latn_NG": "Hausa (Latin, Nigeria)",
+    "ha": "Hausa",
+    "haw_US": "Hawaiian (United States)",
+    "haw": "Hawaiian",
+    "he_IL": "Hebrew (Israel)",
+    "he": "Hebrew",
+    "hi_IN": "Hindi (India)",
+    "hi": "Hindi",
+    "hu_HU": "Hungarian (Hungary)",
+    "hu": "Hungarian",
+    "is_IS": "Icelandic (Iceland)",
+    "is": "Icelandic",
+    "ig_NG": "Igbo (Nigeria)",
+    "ig": "Igbo",
+    "id_ID": "Indonesian (Indonesia)",
+    "id": "Indonesian",
+    "ga_IE": "Irish (Ireland)",
+    "ga": "Irish",
+    "it_IT": "Italian (Italy)",
+    "it_CH": "Italian (Switzerland)",
+    "it": "Italian",
+    "ja_JP": "Japanese (Japan)",
+    "ja": "Japanese",
+    "kea_CV": "Kabuverdianu (Cape Verde)",
+    "kea": "Kabuverdianu",
+    "kab_DZ": "Kabyle (Algeria)",
+    "kab": "Kabyle",
+    "kl_GL": "Kalaallisut (Greenland)",
+    "kl": "Kalaallisut",
+    "kln_KE": "Kalenjin (Kenya)",
+    "kln": "Kalenjin",
+    "kam_KE": "Kamba (Kenya)",
+    "kam": "Kamba",
+    "kn_IN": "Kannada (India)",
+    "kn": "Kannada",
+    "kk_Cyrl": "Kazakh (Cyrillic)",
+    "kk_Cyrl_KZ": "Kazakh (Cyrillic, Kazakhstan)",
+    "kk": "Kazakh",
+    "km_KH": "Khmer (Cambodia)",
+    "km": "Khmer",
+    "ki_KE": "Kikuyu (Kenya)",
+    "ki": "Kikuyu",
+    "rw_RW": "Kinyarwanda (Rwanda)",
+    "rw": "Kinyarwanda",
+    "kok_IN": "Konkani (India)",
+    "kok": "Konkani",
+    "ko_KR": "Korean (South Korea)",
+    "ko": "Korean",
+    "khq_ML": "Koyra Chiini (Mali)",
+    "khq": "Koyra Chiini",
+    "ses_ML": "Koyraboro Senni (Mali)",
+    "ses": "Koyraboro Senni",
+    "lag_TZ": "Langi (Tanzania)",
+    "lag": "Langi",
+    "lv_LV": "Latvian (Latvia)",
+    "lv": "Latvian",
+    "lt_LT": "Lithuanian (Lithuania)",
+    "lt": "Lithuanian",
+    "luo_KE": "Luo (Kenya)",
+    "luo": "Luo",
+    "luy_KE": "Luyia (Kenya)",
+    "luy": "Luyia",
+    "mk_MK": "Macedonian (Macedonia)",
+    "mk": "Macedonian",
+    "jmc_TZ": "Machame (Tanzania)",
+    "jmc": "Machame",
+    "kde_TZ": "Makonde (Tanzania)",
+    "kde": "Makonde",
+    "mg_MG": "Malagasy (Madagascar)",
+    "mg": "Malagasy",
+    "ms_BN": "Malay (Brunei)",
+    "ms_MY": "Malay (Malaysia)",
+    "ms": "Malay",
+    "ml_IN": "Malayalam (India)",
+    "ml": "Malayalam",
+    "mt_MT": "Maltese (Malta)",
+    "mt": "Maltese",
+    "gv_GB": "Manx (United Kingdom)",
+    "gv": "Manx",
+    "mr_IN": "Marathi (India)",
+    "mr": "Marathi",
+    "mas_KE": "Masai (Kenya)",
+    "mas_TZ": "Masai (Tanzania)",
+    "mas": "Masai",
+    "mer_KE": "Meru (Kenya)",
+    "mer": "Meru",
+    "mfe_MU": "Morisyen (Mauritius)",
+    "mfe": "Morisyen",
+    "naq_NA": "Nama (Namibia)",
+    "naq": "Nama",
+    "ne_IN": "Nepali (India)",
+    "ne_NP": "Nepali (Nepal)",
+    "ne": "Nepali",
+    "nd_ZW": "North Ndebele (Zimbabwe)",
+    "nd": "North Ndebele",
+    "no": "Norwegian",
+    "nb_NO": "Norwegian Bokmål (Norway)",
+    "nb": "Norwegian Bokmål",
+    "nn_NO": "Norwegian Nynorsk (Norway)",
+    "nn": "Norwegian Nynorsk",
+    "nyn_UG": "Nyankole (Uganda)",
+    "nyn": "Nyankole",
+    "or_IN": "Oriya (India)",
+    "or": "Oriya",
+    "om_ET": "Oromo (Ethiopia)",
+    "m_KE": "Oromo (Kenya)",
+    "om": "Oromo",
+    "ps_AF": "Pashto (Afghanistan)",
+    "ps": "Pashto",
+    "fa_AF": "Persian (Afghanistan)",
+    "fa_IR": "Persian (Iran)",
+    "fa": "Persian",
+    "pl_PL": "Polish (Poland)",
+    "pl": "Polish",
+    "pt_BR": "Portuguese (Brazil)",
+    "pt_GW": "Portuguese (Guinea-Bissau)",
+    "pt_MZ": "Portuguese (Mozambique)",
+    "pt_PT": "Portuguese (Portugal)",
+    "pt": "Portuguese",
+    "pa_Arab": "Punjabi (Arabic)",
+    "pa_Arab_PK": "Punjabi (Arabic, Pakistan)",
+    "pa_Guru": "Punjabi (Gurmukhi)",
+    "pa_Guru_IN": "Punjabi (Gurmukhi, India)",
+    "pa": "Punjabi",
+    "ro_MD": "Romanian (Moldova)",
+    "ro_RO": "Romanian (Romania)",
+    "ro": "Romanian",
+    "rm_CH": "Romansh (Switzerland)",
+    "rm": "Romansh",
+    "rof_TZ": "Rombo (Tanzania)",
+    "rof": "Rombo",
+    "ru_MD": "Russian (Moldova)",
+    "ru_RU": "Russian (Russia)",
+    "ru_UA": "Russian (Ukraine)",
+    "ru": "Russian",
+    "rwk_TZ": "Rwa (Tanzania)",
+    "rwk": "Rwa",
+    "saq_KE": "Samburu (Kenya)",
+    "saq": "Samburu",
+    "sg_CF": "Sango (Central African Republic)",
+    "sg": "Sango",
+    "seh_MZ": "Sena (Mozambique)",
+    "seh": "Sena",
+    "sr_Cyrl": "Serbian (Cyrillic)",
+    "sr_Cyrl_BA": "Serbian (Cyrillic, Bosnia and Herzegovina)",
+    "sr_Cyrl_ME": "Serbian (Cyrillic, Montenegro)",
+    "sr_Cyrl_RS": "Serbian (Cyrillic, Serbia)",
+    "sr_Latn": "Serbian (Latin)",
+    "sr_Latn_BA": "Serbian (Latin, Bosnia and Herzegovina)",
+    "sr_Latn_ME": "Serbian (Latin, Montenegro)",
+    "sr_Latn_RS": "Serbian (Latin, Serbia)",
+    "sr": "Serbian",
+    "sn_ZW": "Shona (Zimbabwe)",
+    "sn": "Shona",
+    "ii_CN": "Sichuan Yi (China)",
+    "ii": "Sichuan Yi",
+    "si_LK": "Sinhala (Sri Lanka)",
+    "si": "Sinhala",
+    "sk_SK": "Slovak (Slovakia)",
+    "sk": "Slovak",
+    "sl_SI": "Slovenian (Slovenia)",
+    "sl": "Slovenian",
+    "xog_UG": "Soga (Uganda)",
+    "xog": "Soga",
+    "so_DJ": "Somali (Djibouti)",
+    "so_ET": "Somali (Ethiopia)",
+    "so_KE": "Somali (Kenya)",
+    "so_SO": "Somali (Somalia)",
+    "so": "Somali",
+    "es_AR": "Spanish (Argentina)",
+    "es_BO": "Spanish (Bolivia)",
+    "es_CL": "Spanish (Chile)",
+    "es_CO": "Spanish (Colombia)",
+    "es_CR": "Spanish (Costa Rica)",
+    "es_DO": "Spanish (Dominican Republic)",
+    "es_EC": "Spanish (Ecuador)",
+    "es_SV": "Spanish (El Salvador)",
+    "es_GQ": "Spanish (Equatorial Guinea)",
+    "es_GT": "Spanish (Guatemala)",
+    "es_HN": "Spanish (Honduras)",
+    "es_419": "Spanish (Latin America)",
+    "es_MX": "Spanish (Mexico)",
+    "es_NI": "Spanish (Nicaragua)",
+    "es_PA": "Spanish (Panama)",
+    "es_PY": "Spanish (Paraguay)",
+    "es_PE": "Spanish (Peru)",
+    "es_PR": "Spanish (Puerto Rico)",
+    "es_ES": "Spanish (Spain)",
+    "es_US": "Spanish (United States)",
+    "es_UY": "Spanish (Uruguay)",
+    "es_VE": "Spanish (Venezuela)",
+    "es": "Spanish",
+    "sw_KE": "Swahili (Kenya)",
+    "sw_TZ": "Swahili (Tanzania)",
+    "sw": "Swahili",
+    "sv_FI": "Swedish (Finland)",
+    "sv_SE": "Swedish (Sweden)",
+    "sv": "Swedish",
+    "gsw_CH": "Swiss German (Switzerland)",
+    "gsw": "Swiss German",
+    "shi_Latn": "Tachelhit (Latin)",
+    "shi_Latn_MA": "Tachelhit (Latin, Morocco)",
+    "shi_Tfng": "Tachelhit (Tifinagh)",
+    "shi_Tfng_MA": "Tachelhit (Tifinagh, Morocco)",
+    "shi": "Tachelhit",
+    "dav_KE": "Taita (Kenya)",
+    "dav": "Taita",
+    "ta_IN": "Tamil (India)",
+    "ta_LK": "Tamil (Sri Lanka)",
+    "ta": "Tamil",
+    "te_IN": "Telugu (India)",
+    "te": "Telugu",
+    "teo_KE": "Teso (Kenya)",
+    "teo_UG": "Teso (Uganda)",
+    "teo": "Teso",
+    "th_TH": "Thai (Thailand)",
+    "th": "Thai",
+    "bo_CN": "Tibetan (China)",
+    "bo_IN": "Tibetan (India)",
+    "bo": "Tibetan",
+    "ti_ER": "Tigrinya (Eritrea)",
+    "ti_ET": "Tigrinya (Ethiopia)",
+    "ti": "Tigrinya",
+    "to_TO": "Tonga (Tonga)",
+    "to": "Tonga",
+    "tr_TR": "Turkish (Turkey)",
+    "tr": "Turkish",
+    "uk_UA": "Ukrainian (Ukraine)",
+    "uk": "Ukrainian",
+    "ur_IN": "Urdu (India)",
+    "ur_PK": "Urdu (Pakistan)",
+    "ur": "Urdu",
+    "uz_Arab": "Uzbek (Arabic)",
+    "uz_Arab_AF": "Uzbek (Arabic, Afghanistan)",
+    "uz_Cyrl": "Uzbek (Cyrillic)",
+    "uz_Cyrl_UZ": "Uzbek (Cyrillic, Uzbekistan)",
+    "uz_Latn": "Uzbek (Latin)",
+    "uz_Latn_UZ": "Uzbek (Latin, Uzbekistan)",
+    "uz": "Uzbek",
+    "vi_VN": "Vietnamese (Vietnam)",
+    "vi": "Vietnamese",
+    "vun_TZ": "Vunjo (Tanzania)",
+    "vun": "Vunjo",
+    "cy_GB": "Welsh (United Kingdom)",
+    "cy": "Welsh",
+    "yo_NG": "Yoruba (Nigeria)",
+    "yo": "Yoruba",
+    "zu_ZA": "Zulu (South Africa)",
+    "zu": "Zulu"
+}
+
+print('\n\nTRANSLATORS\n===========\n')
+r = requests.get('http://www.transifex.com/api/2/project/antennapod/languages/', auth=(TRANSIFEX_USER, TRANSIFEX_PW))
+for lang in r.json():
+    lang_contributers = lang['coordinators'] + lang['reviewers'] + lang['translators']
+    lang_contributers = sorted(lang_contributers, key=str.lower)
+    print(language_codes[lang['language_code']], ": ", ', '.join(lang_contributers), sep="") 
diff --git a/core/build.gradle b/core/build.gradle
index 5e721bbc3..46b2e3ce9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 21
@@ -25,8 +26,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
 }
@@ -44,9 +45,10 @@ dependencies {
     compile 'org.jsoup:jsoup:1.7.3'
     compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.github.bumptech.glide:okhttp-integration:1.3.0'
-    compile 'com.squareup.okhttp:okhttp:2.3.0'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
     compile 'com.squareup.okio:okio:1.2.0'
     compile 'com.nineoldandroids:library:2.4.0'
     compile 'de.greenrobot:eventbus:2.4.0'
+    compile 'io.reactivex:rxandroid:1.0.1'
 }
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 17dcb4ad8..3ec519844 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -23,9 +23,6 @@
         <service
             android:name=".service.GpodnetSyncService"
             android:enabled="true" />
-        <service
-            android:name=".service.FeedMediaSizeService"
-            android:enabled="true" />
 
         <receiver
             android:name=".receiver.MediaButtonReceiver"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
index c7ac146b5..cf3af7d4c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -43,7 +43,7 @@ public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
             if (internalClient == null) {
                 synchronized (Factory.class) {
                     if (internalClient == null) {
-                        internalClient = AntennapodHttpClient.getHttpClient();
+                        internalClient = AntennapodHttpClient.newHttpClient();
                         internalClient.interceptors().add(new NetworkAllowanceInterceptor());
                         internalClient.interceptors().add(new BasicAuthenticationInterceptor());
                     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index d56829c70..08328536d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -44,7 +44,7 @@ public class UserPreferences {
     public static final String PREF_THEME = "prefTheme";
     public static final String PREF_HIDDEN_DRAWER_ITEMS = "prefHiddenDrawerItems";
     public static final String PREF_DRAWER_FEED_ORDER = "prefDrawerFeedOrder";
-    public static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedCounter";
+    public static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator";
     public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
     public static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
     public static final String PREF_SHOW_DOWNLOAD_REPORT = "prefShowDownloadReport";
@@ -90,7 +90,7 @@ public class UserPreferences {
 
     // Constants
     private static int EPISODE_CACHE_SIZE_UNLIMITED = -1;
-    public static int FEED_ORDER_UNPLAYED_EPISODES = 0;
+    public static int FEED_ORDER_COUNTER = 0;
     public static int FEED_ORDER_ALPHABETICAL = 1;
     public static int FEED_COUNTER_SHOW_NEW_UNPLAYED_SUM = 0;
     public static int FEED_COUNTER_SHOW_NEW = 1;
@@ -144,7 +144,7 @@ public class UserPreferences {
         return Integer.valueOf(value);
     }
 
-    public static int getFeedCounter() {
+    public static int getFeedCounterSetting() {
         String value = prefs.getString(PREF_DRAWER_FEED_COUNTER, "0");
         return Integer.valueOf(value);
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java b/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
deleted file mode 100644
index a8375bce3..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package de.danoeh.antennapod.core.service;
-
-import android.app.IntentService;
-import android.content.Intent;
-import android.util.Log;
-
-public class FeedMediaSizeService extends IntentService {
-
-    private final static String TAG = "FeedMediaSizeService";
-
-    public FeedMediaSizeService() {
-        super(TAG);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        Log.d(TAG, "onHandleIntent()");
-        return;
-//        if(false == NetworkUtils.isDownloadAllowed()) {
-//            return;
-//        }
-//        List<FeedMedia> list = DBReader.getFeedMediaUnknownSize(this);
-//        for (FeedMedia media : list) {
-//            Log.d(TAG, "Getting size currently " + media.getSize() + " for " + media.getDownload_url());
-//            if(false == NetworkUtils.isDownloadAllowed()) {
-//                return;
-//            }
-//            long size = Integer.MIN_VALUE;
-//            if (media.isDownloaded()) {
-//                File mediaFile = new File(media.getLocalMediaUrl());
-//                if(mediaFile.exists()) {
-//                    size = mediaFile.length();
-//                }
-//            } else if (false == media.checkedOnSizeButUnknown()) {
-//                // only query the network if we haven't already checked
-//                HttpURLConnection conn = null;
-//                try {
-//                    URL url = new URL(media.getDownload_url());
-//                    conn = (HttpURLConnection) url.openConnection();
-//                    conn.setRequestProperty("Accept-Encoding", "");
-//                    conn.setRequestMethod("HEAD");
-//                    size = conn.getContentLength();
-//                } catch (IOException e) {
-//                    Log.d(TAG, media.getDownload_url());
-//                    e.printStackTrace();
-//                } finally {
-//                    if (conn != null) {
-//                        conn.disconnect();
-//                    }
-//                }
-//            }
-//            if (size <= 0) {
-//                // they didn't tell us the size, but we don't want to keep querying on it
-//                media.setCheckedOnSizeButUnknown();
-//            } else {
-//                media.setSize(size);
-//            }
-//            Log.d(TAG, "Size now: " + media.getSize());
-//            DBWriter.setFeedMedia(this, media);
-//            EventBus.getDefault().post(FeedMediaEvent.update(media));
-//        }
-    }
-
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index b80b4303f..7878d19a0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -230,7 +230,7 @@ public class GpodnetSyncService extends Service {
         for(GpodnetEpisodeAction action : localActions) {
             Pair key = new Pair(action.getPodcast(), action.getEpisode());
             GpodnetEpisodeAction mostRecent = localMostRecentPlayAction.get(key);
-            if (mostRecent == null) {
+            if (mostRecent == null || mostRecent.getTimestamp() == null) {
                 localMostRecentPlayAction.put(key, action);
             } else if (mostRecent.getTimestamp().before(action.getTimestamp())) {
                 localMostRecentPlayAction.put(key, action);
@@ -255,9 +255,10 @@ public class GpodnetSyncService extends Service {
                     Pair key = new Pair(action.getPodcast(), action.getEpisode());
                     GpodnetEpisodeAction localMostRecent = localMostRecentPlayAction.get(key);
                     if(localMostRecent == null ||
+                            localMostRecent.getTimestamp() == null ||
                             localMostRecent.getTimestamp().before(action.getTimestamp())) {
                         GpodnetEpisodeAction mostRecent = mostRecentPlayAction.get(key);
-                        if (mostRecent == null) {
+                        if (mostRecent == null || mostRecent.getTimestamp() == null) {
                             mostRecentPlayAction.put(key, action);
                         } else if (mostRecent.getTimestamp().before(action.getTimestamp())) {
                             mostRecentPlayAction.put(key, action);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index ec3d3e2fe..9aff7489b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -1,13 +1,23 @@
 package de.danoeh.antennapod.core.service.download;
 
+import android.support.annotation.NonNull;
+import android.os.Build;
 import android.util.Log;
 
 import com.squareup.okhttp.OkHttpClient;
 
+import java.io.IOException;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.GeneralSecurityException;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
 import de.danoeh.antennapod.core.BuildConfig;
 
 /**
@@ -30,29 +40,44 @@ public class AntennapodHttpClient {
     public static synchronized OkHttpClient getHttpClient() {
         if (httpClient == null) {
 
-            if (BuildConfig.DEBUG) Log.d(TAG, "Creating new instance of HTTP client");
+            httpClient = newHttpClient();
+        }
+        return httpClient;
+    }
 
-            System.setProperty("http.maxConnections", String.valueOf(MAX_CONNECTIONS));
+    /**
+     * Creates a new HTTP client.  Most users should just use
+     * getHttpClient() to get the standard AntennaPod client,
+     * but sometimes it's necessary for others to have their own
+     * copy so that the clients don't share state.
+     * @return http client
+     */
+    @NonNull
+    public static OkHttpClient newHttpClient() {
+        Log.d(TAG, "Creating new instance of HTTP client");
+
+        System.setProperty("http.maxConnections", String.valueOf(MAX_CONNECTIONS));
 
-            OkHttpClient client = new OkHttpClient();
+        OkHttpClient client = new OkHttpClient();
 
-            // set cookie handler
-            CookieManager cm = new CookieManager();
-            cm.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
-            client.setCookieHandler(cm);
+        // set cookie handler
+        CookieManager cm = new CookieManager();
+        cm.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+        client.setCookieHandler(cm);
 
-            // set timeouts
-            client.setConnectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS);
-            client.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
-            client.setWriteTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+        // set timeouts
+        client.setConnectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS);
+        client.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+        client.setWriteTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
 
-            // configure redirects
-            client.setFollowRedirects(true);
-            client.setFollowSslRedirects(true);
+        // configure redirects
+        client.setFollowRedirects(true);
+        client.setFollowSslRedirects(true);
 
-            httpClient = client;
+        if(16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
+            client.setSslSocketFactory(new CustomSslSocketFactory());
         }
-        return httpClient;
+        return client;
     }
 
     /**
@@ -64,4 +89,71 @@ public class AntennapodHttpClient {
             // does nothing at the moment
         }
     }
+
+    private static class CustomSslSocketFactory extends SSLSocketFactory {
+
+        private SSLSocketFactory factory;
+
+        public CustomSslSocketFactory() {
+            try {
+                SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+                sslContext.init(null, null, null);
+                factory= sslContext.getSocketFactory();
+            } catch(GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+        }
+
+        @Override
+        public String[] getDefaultCipherSuites() {
+            return factory.getDefaultCipherSuites();
+        }
+
+        @Override
+        public String[] getSupportedCipherSuites() {
+            return factory.getSupportedCipherSuites();
+        }
+
+        public Socket createSocket() throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket();
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(String var1, int var2) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(InetAddress var1, int var2) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException {
+            SSLSocket result = (SSLSocket) factory.createSocket(var1, var2, var3, var4);
+            configureSocket(result);
+            return result;
+        }
+
+        private void configureSocket(SSLSocket s) {
+            s.setEnabledProtocols(new String[] { "TLSv1.2", "TLSv1.1" } );
+        }
+
+    }
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index 5ed0a6ee3..3da3824a2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -522,29 +522,6 @@ public final class DBReader {
     }
 
     /**
-     * Loads FeedMedia whose file size is unknown
-     *
-     * @param context A context that is used for opening a database connection.
-     * @return A list of FeedMedia items whose size is 0 (unknown and never tried to
-     * determine the correct size)
-     */
-    public static List<FeedMedia> getFeedMediaUnknownSize(Context context) {
-        PodDBAdapter adapter = new PodDBAdapter(context);
-        adapter.open();
-        Cursor cursor = adapter.getFeedMediaUnknownSizeCursor();
-        List<FeedMedia> result = new ArrayList<>(cursor.getCount());
-        if (cursor.moveToFirst()) {
-            do {
-                FeedMedia media = extractFeedMediaFromCursorRow(cursor);
-                result.add(media);
-            } while (cursor.moveToNext());
-        }
-        cursor.close();
-        return result;
-    }
-
-
-    /**
      * Loads a list of FeedItems sorted by pubDate in descending order.
      *
      * @param context A context that is used for opening a database connection.
@@ -1141,7 +1118,7 @@ public final class DBReader {
 
         Comparator<Feed> comparator;
         int feedOrder = UserPreferences.getFeedOrder();
-        if(feedOrder == UserPreferences.FEED_ORDER_UNPLAYED_EPISODES) {
+        if(feedOrder == UserPreferences.FEED_ORDER_COUNTER) {
             comparator = new Comparator<Feed>() {
                 @Override
                 public int compare(Feed lhs, Feed rhs) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index 6ced03c0e..5a3822a81 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -5,9 +5,6 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.util.Log;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -28,11 +25,8 @@ import de.danoeh.antennapod.core.asynctask.FlattrClickWorker;
 import de.danoeh.antennapod.core.asynctask.FlattrStatusFetcher;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.service.FeedMediaSizeService;
 import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
@@ -578,8 +572,6 @@ public final class DBTasks {
 
         EventDistributor.getInstance().sendFeedUpdateBroadcast();
 
-        // context.startService(new Intent(context, FeedMediaSizeService.class));
-
         return resultFeeds;
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index edb7598ab..b179c6f24 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -1110,13 +1110,6 @@ public class PodDBAdapter {
         return db.rawQuery(query, null);
     }
 
-    public final Cursor getFeedMediaUnknownSizeCursor() {
-        final String query = "SELECT * "
-                + " FROM " + TABLE_NAME_FEED_MEDIA
-                + " WHERE " + KEY_SIZE + "<= 0";
-        return db.rawQuery(query, null);
-    }
-
     /**
      * Returns a cursor which contains all items of a feed that are considered new.
      * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection.
@@ -1301,16 +1294,16 @@ public class PodDBAdapter {
     }
 
     public final LongIntMap getFeedCounters(long... feedIds) {
-        int counter = UserPreferences.getFeedCounter();
+        int setting = UserPreferences.getFeedCounterSetting();
         String whereRead;
-        if(counter == UserPreferences.FEED_COUNTER_SHOW_NEW_UNPLAYED_SUM) {
+        if(setting == UserPreferences.FEED_COUNTER_SHOW_NEW_UNPLAYED_SUM) {
             whereRead = "(" + KEY_READ + "=" + FeedItem.NEW
                     + " OR " + KEY_READ  + "=" + FeedItem.UNPLAYED + ")";
-        } else if(counter == UserPreferences.FEED_COUNTER_SHOW_NEW) {
+        } else if(setting == UserPreferences.FEED_COUNTER_SHOW_NEW) {
             whereRead = KEY_READ + "=" + FeedItem.NEW;
-        } else if(counter == UserPreferences.FEED_COUNTER_SHOW_UNPLAYED) {
+        } else if(setting == UserPreferences.FEED_COUNTER_SHOW_UNPLAYED) {
             whereRead = KEY_READ + "=" + FeedItem.UNPLAYED;
-        } else {
+        } else { // NONE
             return new LongIntMap(0);
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
index 9296039f0..1b57baa11 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
@@ -7,10 +7,23 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.util.Log;
 
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import rx.Observable;
+import rx.Subscriber;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 public class NetworkUtils {
 
@@ -78,4 +91,59 @@ public class NetworkUtils {
 		return mWifi.isConnected();
 	}
 
+	public static Observable<Long> getFeedMediaSizeObservable(FeedMedia media) {
+        return Observable.create(new Observable.OnSubscribe<Long>() {
+            @Override
+            public void call(Subscriber<? super Long> subscriber) {
+                if (false == NetworkUtils.isDownloadAllowed()) {
+                    subscriber.onNext(0L);
+                    subscriber.onCompleted();
+                    return;
+                }
+                long size = Integer.MIN_VALUE;
+                if (media.isDownloaded()) {
+                    File mediaFile = new File(media.getLocalMediaUrl());
+                    if (mediaFile.exists()) {
+                        size = mediaFile.length();
+                    }
+                } else if (false == media.checkedOnSizeButUnknown()) {
+                    // only query the network if we haven't already checked
+                    OkHttpClient client = AntennapodHttpClient.getHttpClient();
+                    Request.Builder httpReq = new Request.Builder()
+                            .url(media.getDownload_url())
+                            .header("Accept-Encoding", "identity")
+                            .head();
+                    try {
+                        Response response = client.newCall(httpReq.build()).execute();
+                        if (response.isSuccessful()) {
+                            String contentLength = response.header("Content-Length");
+                            try {
+                                size = Integer.parseInt(contentLength);
+                            } catch (NumberFormatException e) {
+                                Log.e(TAG, Log.getStackTraceString(e));
+                            }
+                        }
+                    } catch (IOException e) {
+                        subscriber.onNext(0L);
+                        subscriber.onCompleted();
+                        Log.e(TAG, Log.getStackTraceString(e));
+                        return; // better luck next time
+                    }
+                }
+                Log.d(TAG, "new size: " + size);
+                if (size <= 0) {
+                    // they didn't tell us the size, but we don't want to keep querying on it
+                    media.setCheckedOnSizeButUnknown();
+                } else {
+                    media.setSize(size);
+                }
+                subscriber.onNext(size);
+                subscriber.onCompleted();
+                DBWriter.setFeedMedia(context, media);
+            }
+        })
+                .subscribeOn(Schedulers.newThread())
+				.observeOn(AndroidSchedulers.mainThread());
+    }
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index f31297b41..0de9863e7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -14,7 +14,6 @@ import org.jsoup.select.Elements;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.ShownotesProvider;
 
@@ -59,6 +58,8 @@ public class Timeline {
     private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/((\\d+))");
     private static final String TIMECODE_LINK = "<a class=\"timecode\" href=\"antennapod://timecode/%d\">%s</a>";
     private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b(?:(?:(([0-9][0-9])):))?(([0-9][0-9])):(([0-9][0-9]))\\b");
+    private static final Pattern LINE_BREAK_REGEX = Pattern.compile("<br *\\/?>");
+
 
     /**
      * Applies an app-specific CSS stylesheet and adds timecode links (optional).
@@ -82,11 +83,15 @@ public class Timeline {
             return null;
         }
         if (shownotes == null) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "shownotesProvider contained no shownotes. Returning empty string");
+            Log.d(TAG, "shownotesProvider contained no shownotes. Returning empty string");
             return "";
         }
 
+        // replace ASCII line breaks with HTML ones if shownotes don't contain HTML line breaks already
+        if(!LINE_BREAK_REGEX.matcher(shownotes).find()) {
+            shownotes = shownotes.replace("\n", "<br />");
+        }
+
         Document document = Jsoup.parse(shownotes);
 
         // apply style
@@ -97,10 +102,9 @@ public class Timeline {
         // apply timecode links
         if (addTimecodes) {
             Elements elementsWithTimeCodes = document.body().getElementsMatchingOwnText(TIMECODE_REGEX);
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Recognized " + elementsWithTimeCodes.size() + " timecodes");
+            Log.d(TAG, "Recognized " + elementsWithTimeCodes.size() + " timecodes");
             for (Element element : elementsWithTimeCodes) {
-                Matcher matcherLong = TIMECODE_REGEX.matcher(element.text());
+                Matcher matcherLong = TIMECODE_REGEX.matcher(element.html());
                 StringBuffer buffer = new StringBuffer();
                 while (matcherLong.find()) {
                     String h = matcherLong.group(1);