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
2828 AndroidHelper::~AndroidHelper() {
2929 }
3030
31−void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene, QList<QString> args) {
31+void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene, QMap<QString, QString> args) {
3232 emit androidActivityRequested(activityName, backToScene, args);
3333 }
3434
@@ -52,8 +52,10 @@ void AndroidHelper::performHapticFeedback(int duration) { · 17 unmodified lines
5252 emit hapticFeedbackRequested(duration);
5353 }
5454
55−void AndroidHelper::showLoginDialog() {
56− emit androidActivityRequested("Login", true);
55+void AndroidHelper::showLoginDialog(QUrl url) {
56+ QMap<QString, QString> args;
57+ args["url"] = url.toString();
58+ emit androidActivityRequested("Login", true, args);
5759 }
5860
5961 void AndroidHelper::processURL(const QString &url) {