History

Merge remote-tracking branch 'upstream/master' into android_signup

Gabriel Calero committed 8 years ago

Commit 13e2b992 parents 1422c17 7c9464549 files · +1814 −261Browse files

Showing the changes to interface/src/AndroidHelper.cpp (1 of 49 files). Show all

Unified · Split

interface/src/AndroidHelper.cpp+5−3
@@ -28,7 +28,7 @@ AndroidHelper::AndroidHelper() { · 27 unmodified lines
28AndroidHelper::~AndroidHelper() {28AndroidHelper::~AndroidHelper() {
29}29}
30 30
31void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene, QList<QString> args) {31void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene, QMap<QString, QString> args) {
32 emit androidActivityRequested(activityName, backToScene, args);32 emit androidActivityRequested(activityName, backToScene, args);
33}33}
34 34
@@ -52,8 +52,10 @@ void AndroidHelper::performHapticFeedback(int duration) { · 17 unmodified lines
52 emit hapticFeedbackRequested(duration);52 emit hapticFeedbackRequested(duration);
53}53}
54 54
55void AndroidHelper::showLoginDialog() {55void AndroidHelper::showLoginDialog(QUrl url) {
56 emit androidActivityRequested("Login", true);56 QMap<QString, QString> args;
57 args["url"] = url.toString();
58 emit androidActivityRequested("Login", true, args);
57}59}
58 60
59void AndroidHelper::processURL(const QString &url) {61void AndroidHelper::processURL(const QString &url) {