summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2020-09-30 10:50:25 +0200
committerByteHamster <info@bytehamster.com>2020-09-30 10:50:25 +0200
commite9fa84af588a7d8bcdb50c581eeedd15da79e848 (patch)
tree407a8f36b9f610b7aab710854a492f748a0beff9 /app/src
parentbba5f224e6bef74585132c4095fd0f233d54050f (diff)
parentaf1a6a7ef92ed0ab6061c803f94bd22ad17a6243 (diff)
downloadAntennaPod-e9fa84af588a7d8bcdb50c581eeedd15da79e848.zip
Merge branch 'master' into develop
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/assets/developers.csv18
-rw-r--r--app/src/main/assets/translators.csv85
-rw-r--r--app/src/main/java/de/danoeh/antennapod/PodcastApp.java3
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java1
-rw-r--r--app/src/main/java/de/danoeh/antennapod/error/CrashReportWriter.java (renamed from app/src/main/java/de/danoeh/antennapod/CrashReportWriter.java)11
-rw-r--r--app/src/main/java/de/danoeh/antennapod/error/RxJavaErrorHandlerSetup.java36
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java1
-rw-r--r--app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java3
-rw-r--r--app/src/main/res/layout/feeditemlist_item.xml5
10 files changed, 109 insertions, 56 deletions
diff --git a/app/src/main/assets/developers.csv b/app/src/main/assets/developers.csv
index ab8169eef..cff15ee38 100644
--- a/app/src/main/assets/developers.csv
+++ b/app/src/main/assets/developers.csv
@@ -5,38 +5,41 @@ TomHennen;5216560;Maintainer (retired)
orionlee;250644;Contributor
domingos86;9538859;Contributor
andersonvom;69922;Contributor
+TacoTheDank;32376686;Contributor
shortspider;5712543;Contributor
ebraminio;833473;Contributor
spacecowboy;223655;Contributor
patheticpat;16046;Contributor
+tonytamsf;149837;Contributor
brad;1614;Contributor
Cj-Malone;10121513;Contributor
maxbechtold;9162198;Contributor
+asdoi;36813904;Contributor
gaul;848247;Contributor
qkolj;6667105;Contributor
-tonytamsf;149837;Contributor
pachecosf;46357909;Contributor
+gerardolgvr;20119298;Contributor
+bws9000;262625;Contributor
ahangarha;11241315;Contributor
+damoasda;46045854;Contributor
hannesa2;3314607;Contributor
keunes;11229646;Contributor
rharriso;570910;Contributor
xgouchet;818706;Contributor
-damoasda;46045854;Contributor
sevenmaster;12869538;Contributor
TheRealFalcon;153674;Contributor
jas14;569991;Contributor
+johnjohndoe;144518;Contributor
udif;809640;Contributor
malockin;12814657;Contributor
dirkmueller;1029152;Contributor
jatinkumarg;20503830;Contributor
peschmae0;4450993;Contributor
-TacoTheDank;32376686;Contributor
orelogo;15976578;Contributor
txtd;7108931;Contributor
ydinath;4193331;Contributor
CedricCabessa;365097;Contributor
mchelen;30691;Contributor
-johnjohndoe;144518;Contributor
dethstar;1239177;Contributor
drabux;10663142;Contributor
saqura;1935380;Contributor
@@ -83,17 +86,18 @@ mr-intj;6268767;Contributor
tuxayo;2678215;Contributor
schlch;56929215;Contributor
alimemonzx;44647595;Contributor
+olivoto;15932680;Contributor
alanorth;191754;Contributor
alexte;7724992;Contributor
andrey-krutov;1488973;Contributor
arantius;84729;Contributor
-bws9000;262625;Contributor
chrissicool;232590;Contributor
cszucko;1810383;Contributor
CWftw;1498303;Contributor
danielm5;66779;Contributor
ariedov;958646;Contributor
brettle;118192;Contributor
+edwinhere;19705425;Contributor
eirikv;4076243;Contributor
eerden;277513;Contributor
jklippel;8657220;Contributor
@@ -104,13 +108,16 @@ kvithayathil;1056073;Contributor
luiscruz;1080714;Contributor
mlasson;5814258;Contributor
M-arcel;56698158;Contributor
+msoose;30473690;Contributor
mo;7117;Contributor
mdeveloper20;2319126;Contributor
+Slinger;75751;Contributor
mschuetz;108637;Contributor
MolarAmbiguity;10541979;Contributor
mounirlamouri;573590;Contributor
ortylp;470439;Contributor
PtilopsisLeucotis;54054883;Contributor
+ramzan;55637406;Contributor
SamWhited;512573;Contributor
selivan;1208989;Contributor
sonnayasomnambula;7716779;Contributor
@@ -123,6 +130,7 @@ edent;837136;Contributor
atrus6;357881;Contributor
waylife;3348620;Contributor
amhokies;3124968;Contributor
+andrewc1;19559401;Contributor
axq;5077221;Contributor
fossterer;4236021;Contributor
jmdouglas;10855634;Contributor
diff --git a/app/src/main/assets/translators.csv b/app/src/main/assets/translators.csv
index 90b98f8db..a7d289963 100644
--- a/app/src/main/assets/translators.csv
+++ b/app/src/main/assets/translators.csv
@@ -1,46 +1,45 @@
-Arabic;abdelrahman.fahem93, abdunnasir, abuzar3.khalid, desha, iDemo, mohamedagamy, msahouli, nabilMaghura, rex07, shubbar
+Arabic;abuzar3.khalid, keunes, nabilMaghura, rex07
Asturian (ast_ES);enolp
-Azerbaijani;danieloeh, kotfenix
-Basque;gaztainalde, pospolos, zakurranputza
-Bulgarian;bozhkov, ByteHamster, solusitor
-Catalan;dvd1985, exort12, javiercoll, Kintu, lambdani, marcmetallextrem, xc70
-Chinese (zh_CN);bebeauties38, cyril3, domingos86, dudeG, ErlichLiu, Felix2yu, gaohongyuan, Guaidaodl, Huck0, iconteral, jhxie, jxj2zzz79pfp9bpo, kavdx, kyleehee, linxiangyu, molisiye, owen8877, RainSlide, Sak94664, spice2wolf, stellaxuyi, tonytamsf, tupunco, wi24rd, wongsyrone, xukeek, yangyang, yiqiok, YogaGuru
-Chinese (zh_TW);ByteHamster, Fei1Yang, gugod, ijliao, nigelinux, pggdt, Solomon, tonytamsf, ymhuang0808
-Czech (cs_CZ);anotheranonymoususer, elich, Hanzmeister, mcepl, petnek, svetlemodry
-Danish;danieloeh, jhertel
-Dutch;e2jk, glotzbach, rwv, Vistaus
-English;mfietz, sterylmreep
-Estonian;ByteHamster, Eraser, mahfiaz
-Finnish;danieloeh, elguitar, Sahtor
-French;cactux, ChaoticMind, clombion, e2jk, edewaele, glotzbach, lacouture, LouFex, Matth78, mfietz, Poussinou, repat, Sioul, sterylmreep, TacoTheDank, Tilwa, vcariven, whenrow
+Basque;gaztainalde, keunes, Osoitz, pospolos
+Breton;Belvar, keunes
+Bulgarian;keunes, solusitor
+Catalan;carles.llacer, dvd1985, exort12, javiercoll, keunes, Kintu, lambdani, marcmetallextrem, xc70
+Chinese (zh_CN);brnme, cyril3, Felix2yu, gaohongyuan, Guaidaodl, Huck0, iconteral, jhxie, jxj2zzz79pfp9bpo, keunes, kyleehee, molisiye, owen8877, RainSlide, Sak94664, spice2wolf, tupunco, wongsyrone, yangyang, yiqiok
+Chinese (zh_TW);bobchao, ijliao, keunes, mapobi, pggdt, ymhuang0808
+Czech (cs_CZ);anotheranonymoususer, elich, Hanzmeister, svetlemodry, Thomaash
+Danish;jhertel, keunes, SebastianKiwiDk, twikedk
+Dutch;e2jk, keunes, rwv, Vistaus
+Estonian;Eraser, keunes, mahfiaz
+Finnish;Ban3, keunes, Sahtor
+French;ChaoticMind, clombion, Cornegidouille, e2jk, keunes, lacouture, LouFex, Matth78, Poussinou, sterylmreep
Galician;antiparvos, pikamoku, Raichely
-German;112358, altegedanken, barilla, benedikt.g, bitsunited, Buggi, ByteHamster, ceving, ChaoticMind, Chaquotay, csrichter, dab0015, dadosch, DerSilly, die_otto, DJaeger, elkangaroo, enz, f_grubm, fidel, finsterwalder, Foso, GNi33, hightower5, HolgerJeromin, kalei, Kenriec, lohmann, LostInWeb, mfietz, moasda, nilso, Quiss42, rakudave, repat, SAPlayer, schafia, Schroedingberg, sevenmaster, skyerjoe, sucaml, Teaspoon, theonlytruth, weltenwort, Wyrrrd, ypid
-Modern Greek (1453-);antonist, danieloeh, hua2016s, jack.ath92, MSavoritias, pavlosv
-Hebrew (he_IL);amir.dafnyman, E1i9, mongoose4004, pinkasey, rellieberman, Yaron, הלוי11
-Hindi (hi_IN);ankitiitb1069, Isaasu, nmabhinandan, purple.coder, realChakrawarti, siddhusengar
-Hungarian;glatz.balazs, hurrikan, lna91, marthynw, meskobalazs, naren93, tszauer, ttyborg42
-Icelandic;marthjod
-Indonesian;dbrw, jff, levirs565, luke137, rezafaiza, silvanael16
-Italian (it_IT);aalex70, allin, apanontin, Bonnee, buongiorgio, giuseppep, Guybrush88, ilmanzo, m.chinni, marco_pag, neonsoftware, niccord, nixxo, sevenmaster, theloca95
-Japanese;KotaKato, mamehacker, Naofumi, RACER1, sh3llc4t, TranslatorG
-Kannada (kn_IN);chiraag.nataraj, thejeshgn
-Korean;changwoo, libliboom, seungrye, skcha
-Lithuanian;naglis
+German;ByteHamster, ceving, dadosch, DerSilly, elkangaroo, enz, f_grubm, finsterwalder, HolgerJeromin, kalei, keunes, mfietz, Quiss42, repat, ypid
+Modern Greek (1453-);AnimaRain, antonist, keunes, pavlosv
+Hebrew (he_IL);amir.dafnyman, E1i9, mongoose4004, pinkasey, rellieberman, Yaron
+Hindi (hi_IN);keunes, purple.coder, siddhusengar
+Hungarian;hurrikan, keunes, lna91, marthynw, meskobalazs, naren93
+Icelandic;keunes, marthjod
+Indonesian;dbrw, keunes, levirs565
+Italian (it_IT);aalex70, allin, Bonnee, dontknowcris, giuseppep, Guybrush88, ilmanzo, keunes, m.chinni, marco_pag, neonsoftware, niccord, theloca95
+Japanese;keunes, KotaKato, Naofumi, sh3llc4t, TranslatorG
+Kannada (kn_IN);chiraag.nataraj, keunes, thejeshgn
+Korean;changwoo, keunes, libliboom
+Lithuanian;keunes, naglis
Macedonian;krisfremen
-Malayalam;joice, rashivkp, rubenroy
-Norwegian Bokmål (nb_NO);bablecopherye, corkie, Dexy2811, heraldo, jakobkg, kongk, sevenmaster, timbast
-Persian;ahangarha, danialbehzadi, ebraminio, F7D, hamidrezabayat76, sinamoghaddas, Twastica
-Polish (pl_PL);d6210809, hiro2020, Iwangelion, kRkk, lomapur, mandlus, maniexx, Mephistofeles, shark103, tyle
-Portuguese;andersonvom, domingos86, emansije, smarquespt
-Portuguese (pt_BR);alexupits, alysonborges, andersonvom, arua, caioau, carlo_valente, castrors, claudiofdasilva, deandreamatias, edman, Firmino, jackmiras, Junin, lipefire, lluccia, lucasmotacr, mbaltar, rogervezaro, RubeensVinicius, SamWilliam, silvanael16
-Romanian (ro_RO);corneliu.e, fuzzmz, ralienpp
-Russian (ru_RU);astra1, btimofeev, Duke_Raven, gammja, GaynullinDima, homocomputeris, IgorPolyakov, MegMasters98, mercutiy, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, shams4real, skvheadless, un_logic, Vladryyu, whereisthetea, zhenya97
-Slovak;ati3, ByteHamster, tiborepcek
-Slovenian (sl_SI);panter23
-Spanish;AleksSyntek, andersonvom, Atreyu94, coperfix, deandreamatias, domingos86, dvd1985, Fitoschido, frandavid100, hard_ware, javiercoll, Juanmuto, lambdani, LatinSuD, leogrignafini, palopezv, TacoTheDank, tres.14159, vfmatzkin, wakutiteo
-Swahili (macrolanguage);kmtra
-Swedish (sv_SE);albin.brantin, Bio, bpnilsson, ChaoticMind, jony08, nilso, SharpMelon, TiloWiklund, TwoD
-Telugu;Isaasu, veeven
-Turkish;abcmen, basarancaner, brsata, Erdy, golcuk, overbite, Slsdem
-Ukrainian (uk_UA);IndibidAbulya, older, paul_sm, sergiyr, zhenya97
-Vietnamese;abnvolk, nguyenvui, ppanhh, vietnamesel10n
+Malayalam;joice, keunes, rashivkp
+Norwegian Bokmål (nb_NO);abstrakct, bablecopherye, corkie, heraldo, jakobkg, keunes, kongk, sevenmaster, timbast
+Persian;ahangarha, danialbehzadi, ebraminio, F7D, hamidrezabayat76, keunes, sinamoghaddas
+Polish (pl_PL);hiro2020, Iwangelion, keunes, lomapur, mandlus, maniexx, Mephistofeles, shark103, tyle
+Portuguese;emansije, keunes, smarquespt
+Portuguese (pt_BR);alexupits, alysonborges, andersonvom, arua, caioau, carlo_valente, castrors, edman, keunes, lipefire, mbaltar, olivoto, rogervezaro, RubeensVinicius, SamWilliam
+Romanian (ro_RO);corneliu.e, fuzzmz, keunes, ralienpp
+Russian (ru_RU);btimofeev, Duke_Raven, gammja, homocomputeris, IgorPolyakov, keunes, mercutiy, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, un_logic, Vladryyu, whereisthetea
+Slovak;ati3, keunes, tiborepcek
+Slovenian (sl_SI);keunes, panter23
+Spanish;AleksSyntek, andersonvom, andrespelaezp, deandreamatias, dvd1985, Fitoschido, frandavid100, hard_ware, javiercoll, keunes, LatinSuD, leogrignafini, tres.14159, vfmatzkin, wakutiteo
+Swahili (macrolanguage);keunes, kmtra
+Swedish (sv_SE);bpnilsson, keunes, nilso, TwoD
+Telugu;keunes, veeven
+Turkish;brsata, Erdy, keunes, overbite, Slsdem
+Ukrainian (uk_UA);IndibidAbulya, keunes, older, paul_sm, sergiyr, zhenya97
+Vietnamese;abnvolk, keunes, ppanhh
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index ed3f4e8f1..534d48479 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -12,6 +12,8 @@ import com.joanzapata.iconify.fonts.MaterialModule;
import de.danoeh.antennapod.activity.SplashActivity;
import de.danoeh.antennapod.core.ApCoreEventBusIndex;
import de.danoeh.antennapod.core.ClientConfig;
+import de.danoeh.antennapod.error.CrashReportWriter;
+import de.danoeh.antennapod.error.RxJavaErrorHandlerSetup;
import de.danoeh.antennapod.spa.SPAUtil;
import org.greenrobot.eventbus.EventBus;
@@ -38,6 +40,7 @@ public class PodcastApp extends Application {
super.onCreate();
Thread.setDefaultUncaughtExceptionHandler(new CrashReportWriter());
+ RxJavaErrorHandlerSetup.setupRxJavaErrorHandler();
if (BuildConfig.DEBUG) {
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder()
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java
index b1a0ba2a2..d2618eb08 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java
@@ -7,7 +7,7 @@ import android.os.Bundle;
import com.google.android.material.snackbar.Snackbar;
import androidx.appcompat.app.AppCompatActivity;
import android.widget.TextView;
-import de.danoeh.antennapod.CrashReportWriter;
+import de.danoeh.antennapod.error.CrashReportWriter;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.util.IntentUtils;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index a0ad99e7d..c3cb6b0ba 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -102,6 +102,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
videoControlsHider.stop();
}
+ progressIndicator.setVisibility(View.GONE); // Controller released; we will not receive buffering updates
}
@Override
diff --git a/app/src/main/java/de/danoeh/antennapod/CrashReportWriter.java b/app/src/main/java/de/danoeh/antennapod/error/CrashReportWriter.java
index b5d0f6945..dc62863f9 100644
--- a/app/src/main/java/de/danoeh/antennapod/CrashReportWriter.java
+++ b/app/src/main/java/de/danoeh/antennapod/error/CrashReportWriter.java
@@ -1,8 +1,9 @@
-package de.danoeh.antennapod;
+package de.danoeh.antennapod.error;
import android.os.Build;
import android.util.Log;
+import de.danoeh.antennapod.BuildConfig;
import org.apache.commons.io.IOUtils;
import java.io.File;
@@ -31,6 +32,11 @@ public class CrashReportWriter implements Thread.UncaughtExceptionHandler {
@Override
public void uncaughtException(Thread thread, Throwable ex) {
+ write(ex);
+ defaultHandler.uncaughtException(thread, ex);
+ }
+
+ public static void write(Throwable exception) {
File path = getFile();
PrintWriter out = null;
try {
@@ -41,14 +47,13 @@ public class CrashReportWriter implements Thread.UncaughtExceptionHandler {
out.println();
out.println("## StackTrace");
out.println("```");
- ex.printStackTrace(out);
+ exception.printStackTrace(out);
out.println("```");
} catch (IOException e) {
Log.e(TAG, Log.getStackTraceString(e));
} finally {
IOUtils.closeQuietly(out);
}
- defaultHandler.uncaughtException(thread, ex);
}
public static String getSystemInfo() {
diff --git a/app/src/main/java/de/danoeh/antennapod/error/RxJavaErrorHandlerSetup.java b/app/src/main/java/de/danoeh/antennapod/error/RxJavaErrorHandlerSetup.java
new file mode 100644
index 000000000..1c7f5f0b4
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/error/RxJavaErrorHandlerSetup.java
@@ -0,0 +1,36 @@
+package de.danoeh.antennapod.error;
+
+import android.util.Log;
+import de.danoeh.antennapod.BuildConfig;
+import io.reactivex.exceptions.UndeliverableException;
+import io.reactivex.plugins.RxJavaPlugins;
+
+public class RxJavaErrorHandlerSetup {
+ private static final String TAG = "RxJavaErrorHandler";
+
+ private RxJavaErrorHandlerSetup() {
+
+ }
+
+ public static void setupRxJavaErrorHandler() {
+ RxJavaPlugins.setErrorHandler(exception -> {
+ if (exception instanceof UndeliverableException) {
+ // Probably just disposed because the fragment was left
+ Log.d(TAG, "Ignored exception: " + Log.getStackTraceString(exception));
+ return;
+ }
+
+ // Usually, undeliverable exceptions are wrapped in an UndeliverableException.
+ // If an undeliverable exception is a NPE (or some others), wrapping does not happen.
+ // AntennaPod threads might throw NPEs after disposing because we set controllers to null.
+ // Just swallow all exceptions here.
+ Log.e(TAG, Log.getStackTraceString(exception));
+ CrashReportWriter.write(exception);
+
+ if (BuildConfig.DEBUG) {
+ Thread.currentThread().getUncaughtExceptionHandler()
+ .uncaughtException(Thread.currentThread(), exception);
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
index 9999b0b37..3129aa43c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
@@ -383,6 +383,7 @@ public class AudioPlayerFragment extends Fragment implements
super.onStop();
controller.release();
controller = null;
+ progressIndicator.setVisibility(View.GONE); // Controller released; we will not receive buffering updates
EventBus.getDefault().unregister(this);
if (disposable != null) {
disposable.dispose();
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
index 2a157c23b..64dd03b00 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
@@ -5,12 +5,11 @@ import android.content.SharedPreferences;
import androidx.preference.PreferenceManager;
import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.CrashReportWriter;
+import de.danoeh.antennapod.error.CrashReportWriter;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences.EnqueueLocation;
import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
public class PreferenceUpgrader {
private static final String PREF_CONFIGURED_VERSION = "version_code";
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index c2bcced6f..7083365e7 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -45,11 +45,12 @@
android:id="@+id/coverHolder"
app:cardBackgroundColor="@color/non_square_icon_background"
app:cardCornerRadius="4dp"
+ app:cardPreventCornerOverlap="false"
app:cardElevation="0dp">
<RelativeLayout
- android:layout_width="@dimen/thumbnail_length_queue_item"
- android:layout_height="@dimen/thumbnail_length_queue_item">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
android:id="@+id/txtvPlaceholder"