konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.8.2: added a settings menu tab for connectivity options

Browse Source
This commit is contained in:
Evan Debenham
2020-07-13 01:59:19 -04:00
parent a312ea8350
commit 192ecce74b
15 changed files with 173 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/news/debugNews/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/DebugNews.java
View File

@@ -21,14 +21,19 @@
package com.shatteredpixel.shatteredpixeldungeon.services.news;
import com.watabou.noosa.Game;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
public class DebugNews extends NewsService {
@Override
public void checkForArticles(NewsResultCallback callback) {
public void checkForArticles(boolean useMetered, NewsResultCallback callback) {
if (!useMetered && !Game.platform.connectedToUnmeteredNetwork()){
callback.onConnectionFailed();
}
//turn on to test connection failure
if (false){

4
services/news/shatteredNews/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/ShatteredNews.java
View File

@@ -34,9 +34,9 @@ import java.util.Locale;
public class ShatteredNews extends NewsService {
@Override
public void checkForArticles(NewsResultCallback callback) {
public void checkForArticles(boolean useMetered, NewsResultCallback callback) {
if (!Game.platform.connectedToUnmeteredNetwork()){
if (!useMetered && !Game.platform.connectedToUnmeteredNetwork()){
callback.onConnectionFailed();
}

2
services/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/NewsService.java
View File

@@ -30,6 +30,6 @@ public abstract class NewsService {
public abstract void onConnectionFailed();
}
public abstract void checkForArticles( NewsResultCallback callback );
public abstract void checkForArticles(boolean useMetered, NewsResultCallback callback);
}

2
services/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/updates/UpdateService.java
View File

@@ -29,7 +29,7 @@ public abstract class UpdateService {
public abstract void onConnectionFailed();
}
public abstract void checkForUpdate( UpdateResultCallback callback );
public abstract void checkForUpdate( boolean useMetered, UpdateResultCallback callback );
public abstract void initializeUpdate( AvailableUpdateData update );

7
services/updates/debugUpdates/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/updates/DebugUpdates.java
View File

@@ -30,7 +30,12 @@ public class DebugUpdates extends UpdateService {
private static AvailableUpdateData debugUpdateInfo;
@Override
public void checkForUpdate(UpdateResultCallback callback) {
public void checkForUpdate(boolean useMetered, UpdateResultCallback callback) {
if (!useMetered && !Game.platform.connectedToUnmeteredNetwork()){
callback.onConnectionFailed();
return;
}
//turn on to test update UI
if (false){

5
services/updates/githubUpdates/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/updates/GitHubUpdates.java
View File

@@ -27,6 +27,7 @@ import com.badlogic.gdx.Net;
import com.watabou.noosa.Game;
import com.watabou.utils.Bundle;
import com.watabou.utils.DeviceCompat;
import com.watabou.utils.GameSettings;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -39,9 +40,9 @@ public class GitHubUpdates extends UpdateService {
private static Pattern versionCodePattern = Pattern.compile("internal version number: ([0-9]*)", Pattern.CASE_INSENSITIVE);
@Override
public void checkForUpdate(UpdateResultCallback callback) {
public void checkForUpdate(boolean useMetered, UpdateResultCallback callback) {
if (!Game.platform.connectedToUnmeteredNetwork()){
if (!useMetered && !Game.platform.connectedToUnmeteredNetwork()){
callback.onConnectionFailed();
return;
}