Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deprecated create((Observable.OnSubscribe<T>)

Browse Source
This commit is contained in:
heckler01 2018-04-11 19:16:08 -04:00 committed by ydinath
parent c82dce79eb
commit 00ace172fc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
View File

@ -75,7 +75,7 @@ public class AboutActivity extends AppCompatActivity {
} }
private void loadAsset(String filename) { private void loadAsset(String filename) {
subscription = Observable.create((Observable.OnSubscribe<String>) subscriber -> { subscription = Observable.fromCallable(()-> {
InputStream input = null; InputStream input = null;
try { try {
TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes( TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
@ -86,7 +86,6 @@ public class AboutActivity extends AppCompatActivity {
input = getAssets().open(filename); input = getAssets().open(filename);
String webViewData = IOUtils.toString(input, Charset.defaultCharset()); String webViewData = IOUtils.toString(input, Charset.defaultCharset());
if (!webViewData.startsWith("<!DOCTYPE html>")) { if (!webViewData.startsWith("<!DOCTYPE html>")) {
//webViewData = webViewData.replace("\n\n", "</p><p>");
webViewData = webViewData.replace("%", "&#37;"); webViewData = webViewData.replace("%", "&#37;");
webViewData = webViewData =
"<!DOCTYPE html>" + "<!DOCTYPE html>" +
@ -111,13 +110,13 @@ public class AboutActivity extends AppCompatActivity {
depth = 0; depth = 0;
} }
webViewData = String.format(webViewData, colorString); webViewData = String.format(webViewData, colorString);
subscriber.onNext(webViewData); return webViewData;
} catch (IOException e) { } catch (IOException e) {
subscriber.onError(e); Log.e(TAG, Log.getStackTraceString(e));
throw e;
} finally { } finally {
IOUtils.closeQuietly(input); IOUtils.closeQuietly(input);
} }
subscriber.onCompleted();
}) })
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())