Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve code based on changes requested in the PR

Browse source
This commit is contained in:
Gabriel Calero 2018-05-09 11:06:32 -03:00
parent f21ef30d85
commit b0fee3fd8b
4 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
android/app/src/main/cpp/native.cpp
View file

@ -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());
}

10
android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
View file

@ -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();
}
}
}

7
interface/src/AndroidHelper.cpp
View file

@ -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);
}

6
interface/src/AndroidHelper.h
View file

@ -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();