Various fixes mostly for the mobile version

android/AndroidManifest.xml

@@ -40,7 +40,7 @@
             <meta-data android:name="android.max_aspect" android:value="2.5"/>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

core/os/os-android.cpp

@@ -46,7 +46,6 @@ FILE *fopen_utf8(const char *path, const char *mode)
     {
         env->ExceptionDescribe();
         env->ExceptionClear();
-        return nullptr;
     }
 
     QAndroidJniObject parcelFileDescriptor = contentResolver

core/usblink.c

@@ -230,7 +230,6 @@ void put_file_next(struct packet *in) {
             }
 
             gui_status_printf("Send complete");
-            throttle_timer_on();
             put_file_state = DONE;
             break;
         case RECVING_FF_00:
@@ -277,6 +276,7 @@ void put_file_next(struct packet *in) {
     gui_usblink_changed(false);
 
 teardown:
+    throttle_timer_on();
     put_file_state = 0;
     fclose(put_file);
     put_file = NULL;

core/usblink_cx2.cpp

@@ -333,6 +333,7 @@ bool usblink_cx2_send_navnet(const uint8_t *data, uint16_t size)
 
     int len = sizeof(NNSEMessage) + size;
     NNSEMessage *msg = reinterpret_cast<NNSEMessage*>(malloc(len));
+    msg->misc = 0;
     msg->service = StreamService;
     msg->src = AddrMe;
     msg->dest = AddrCalc;

mainwindow.cpp

@@ -353,6 +353,7 @@ void MainWindow::debugStr(QString str)
 
 void MainWindow::debugCommand()
 {
+    emit debugStr(QStringLiteral("> %1\n").arg(ui->lineEdit->text()));
     emit debuggerCommand(ui->lineEdit->text());
     ui->lineEdit->clear();
 }

qml/ConfigPageDebug.qml

@@ -55,7 +55,9 @@ ColumnLayout {
     }
 
     FBLabel {
+        Layout.maximumWidth: parent.width
         text: qsTr("Remote access to internal debugger")
+        wrapMode: Text.WordWrap
         font.pixelSize: TextMetrics.title2Size
         Layout.topMargin: 10
         Layout.bottomMargin: 5

qml/ConfigPageFileTransfer.qml

@@ -44,6 +44,8 @@ ColumnLayout {
     }
 
     RowLayout {
+        Layout.maximumWidth: parent.width
+
         Button {
             text: qsTr("Send a file")
             // If this button is disabled, the transfer directory textinput has the focus again,

qml/ConfigPageKits.qml

@@ -24,13 +24,10 @@ ColumnLayout {
     }
 
     GroupBox {
-        id: groupBox1
-        Layout.minimumWidth: parent.width
-        Layout.maximumWidth: parent.width
+        Layout.fillWidth: true
         Layout.bottomMargin: -1
         title: qsTr("Kit Properties")
 
-
         GridLayout {
             anchors.fill: parent
             columns: (width < 550 || Qt.platform.os === "android") ? 2 : 4

qml/Firebird/UIComponents/KitList.qml

@@ -21,6 +21,8 @@ Rectangle {
         anchors.margins: parent.border.width
         anchors.fill: parent
 
+        activeFocusOnTab: true
+
         ListView {
             id: listView
 

qml/MobileUIConfig.qml

@@ -48,10 +48,7 @@ Item {
 
             Tab {
                 title: qsTranslate("ConfigPagesModel", rep.model.get(index).title)
-
-                Loader {
-                    source: file
-                }
+                source: file
             }
         }
     }

qmlbridge.cpp

@@ -319,8 +319,9 @@ QUrl QMLBridge::dir(QString path)
 
 QString QMLBridge::toLocalFile(QUrl url)
 {
+    // Pass through Android content url, see fopen_utf8
     if(url.scheme() == QStringLiteral("content"))
-        return url.toString(); // Pass through Android content url
+        return url.toString(QUrl::FullyEncoded);
 
     return url.toLocalFile();
 }
@@ -359,6 +360,9 @@ void QMLBridge::switchUIMode(bool mobile_ui)
 
 void QMLBridge::setActive(bool b)
 {
+    if(is_active == b)
+        return;
+
     if(b)
     {
         connect(&emu_thread, SIGNAL(speedChanged(double)), this, SLOT(speedChanged(double)), Qt::QueuedConnection);
@@ -388,6 +392,8 @@ void QMLBridge::setActive(bool b)
         disconnect(&emu_thread, SIGNAL(resumed(bool)), this, SLOT(resumed(bool)));
         disconnect(&emu_thread, SIGNAL(suspended(bool)), this, SLOT(suspended(bool)));
     }
+
+    is_active = b;
 }
 
 void QMLBridge::saveKits()

qmlbridge.h

@@ -170,6 +170,7 @@ public slots:
     double speed = 0;
     KitModel kit_model;
     QSettings settings;
+    bool is_active = false;
 };
 
 extern QMLBridge *the_qml_bridge;