diff options
| author | heckler01 <heckler01@hotmail.com> | 2018-04-11 19:16:08 -0400 |
|---|---|---|
| committer | ydinath <ydinath@gmail.com> | 2018-04-20 21:27:16 -0400 |
| commit | 00ace172fc7e3c36381a4b6766dde94b2f9c8606 (patch) | |
| tree | c6358de3718725dbd5812256e99b710164e1950f /app/src/main/java/de | |
| parent | c82dce79eb54d519d0bf8734c975c34852ac1753 (diff) | |
| download | AntennaPod-00ace172fc7e3c36381a4b6766dde94b2f9c8606.zip | |
Replace deprecated create((Observable.OnSubscribe<T>)
Diffstat (limited to 'app/src/main/java/de')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 11 |
1 files changed, 5 insertions, 6 deletions
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 041053a25..e29f4f525 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java @@ -75,7 +75,7 @@ public class AboutActivity extends AppCompatActivity { } private void loadAsset(String filename) { - subscription = Observable.create((Observable.OnSubscribe<String>) subscriber -> { + subscription = Observable.fromCallable(()-> { InputStream input = null; try { TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes( @@ -85,8 +85,7 @@ public class AboutActivity extends AppCompatActivity { res.recycle(); input = getAssets().open(filename); String webViewData = IOUtils.toString(input, Charset.defaultCharset()); - if(!webViewData.startsWith("<!DOCTYPE html>")) { - //webViewData = webViewData.replace("\n\n", "</p><p>"); + if (!webViewData.startsWith("<!DOCTYPE html>")) { webViewData = webViewData.replace("%", "%"); webViewData = "<!DOCTYPE html>" + @@ -111,13 +110,13 @@ public class AboutActivity extends AppCompatActivity { depth = 0; } webViewData = String.format(webViewData, colorString); - subscriber.onNext(webViewData); + return webViewData; } catch (IOException e) { - subscriber.onError(e); + Log.e(TAG, Log.getStackTraceString(e)); + throw e; } finally { IOUtils.closeQuietly(input); } - subscriber.onCompleted(); }) .subscribeOn(Schedulers.newThread()) .observeOn(AndroidSchedulers.mainThread()) |