kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-20 18:48:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1452 from kiwix/feature/macgills/#1396-random-redirects

Browse Source 
#1396 Random button will use redirect urls
This commit is contained in:
Kelson 2019-09-11 07:27:03 +02:00 committed by GitHub
commit e09d90ebd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -93,6 +93,7 @@ import java.util.List;
import java.util.Locale;
import javax.inject.Inject;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.kiwix.kiwixmobile.BuildConfig;
import org.kiwix.kiwixmobile.R;
@ -774,9 +775,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
}
private KiwixWebView newTab() {
String mainPage =
Uri.parse(ZimContentProvider.CONTENT_URI + ZimContentProvider.getMainPage()).toString();
return newTab(mainPage);
return newTab(contentUrl(ZimContentProvider.getMainPage()));
}
private KiwixWebView newTab(String url) {
@ -1446,11 +1445,22 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
private void openArticle(String articleUrl) {
if (articleUrl != null) {
getCurrentWebView().loadUrl(
Uri.parse(ZimContentProvider.CONTENT_URI + articleUrl).toString());
getCurrentWebView().loadUrl(redirectOrOriginal(contentUrl(articleUrl)));
}
}
@NotNull
private String contentUrl(String articleUrl) {
return Uri.parse(ZimContentProvider.CONTENT_URI + articleUrl).toString();
}
@NotNull
private String redirectOrOriginal(String contentUrl) {
return ZimContentProvider.isRedirect(contentUrl)
? ZimContentProvider.getRedirect(contentUrl)
: contentUrl;
}
private void openRandomArticle() {
String articleUrl = ZimContentProvider.getRandomArticleUrl();
Log.d(TAG_KIWIX, "openRandomArticle: " + articleUrl);