diff --git a/android/androidstatusbarcolor.cpp b/android/androidstatusbarcolor.cpp index 8cba462b83e4b186fad31e0d5427a891fe5704c3..751f57e5cf979ae59490bb8498798cb6b47aabdd 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 6c8ca65208a1fa1564ef19fc43309558faf892e0..cba3c55f47ad4665f2955f7e9d6bfa52db37f70d 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 );