History

Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid

Case 21893: Remove disabling of --url for Android.

NissimHadar committed 7 years ago

Commit facf8a92 parents dd2f8ff 171aebd1 file · +0 −4Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+0−4
@@ -3736,14 +3736,11 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 3735 unmodified lines
3736 3736
3737 // If this is a first run we short-circuit the address passed in3737 // If this is a first run we short-circuit the address passed in
3738 if (_firstRun.get()) {3738 if (_firstRun.get()) {
3739#if !defined(Q_OS_ANDROID)
3740 DependencyManager::get<AddressManager>()->goToEntry();3739 DependencyManager::get<AddressManager>()->goToEntry();
3741 sentTo = SENT_TO_ENTRY;3740 sentTo = SENT_TO_ENTRY;
3742#endif
3743 _firstRun.set(false);3741 _firstRun.set(false);
3744 3742
3745 } else {3743 } else {
3746#if !defined(Q_OS_ANDROID)
3747 QString goingTo = "";3744 QString goingTo = "";
3748 if (addressLookupString.isEmpty()) {3745 if (addressLookupString.isEmpty()) {
3749 if (Menu::getInstance()->isOptionChecked(MenuOption::HomeLocation)) {3746 if (Menu::getInstance()->isOptionChecked(MenuOption::HomeLocation)) {
@@ -3757,7 +3754,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 7 unmodified lines
3757 qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(!goingTo.isEmpty() ? goingTo : addressLookupString);3754 qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(!goingTo.isEmpty() ? goingTo : addressLookupString);
3758 DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);3755 DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
3759 sentTo = SENT_TO_PREVIOUS_LOCATION;3756 sentTo = SENT_TO_PREVIOUS_LOCATION;
3760#endif
3761 }3757 }
3762 3758
3763 UserActivityLogger::getInstance().logAction("startup_sent_to", {3759 UserActivityLogger::getInstance().logAction("startup_sent_to", {