Skip to content
Snippets Groups Projects
Commit 2e9faa89 authored by Armin Felder's avatar Armin Felder
Browse files

fix statusbarcolor function

parent 7d69e159
No related branches found
No related tags found
1 merge request!61Design
This commit is part of merge request !61. Comments created here will be created in the context of that merge request.
...@@ -29,10 +29,10 @@ AndroidStatusBarColor::AndroidStatusBarColor() ...@@ -29,10 +29,10 @@ AndroidStatusBarColor::AndroidStatusBarColor()
void AndroidStatusBarColor::setStatusBarColor( QString pColor ) void AndroidStatusBarColor::setStatusBarColor( QString pColor )
{ {
QAndroidJniObject jColor = QAndroidJniObject::fromString( pColor ); QAndroidJniObject jColor = QAndroidJniObject::fromString( pColor );
/* QAndroidJniObject::callStaticMethod<void>( QAndroidJniObject::callStaticMethod<void>(
"com/osalliance/rocketchatMobile/MainActivity", "com/osalliance/rocketchatMobile/MainActivity",
"setStatusBarColor", "setStatusBarColor",
"(Ljava/lang/String;)V", "(Ljava/lang/String;)V",
jColor.object<jstring>()); jColor.object<jstring>() );
*/
} }
...@@ -60,7 +60,6 @@ RocketChat::RocketChat( QGuiApplication *app ) ...@@ -60,7 +60,6 @@ RocketChat::RocketChat( QGuiApplication *app )
qRegisterMetaType<ConnectionState>( "ConnectionState" ); qRegisterMetaType<ConnectionState>( "ConnectionState" );
qRegisterMetaType<Qt::ApplicationState>( "Qt::ApplicationState" ); qRegisterMetaType<Qt::ApplicationState>( "Qt::ApplicationState" );
} }
RocketChat::~RocketChat() RocketChat::~RocketChat()
...@@ -104,8 +103,6 @@ void RocketChat::login( const QString &pServerId, const QString &pUsername, cons ...@@ -104,8 +103,6 @@ void RocketChat::login( const QString &pServerId, const QString &pUsername, cons
mStorage->wipeDb(); mStorage->wipeDb();
} }
qDebug() << "login thread id: " << QThread::currentThreadId();
if ( mServerStatus ) { if ( mServerStatus ) {
QMetaObject::invokeMethod( mServerMap.first(), "login", Q_ARG( QString, pUsername ), Q_ARG( QString, pPassword ) ); QMetaObject::invokeMethod( mServerMap.first(), "login", Q_ARG( QString, pUsername ), Q_ARG( QString, pPassword ) );
} }
...@@ -838,6 +835,7 @@ void RocketChat::onServerSlotsReady() ...@@ -838,6 +835,7 @@ void RocketChat::onServerSlotsReady()
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
connect( &mNotificationsObject, &Notifications::tokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection ); connect( &mNotificationsObject, &Notifications::tokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection );
connect( &mNotificationsObject, &Notifications::messageReceived, firstServer, &RocketChatServerData::switchChannel, Qt::UniqueConnection ); connect( &mNotificationsObject, &Notifications::messageReceived, firstServer, &RocketChatServerData::switchChannel, Qt::UniqueConnection );
#endif #endif
#ifdef Q_OS_IOS #ifdef Q_OS_IOS
connect( this, &RocketChat::pushTokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection ); connect( this, &RocketChat::pushTokenReceived, firstServer, &RocketChatServerData::sendPushToken, Qt::UniqueConnection );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment