Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-05-02 09:51:51 +02:00
commit b09ba0425a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
View file

@ -411,8 +411,8 @@ public class InAppHelper {
}
private void sendToken(String purchaseToken, final OnRequestResultListener listener) {
String userId = ctx.getSettings().BILLING_USER_ID.get();
String email = ctx.getSettings().BILLING_USER_EMAIL.get();
final String userId = ctx.getSettings().BILLING_USER_ID.get();
final String email = ctx.getSettings().BILLING_USER_EMAIL.get();
try {
Map<String, String> parameters = new HashMap<>();
parameters.put("userid", userId);
@ -458,11 +458,15 @@ public class InAppHelper {
ctx.getSettings().BILLING_USER_EMAIL.set(obj.getString("email"));
}
} else {
complain("SendToken Error: " + obj.getString("error"));
complain("SendToken Error: "
+ obj.getString("error")
+ " (userId=" + userId + " token=" + token + ")");
}
} catch (JSONException e) {
logError("SendToken", e);
complain("SendToken Error: " + (e.getMessage() != null ? e.getMessage() : "JSONException"));
complain("SendToken Error: "
+ (e.getMessage() != null ? e.getMessage() : "JSONException")
+ " (userId=" + userId + " token=" + token + ")");
}
}
if (listener != null) {
@ -518,7 +522,7 @@ public class InAppHelper {
private void complain(String message) {
logError("**** InAppHelper Error: " + message);
showToast("Error: " + message);
showToast(message);
}
private void showToast(final String message) {
@ -530,7 +534,7 @@ public class InAppHelper {
}
void logError(String msg) {
Log.e(TAG, "Error: " + msg);
Log.e(TAG, msg);
}
void logError(String msg, Throwable e) {