From b0fee3fd8b09adff7a8eb78e566d7a656f201f85 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 9 May 2018 11:06:32 -0300
Subject: [PATCH] Improve code based on changes requested in the PR

---
 android/app/src/main/cpp/native.cpp             | 17 +++++++----------
 .../hifiinterface/view/DomainAdapter.java       | 10 ++++++----
 interface/src/AndroidHelper.cpp                 |  7 -------
 interface/src/AndroidHelper.h                   |  6 ------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp
index 62ce9aec30..de2f6ec3e0 100644
--- a/android/app/src/main/cpp/native.cpp
+++ b/android/app/src/main/cpp/native.cpp
@@ -218,20 +218,17 @@ Java_io_highfidelity_hifiinterface_LoginActivity_nativeLogin(JNIEnv *env, jobjec
     env->ReleaseStringUTFChars(username_, c_username);
     env->ReleaseStringUTFChars(password_, c_password);
 
-    QSharedPointer<AccountManager> accountManager = AndroidHelper::instance().getAccountManager();
+    auto accountManager = DependencyManager::get<AccountManager>();
 
     __loginActivity = QAndroidJniObject(instance);
 
     QObject::connect(accountManager.data(), &AccountManager::loginComplete, [](const QUrl& authURL) {
-        AndroidHelper::instance().notifyLoginComplete(true);
+        jboolean jSuccess = (jboolean) true;
+        __loginActivity.callMethod<void>("handleLoginCompleted", "(Z)V", jSuccess);
     });
 
     QObject::connect(accountManager.data(), &AccountManager::loginFailed, []() {
-        AndroidHelper::instance().notifyLoginComplete(false);
-    });
-
-    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::loginComplete, [](bool success) {
-        jboolean jSuccess = (jboolean) success;
+        jboolean jSuccess = (jboolean) false;
         __loginActivity.callMethod<void>("handleLoginCompleted", "(Z)V", jSuccess);
     });
 
@@ -256,18 +253,18 @@ Java_io_highfidelity_hifiinterface_SplashActivity_registerLoadCompleteListener(J
 }
 JNIEXPORT jboolean JNICALL
 Java_io_highfidelity_hifiinterface_HomeActivity_nativeIsLoggedIn(JNIEnv *env, jobject instance) {
-    return AndroidHelper::instance().getAccountManager()->isLoggedIn();
+    return DependencyManager::get<AccountManager>()->isLoggedIn();
 }
 
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_HomeActivity_nativeLogout(JNIEnv *env, jobject instance) {
-    AndroidHelper::instance().getAccountManager()->logout();
+    DependencyManager::get<AccountManager>()->logout();
 }
 
 JNIEXPORT jstring JNICALL
 Java_io_highfidelity_hifiinterface_HomeActivity_nativeGetDisplayName(JNIEnv *env,
                                                                      jobject instance) {
-    QString username = AndroidHelper::instance().getAccountManager()->getAccountInfo().getUsername();
+    QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
     return env->NewStringUTF(username.toLatin1().data());
 }
 
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
index 4f6394636f..461b71eb7c 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
@@ -60,10 +60,12 @@ public class DomainAdapter extends RecyclerView.Adapter<DomainAdapter.ViewHolder
                 mDomains = new Domain[domain.size()];
                 mDomains = domain.toArray(mDomains);
                 notifyDataSetChanged();
-                if (mDomains.length == 0) {
-                    if (mAdapterListener != null) mAdapterListener.onEmptyAdapter();
-                } else {
-                    if (mAdapterListener != null) mAdapterListener.onNonEmptyAdapter();
+                if (mAdapterListener != null) {
+                    if (mDomains.length == 0) {
+                        mAdapterListener.onEmptyAdapter();
+                    } else {
+                        mAdapterListener.onNonEmptyAdapter();
+                    }
                 }
             }
 
diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp
index 339d2532a6..dd2c344620 100644
--- a/interface/src/AndroidHelper.cpp
+++ b/interface/src/AndroidHelper.cpp
@@ -17,10 +17,6 @@ AndroidHelper::AndroidHelper() {
 AndroidHelper::~AndroidHelper() {
 }
 
-QSharedPointer<AccountManager> AndroidHelper::getAccountManager() {
-    return DependencyManager::get<AccountManager>();
-}
-
 void AndroidHelper::requestActivity(const QString &activityName) {
     emit androidActivityRequested(activityName);
 }
@@ -33,6 +29,3 @@ void AndroidHelper::goBackFromAndroidActivity() {
     emit backFromAndroidActivity();
 }
 
-void AndroidHelper::notifyLoginComplete(bool success) {
-    emit loginComplete(success);
-}
diff --git a/interface/src/AndroidHelper.h b/interface/src/AndroidHelper.h
index b9f7407453..51d8723db9 100644
--- a/interface/src/AndroidHelper.h
+++ b/interface/src/AndroidHelper.h
@@ -27,10 +27,6 @@ public:
     void notifyLoadComplete();
     void goBackFromAndroidActivity();
 
-    void notifyLoginComplete(bool success);
-
-    QSharedPointer<AccountManager> getAccountManager();
-
     AndroidHelper(AndroidHelper const&)  = delete;
     void operator=(AndroidHelper const&) = delete;
 signals:
@@ -38,8 +34,6 @@ signals:
     void backFromAndroidActivity();
     void qtAppLoadComplete();
 
-    void loginComplete(bool success);
-
 private:
     AndroidHelper();
     ~AndroidHelper();