From 2e9faa89d863e37b7a74c1c2552f8b766d1eeb41 Mon Sep 17 00:00:00 2001
From: Armin Felder <armin.felder@osalliance.com>
Date: Tue, 13 Nov 2018 01:58:27 +0100
Subject: [PATCH] fix statusbarcolor function
---
android/androidstatusbarcolor.cpp | 12 ++++++------
rocketchat.cpp | 4 +---
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/android/androidstatusbarcolor.cpp b/android/androidstatusbarcolor.cpp
index 8cba462..751f57e 100644
--- a/android/androidstatusbarcolor.cpp
+++ b/android/androidstatusbarcolor.cpp
@@ -29,10 +29,10 @@ AndroidStatusBarColor::AndroidStatusBarColor()
void AndroidStatusBarColor::setStatusBarColor( QString pColor )
{
QAndroidJniObject jColor = QAndroidJniObject::fromString( pColor );
- /* QAndroidJniObject::callStaticMethod<void>(
- "com/osalliance/rocketchatMobile/MainActivity",
- "setStatusBarColor",
- "(Ljava/lang/String;)V",
- jColor.object<jstring>());
- */
+ QAndroidJniObject::callStaticMethod<void>(
+ "com/osalliance/rocketchatMobile/MainActivity",
+ "setStatusBarColor",
+ "(Ljava/lang/String;)V",
+ jColor.object<jstring>() );
+
}
diff --git a/rocketchat.cpp b/rocketchat.cpp
index 6c8ca65..cba3c55 100755
--- a/rocketchat.cpp
+++ b/rocketchat.cpp
@@ -60,7 +60,6 @@ RocketChat::RocketChat( QGuiApplication *app )
qRegisterMetaType<ConnectionState>( "ConnectionState" );
qRegisterMetaType<Qt::ApplicationState>( "Qt::ApplicationState" );
-
}
RocketChat::~RocketChat()
@@ -104,8 +103,6 @@ void RocketChat::login( const QString &pServerId, const QString &pUsername, cons
mStorage->wipeDb();
}
- qDebug() << "login thread id: " << QThread::currentThreadId();
-
if ( mServerStatus ) {
QMetaObject::invokeMethod( mServerMap.first(), "login", Q_ARG( QString, pUsername ), Q_ARG( QString, pPassword ) );
}
@@ -838,6 +835,7 @@ void RocketChat::onServerSlotsReady()
#ifdef Q_OS_ANDROID
connect( &mNotificationsObject, &Notifications::tokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection );
connect( &mNotificationsObject, &Notifications::messageReceived, firstServer, &RocketChatServerData::switchChannel, Qt::UniqueConnection );
+
#endif
#ifdef Q_OS_IOS
connect( this, &RocketChat::pushTokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection );
--
GitLab