diff options
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java index f35db6436a..268a53044f 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceBase.java @@ -9,28 +9,27 @@ import android.os.IBinder; import android.util.Log; public class QtServiceBase extends Service { + private QtServiceDelegate m_delegate; - private final QtServiceDelegate m_delegate = new QtServiceDelegate(this); - QtServiceLoader m_loader = new QtServiceLoader(this); - protected void onCreateHook() { - // the application has already started - // do not reload everything again + @Override + public void onCreate() + { + super.onCreate(); + + m_delegate = new QtServiceDelegate(this); + + // the application has already started, do not reload everything again if (QtNative.isStarted()) { - m_loader = null; Log.w(QtNative.QtTAG, "A QtService tried to start in the same process as an initiated " + "QtActivity. That is not supported. This results in the service " + "functioning as an Android Service detached from Qt."); - } else { - m_loader.onCreate(); + return; } - } - @Override - public void onCreate() - { - super.onCreate(); - onCreateHook(); + QtServiceLoader loader = new QtServiceLoader(this); + loader.loadQtLibraries(); + QtNative.startApplication(loader.getApplicationParameters(), loader.getMainLibrary()); } @Override |