Fix for Android Qt6

sdrbase/util/android.cpp

@@ -95,6 +95,38 @@ void Android::moveTaskToBack()
     }
 }
 
+void Android::acquireWakeLock()
+{
+    QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+    if (activity.isValid()) {
+        activity.callMethod<void>("acquireWakeLock");
+    }
+}
+
+void Android::releaseWakeLock()
+{
+    QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+    if (activity.isValid()) {
+        activity.callMethod<void>("releaseWakeLock");
+    }
+}
+
+void Android::acquireScreenLock()
+{
+    QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+    if (activity.isValid()) {
+        activity.callMethod<void>("acquireScreenLock");
+    }
+}
+
+void Android::releaseScreenLock()
+{
+    QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+    if (activity.isValid()) {
+        activity.callMethod<void>("releaseScreenLock");
+    }
+}
+
 #else // QT_VERSION
 
 #include <QtAndroid>

sdrgui/mainwindow.cpp

@@ -1143,7 +1143,7 @@ void LoadConfigurationFSM::restoreGeometry()
         m_mainWindow->m_workspaces[i]->adjustSubWindowsAfterRestore();
 #ifdef ANDROID
         // On Android, workspaces seem to be restored to 0,20, rather than 0,0
-        m_mainWindow->m_workspaces[i]->move(m_workspaces[i]->pos().x(), 0);
+        m_mainWindow->m_workspaces[i]->move(m_mainWindow->m_workspaces[i]->pos().x(), 0);
         // Need to call updateGeometry, otherwise sometimes the layout is corrupted
         m_mainWindow->m_workspaces[i]->updateGeometry();
 #endif