Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-15 13:20:26 +02:00
commit dd94f5f810

View file

@ -460,13 +460,13 @@ public class InAppHelper {
} else {
complain("SendToken Error: "
+ obj.getString("error")
+ " (userId=" + userId + " token=" + token + ")");
+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
}
} catch (JSONException e) {
logError("SendToken", e);
complain("SendToken Error: "
+ (e.getMessage() != null ? e.getMessage() : "JSONException")
+ " (userId=" + userId + " token=" + token + ")");
+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
}
}
if (listener != null) {