sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-24 14:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when displaying network error. Fixes #350

Browse source
This commit is contained in:
Phillip Thelen 2016-01-20 15:50:20 +01:00
parent 48336c96ac
commit 0fb09f6ea7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Habitica/src/com/habitrpg/android/habitica/APIHelper.java
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica;
import android.app.Activity;
import android.content.DialogInterface;
import android.support.v7.app.AlertDialog;
@ -252,13 +253,13 @@ public class APIHelper implements ErrorHandler, Profiler {
return cause;
} else if (status >= 500 && status < 600) {
showConnectionProblemDialog(R.string.internal_error_api);
this.showConnectionProblemDialog(R.string.internal_error_api);
return cause;
} else if (status == 404 && cause.getUrl().endsWith("party/chat")) {
return cause;
}
}
showConnectionProblemDialog(R.string.internal_error_api);
this.showConnectionProblemDialog(R.string.internal_error_api);
return cause;
}
@ -268,7 +269,10 @@ public class APIHelper implements ErrorHandler, Profiler {
}
private void showConnectionProblemDialog(final int resourceTitleString, final int resourceMessageString) {
showConnectionProblemDialog(HabiticaApplication.currentActivity.getString(resourceTitleString), HabiticaApplication.currentActivity.getString(resourceMessageString));
Activity currentActivity = HabiticaApplication.currentActivity;
if (currentActivity != null) {
showConnectionProblemDialog(currentActivity.getString(resourceTitleString), currentActivity.getString(resourceMessageString));
}
}
private void showConnectionProblemDialog(final String resourceTitleString, final String resourceMessageString){