Skip to content

Update xkcdViewer provider to use HTTPS URLs #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update xkcdViewer provider to use HTTPS URLs #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xkcdViewer/src/main/java/net/bytten/xkcdviewer/XkcdComicDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public XkcdComicDefinition() {

@Override
public Uri getArchiveUrl() {
return Uri.parse("http://xkcd.com/archive/");
return Uri.parse("https://xkcd.com/archive/");
}

@Override
Expand All @@ -35,7 +35,7 @@ public String getAuthorLinkText() {

@Override
public Uri getAuthorLinkUrl() {
return Uri.parse("http://store.xkcd.com/");
return Uri.parse("https://store.xkcd.com/");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion xkcdViewer/src/main/java/net/bytten/xkcdviewer/XkcdComicInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public String getTitle() {

@Override
public String getUrl() {
return "http://xkcd.com/"+getId()+"/";
return "https://xkcd.com/"+getId()+"/";
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions xkcdViewer/src/main/java/net/bytten/xkcdviewer/XkcdComicProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class XkcdComicProvider implements IComicProvider {
private static final Pattern archiveItemPattern = Pattern.compile(
// group(1): comic number; group(2): date; group(3): title
"\\s*<a href=\"/(\\d+)/\" title=\"(\\d+-\\d+-\\d+)\">([^<]+)</a><br/>\\s*");
private static final String ARCHIVE_URL = "http://www.xkcd.com/archive/";
private static final String ARCHIVE_URL = "https://www.xkcd.com/archive/";

private XkcdComicDefinition def;

Expand All @@ -43,13 +43,13 @@ public Uri comicDataUrlForUrl(Uri url) {

@Override
public Uri createComicUrl(String comicId) {
return Uri.parse("http://xkcd.com/"+comicId+"/info.0.json");
return Uri.parse("https://xkcd.com/"+comicId+"/info.0.json");
}

@Override
public IComicInfo fetchComicInfo(Uri url) throws Exception {
// Uses xkcd's JSON interface
// (http://xkcd.com/json.html)
// (https://xkcd.com/json.html)
String text = Utility.blockingReadUri(url);
JSONObject obj = (JSONObject)new JSONTokener(text).nextValue();
Log.d("json", obj.names().toString());
Expand Down Expand Up @@ -91,7 +91,7 @@ public Uri fetchRandomComicUrl() throws Exception {

@Override
public Uri getFinalComicUrl() {
return Uri.parse("http://xkcd.com/info.0.json");
return Uri.parse("https://xkcd.com/info.0.json");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion xkcdViewer/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xkcdViewer v%s. Application for viewing xkcd comics with hover text.\n\n
xkcdViewer Copyright (C) 2009-2017, Tom Coxon, Tyler Breisacher, David
McCullough, Kristian Lundkvist.\n\n
xkcd is Copyright (C) 2006 - 2017, Randall Munroe (http://xkcd.com)\n\n
xkcd is Copyright (C) 2006 - 2017, Randall Munroe (https://xkcd.com)\n\n
Contains some menu icons from www.androidicons.com, licensed under a
Creative Commons Attribution - Share Alike license.\n\n
Application icon kindly donated by Johan Larsson.\n\n
Expand Down