Merge lp:~xavi-garcia-mena/unity-scope-youtube/disable-oa-button into lp:unity-scope-youtube

[Xavi Garcia]

Login button has been disabled. It will not appear in the surfacing screen.

[Marcus Tomlinson (marcustomlinson)]

So unfortunately this change is not enough to fix the related bug.

To avoid the splash screen popping up, we would need to comment out our instantiation of oa_client_ in start(), and then any code that uses oa_client_. Its the stuff in OnlineAccountClient that causes the splash screen to show up.

I don't like that we're doing this actually. The real bug is: https://bugs.launchpad.net/qtmir/+bug/1352251

and then: https://bugs.launchpad.net/ubuntu-system-settings-online-accounts/+bug/1380914

review: Needs Fixing

[Marcus Tomlinson (marcustomlinson)]

For future reference, here's how to recreate the issue:

1. Go to Settings->Accounts.
2. Remove your Google account(s) (if you have any).
3. Add your Google account.
4. Open the newly created Google account and enable Youtube.
5. Go to the Youtube scope (if favourited, you may need to enter a space into the search bar)

[lp:~xavi-garcia-mena/unity-scope-youtube/disable-oa-button]

118. By Xavi Garcia on 2014-11-14

Commented out all refferences to OA in order to prevent the black Online Accounts showing up

[Marcus Tomlinson (marcustomlinson)]

Unfortunately yes, this is "correct".

review: Approve

Unmerged revisions

118. By Xavi Garcia on 2014-11-14

Commented out all refferences to OA in order to prevent the black Online Accounts showing up

117. By Xavi Garcia on 2014-11-13

Disabled OA login button

=== modified file 'src/youtube/scope/query.cpp'
--- src/youtube/scope/query.cpp	2014-09-24 12:24:37 +0000
+++ src/youtube/scope/query.cpp	2014-11-14 08:09:14 +0000
@@ -520,6 +520,8 @@
 
 void Query::surfacing(const sc::SearchReplyProxy &reply) {
     bool include_login_nag = !client_->config()->authenticated;
+    // Disable login button for bug https://bugs.launchpad.net/unity-scope-youtube/+bug/1391595
+    include_login_nag = false;
 
     const sc::CannedQuery &query(sc::SearchQueryBase::query());
 

=== modified file 'src/youtube/scope/scope.cpp'
--- src/youtube/scope/scope.cpp	2014-11-03 10:10:36 +0000
+++ src/youtube/scope/scope.cpp	2014-11-14 08:09:14 +0000
@@ -40,15 +40,15 @@
     std::lock_guard<std::mutex> lock(config_mutex_);
     init_config();
 
-    for (auto const& status : oa_client_->get_service_statuses()) {
-        if (status.service_authenticated) {
-            config_->authenticated = true;
-            config_->access_token = status.access_token;
-            config_->client_id = status.client_id;
-            config_->client_secret = status.client_secret;
-            break;
-        }
-    }
+//    for (auto const& status : oa_client_->get_service_statuses()) {
+//        if (status.service_authenticated) {
+//            config_->authenticated = true;
+//            config_->access_token = status.access_token;
+//            config_->client_id = status.client_id;
+//            config_->client_secret = status.client_secret;
+//            break;
+//        }
+//    }
 
     if (!config_->authenticated) {
         cerr << "YouTube scope is unauthenticated" << endl;
@@ -72,20 +72,20 @@
             + "/../share/locale/";
     bindtextdomain(GETTEXT_PACKAGE, translation_directory.c_str());
 
-    if (getenv("YOUTUBE_SCOPE_IGNORE_ACCOUNTS") == nullptr) {
-        oa_client_.reset(
-                new sc::OnlineAccountClient(SCOPE_INSTALL_NAME,
-                        "sharing", "google"));
-        oa_client_->set_service_update_callback(
-                std::bind(&Scope::service_update, this, std::placeholders::_1));
-
-        ///! TODO: We should only be waiting here if we know that there is at least one Google account enabled.
-        ///        OnlineAccountClient needs to expose some functionality for us to determine that.
-
-        // Allow 1 second for the callback to initialize config_
-        std::unique_lock<std::mutex> lock(config_mutex_);
-        config_cond_.wait_for(lock, std::chrono::seconds(1), [this] { return config_ != nullptr; });
-    }
+//    if (getenv("YOUTUBE_SCOPE_IGNORE_ACCOUNTS") == nullptr) {
+//        oa_client_.reset(
+//                new sc::OnlineAccountClient(SCOPE_INSTALL_NAME,
+//                        "sharing", "google"));
+//        oa_client_->set_service_update_callback(
+//                std::bind(&Scope::service_update, this, std::placeholders::_1));
+//
+//        ///! TODO: We should only be waiting here if we know that there is at least one Google account enabled.
+//        ///        OnlineAccountClient needs to expose some functionality for us to determine that.
+//
+//        // Allow 1 second for the callback to initialize config_
+//        std::unique_lock<std::mutex> lock(config_mutex_);
+//        config_cond_.wait_for(lock, std::chrono::seconds(1), [this] { return config_ != nullptr; });
+//    }
     if (config_ == nullptr) {
         // If the callback was not invoked, default initialize config_
         init_config();