From 0ccb4eea9330072e69af79db2a50264643267266 Mon Sep 17 00:00:00 2001
From: Daniel <brikbusters@gmail.com>
Date: Sat, 2 Mar 2024 19:53:41 -0500
Subject: [PATCH] Stable USB support - Fixed USB packet reading - Session is
 closed on deliberate disconnect - Fixed unreliable event/video socket
 opening, code moved to C now Annoying blocking issue where connect returns 0
 but sets errno = 115 (operation in progress) It should be fine to just let it
 be since the camera detects the accept() Later on, this should be fixed -
 Improved thumbnail loading a little bit - Scripts menu doesn't automatically
 grab focus - Updated upstream stuff

---
 .idea/codeStyles/Project.xml                  |  5 ++
 .idea/deploymentTargetDropDown.xml            | 10 +++
 .idea/gradle.xml                              |  5 +-
 .idea/migrations.xml                          | 10 +++
 .../java/dev/danielc/fujiapp/Gallery.java     |  2 +-
 .../dev/danielc/fujiapp/ImageAdapter.java     | 19 ++--
 .../main/java/dev/danielc/fujiapp/LibU.java   | 41 ---------
 .../dev/danielc/fujiapp/MainActivity.java     |  2 +-
 .../main/java/dev/danielc/fujiapp/Tester.java |  8 --
 .../main/java/dev/danielc/fujiapp/Viewer.java |  8 ++
 app/src/main/java/libui/LibUI.java            | 29 +------
 app/src/main/res/layout/activity_test.xml     | 18 +---
 lib/backend.h                                 | 29 ++++---
 lib/camlib                                    |  2 +-
 lib/libuifw                                   |  2 +-
 lib/main.c                                    | 17 ++--
 lib/net.c                                     | 14 ++-
 lib/progress.c                                | 41 +--------
 lib/scripts.c                                 |  8 +-
 lib/tester.c                                  |  4 +-
 lib/usb.c                                     | 86 +------------------
 21 files changed, 98 insertions(+), 262 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/migrations.xml
 delete mode 100644 app/src/main/java/dev/danielc/fujiapp/LibU.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9dc3ac8..9bcde4e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -8,6 +8,11 @@
       <option name="SPACE_BEFORE_COLON" value="false" />
       <option name="SPACE_AFTER_COLON" value="false" />
     </codeStyleSettings>
+    <codeStyleSettings language="ObjectiveC">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..9a986ae
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae388c2..0897082 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..48052b2
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/dev/danielc/fujiapp/Gallery.java b/app/src/main/java/dev/danielc/fujiapp/Gallery.java
index 835abab..2fc4bd4 100644
--- a/app/src/main/java/dev/danielc/fujiapp/Gallery.java
+++ b/app/src/main/java/dev/danielc/fujiapp/Gallery.java
@@ -203,7 +203,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menuItem.setIcon(R.drawable.baseline_terminal_24);
 
-        return LibUI.handleMenu(menu);
+        return true;
     }
 }
 
diff --git a/app/src/main/java/dev/danielc/fujiapp/ImageAdapter.java b/app/src/main/java/dev/danielc/fujiapp/ImageAdapter.java
index 9ba852d..0bdcdbf 100644
--- a/app/src/main/java/dev/danielc/fujiapp/ImageAdapter.java
+++ b/app/src/main/java/dev/danielc/fujiapp/ImageAdapter.java
@@ -9,22 +9,16 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
-import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 
-import libui.LibUI;
-
 public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ImageViewHolder> {
     private Context context;
     private static int[] object_ids;
@@ -66,6 +60,7 @@ static void invalidThumb(Request req, int drawable_id) {
             @SuppressLint("UseCompatLoadingForDrawables")
             @Override
             public void run() {
+                // TODO: Open a popup with some file information
                 req.holder.itemView.setOnClickListener(null);
                 req.holder.image.setBackground(req.ctx.getDrawable(drawable_id));
             }
@@ -73,7 +68,6 @@ public void run() {
     }
 
     static void requestThread() {
-        Log.d("adpater", "Thread");
         while (!Backend.cGetKillSwitch()) {
             if (requests.size() == 0) {
                 try {
@@ -86,7 +80,7 @@ static void requestThread() {
             int id = req.object_id;
             byte[] jpegByteArray = Backend.cPtpGetThumb(id);
             if (jpegByteArray == null) {
-                Backend.reportError(Backend.PTP_IO_ERR, "Failed to get image thumbnail, stopping connection");
+                Backend.reportError(Backend.PTP_IO_ERR, "Failed to get thumbnail");
                 return;
             } else if (jpegByteArray.length == 0) {
                 // Unable to find thumbnail - assume it's a folder or non-jpeg
@@ -102,8 +96,8 @@ static void requestThread() {
 
                 Bitmap bitmap = BitmapFactory.decodeByteArray(jpegByteArray, 0, jpegByteArray.length, opt);
                 if (bitmap == null) {
-                    Backend.print("Image decode error");
-                    req.holder.itemView.setOnClickListener(null);
+                    // Invalid JPEG
+                    invalidThumb(req, R.drawable.baseline_question_mark_24);
                     continue;
                 }
                 req.holder.itemView.post(new Runnable() {
@@ -111,7 +105,6 @@ static void requestThread() {
                     @Override
                     public void run() {
                         req.holder.image.setImageBitmap(bitmap);
-                        req.holder.image.setForeground(req.ctx.getDrawable(R.drawable.ripple));
                     }
                 });
             } catch (OutOfMemoryError e) {
@@ -122,7 +115,9 @@ public void run() {
 
     @Override
     public void onBindViewHolder(ImageViewHolder holder, int position) {
-        holder.image.setBackground(context.getDrawable(R.drawable.light_button)); // :)
+        holder.image.setForeground(context.getDrawable(R.drawable.ripple));
+        holder.image.setBackground(context.getDrawable(R.drawable.light_button));
+        holder.image.setImageBitmap(null);
         position = holder.getAdapterPosition();
         Request req = new Request();
         req.ctx = context;
diff --git a/app/src/main/java/dev/danielc/fujiapp/LibU.java b/app/src/main/java/dev/danielc/fujiapp/LibU.java
deleted file mode 100644
index 45ce557..0000000
--- a/app/src/main/java/dev/danielc/fujiapp/LibU.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Temporary helper class for JNI
-package libui;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Environment;
-import android.provider.DocumentsContract;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Scanner;
-
-public class LibU {
-    public static byte[] readFileFromAssets(Context ctx, String file) throws Exception {
-        try {
-            InputStream inputStream = ctx.getAssets().open(file);
-            byte buffer[] = new byte[inputStream.available()];
-            inputStream.read(buffer);
-            inputStream.close();
-            return buffer;
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/dev/danielc/fujiapp/MainActivity.java b/app/src/main/java/dev/danielc/fujiapp/MainActivity.java
index 515dfd9..9f22e13 100644
--- a/app/src/main/java/dev/danielc/fujiapp/MainActivity.java
+++ b/app/src/main/java/dev/danielc/fujiapp/MainActivity.java
@@ -195,6 +195,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menuItem.setIcon(R.drawable.baseline_fact_check_24);
 
-        return LibUI.handleMenu(menu);
+        return true;
     }
 }
diff --git a/app/src/main/java/dev/danielc/fujiapp/Tester.java b/app/src/main/java/dev/danielc/fujiapp/Tester.java
index ec0763c..cbae1c8 100644
--- a/app/src/main/java/dev/danielc/fujiapp/Tester.java
+++ b/app/src/main/java/dev/danielc/fujiapp/Tester.java
@@ -6,7 +6,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.ClipData;
-import android.hardware.usb.UsbManager;
 import android.util.Log;
 import android.content.Intent;
 import android.text.Html;
@@ -17,18 +16,11 @@
 import android.os.Bundle;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
 import android.os.Handler;
-import android.os.Build;
 
-import java.net.Socket;
 import android.content.ClipboardManager;
 import android.widget.Toast;
 
-import libui.LibU;
-
 public class Tester extends AppCompatActivity {
     private Handler handler;
 
diff --git a/app/src/main/java/dev/danielc/fujiapp/Viewer.java b/app/src/main/java/dev/danielc/fujiapp/Viewer.java
index 75e66f8..41dfde7 100644
--- a/app/src/main/java/dev/danielc/fujiapp/Viewer.java
+++ b/app/src/main/java/dev/danielc/fujiapp/Viewer.java
@@ -270,6 +270,7 @@ protected void onDestroy() {
         Runtime.getRuntime().gc();
         handler = null;
         progressBar = null;
+        popupWindow.dismiss();
         popupWindow = null;
         super.onDestroy();
     }
@@ -301,6 +302,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (fileIsInMemory) {
+            super.onBackPressed();
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.viewer, menu);
diff --git a/app/src/main/java/libui/LibUI.java b/app/src/main/java/libui/LibUI.java
index 9a0715d..8e8ecc0 100644
--- a/app/src/main/java/libui/LibUI.java
+++ b/app/src/main/java/libui/LibUI.java
@@ -116,12 +116,11 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
         public void onNothingSelected(AdapterView<?> parent) {}
     }
 
-    private static class MyOnClickListener2 implements View.OnClickListener {
+    private static class MyOnClickListener implements View.OnClickListener {
         byte[] struct;
-        public MyOnClickListener2(byte[] struct) {
+        public MyOnClickListener(byte[] struct) {
             this.struct = struct;
         }
-
         @Override
         public void onClick(View v) {
             LibUI.callFunction(struct);
@@ -339,30 +338,6 @@ private static LibUI.Popup openWindow(String title, int options) {
         return popup;
     }
 
-    private static ViewGroup linearLayout(int orientation) {
-        LinearLayout layout = new LinearLayout(ctx);
-        layout.setOrientation(orientation);
-        layout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        return (ViewGroup)layout;
-    }
-
-    private static String getString(String name) {
-        Resources res = ctx.getResources();
-        return res.getString(res.getIdentifier(name, "string", ctx.getPackageName()));
-    }
-
-    private static View getView(String name) {
-        Resources res = ctx.getResources();
-        int id = res.getIdentifier(name, "id", ctx.getPackageName());
-        return ((Activity)ctx).findViewById(id);
-    }
-
-    private static void toast(String text) {
-        Toast.makeText(ctx, text, Toast.LENGTH_SHORT).show();
-    }
-
     private static void runRunnable(byte[] data) {
         Handler handler = new Handler(Looper.getMainLooper());
         handler.post(new Runnable() {
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
index f99eb9e..35a9e36 100644
--- a/app/src/main/res/layout/activity_test.xml
+++ b/app/src/main/res/layout/activity_test.xml
@@ -10,21 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/testerLog"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/testerLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Logs go here" />
-        </LinearLayout>
+            android:text="Logs go here" />
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/lib/backend.h b/lib/backend.h
index 3534fc3..8bf18ad 100644
--- a/lib/backend.h
+++ b/lib/backend.h
@@ -42,17 +42,9 @@
 
 struct AndroidBackend {
 	jobject main; // Backend global obj
-//	jobject cmd_socket;
-
 	jmethodID jni_print;
-
 	jmethodID send_text_m;
 
-//	jmethodID wifi_cmd_read;
-//	jmethodID wifi_cmd_write;
-//	jmethodID wifi_cmd_close;
-//	jobject wifi_cmd_buffer;
-
 	jobject progress_bar;
 	int download_progress;
 	int download_size;
@@ -71,14 +63,31 @@ struct AndroidBackend {
 
 extern struct AndroidBackend backend;
 
+// Thread safe JNIEnv storage
 void set_jni_env(JNIEnv *env);
 JNIEnv *get_jni_env();
 
 // Verbose print to log file
 void jni_verbose_log(char *str);
 
-void reset_connection();
-
 int jni_setup_usb(JNIEnv *env, jobject obj);
 
+static inline void app_increment_progress_bar(int read) {
+	// Measures progress on all threads
+	static int last_p = 0;
+
+	backend.download_progress += read;
+
+	int n = (((double)backend.download_progress) / (double)backend.download_size * 100.0);
+	if (last_p != n) {
+		if (n > 100) return;
+
+		JNIEnv *env = get_jni_env();
+
+		jmethodID method = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, backend.progress_bar), "setProgress", "(I)V");
+		(*env)->CallVoidMethod(env, backend.progress_bar, method, n);
+	}
+	last_p = n;
+}
+
 #endif
diff --git a/lib/camlib b/lib/camlib
index 3c2b7d0..8a27948 160000
--- a/lib/camlib
+++ b/lib/camlib
@@ -1 +1 @@
-Subproject commit 3c2b7d08d165773fe3a8c93783cd280971e0b09e
+Subproject commit 8a279487bd5d60bc19adecf1dcc2ca6270e7e5e7
diff --git a/lib/libuifw b/lib/libuifw
index 4532d61..c08c844 160000
--- a/lib/libuifw
+++ b/lib/libuifw
@@ -1 +1 @@
-Subproject commit 4532d614e3c20146e2162341ec91d684fd6983fc
+Subproject commit c08c844db48e8e5f115b798f1278ec76196fcdfe
diff --git a/lib/main.c b/lib/main.c
index ee7687c..0de53e6 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -41,12 +41,19 @@ struct PtpRuntime *luaptp_get_runtime() {
 void ptp_report_error(struct PtpRuntime *r, char *reason, int code) {
 	plat_dbg("Kill switch: %d tid: %d\n", r->io_kill_switch, gettid());
 	if (r->io_kill_switch) return;
+
+	// Safely disconnect if intentional
+	if (code == 0) {
+		plat_dbg("Closing session");
+		ptp_close_session(r);
+	}
+
 	r->io_kill_switch = 1;
 
 	if (r->connection_type == PTP_IP_USB) {
 		ptpip_close(r);
 	} else if (r->connection_type == PTP_USB) {
-		ptp_close(r);
+		ptp_device_close(r);
 	}
 
 	fuji_reset_ptp(r);
@@ -63,7 +70,7 @@ void ptp_report_error(struct PtpRuntime *r, char *reason, int code) {
 }
 
 void ptp_verbose_log(char *fmt, ...) {
-	//if (backend.log_buf == NULL) return;
+	if (backend.log_buf == NULL) return;
 
 	char buffer[512];
 	va_list args;
@@ -72,12 +79,12 @@ void ptp_verbose_log(char *fmt, ...) {
 	va_end(args);
 
 	__android_log_write(ANDROID_LOG_ERROR, "ptp_verbose_log", buffer);
-	if (backend.log_buf == NULL) return;
+	//if (backend.log_buf == NULL) return;
 	if (strlen(buffer) + backend.log_pos + 1 > backend.log_size) {
 		backend.log_buf = realloc(backend.log_buf, strlen(buffer) + backend.log_pos + 1);
 	}
 
-	strcpy(backend.log_buf + backend.log_pos, buffer);
+	strcpy(((char *)backend.log_buf) + backend.log_pos, buffer);
 	backend.log_pos += strlen(buffer);
 }
 
@@ -211,4 +218,4 @@ JNI_FUNC(jstring, cEndLogs)(JNIEnv *env, jobject thiz) {
 	backend.log_buf = NULL;
 
 	return str;
-}
\ No newline at end of file
+}
diff --git a/lib/net.c b/lib/net.c
index f14110e..7caff78 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -19,8 +19,6 @@
 #include "fuji.h"
 #include "backend.h"
 
-void app_increment_progress_bar(int read);
-
 #define CMD_BUFFER_SIZE 512
 
 struct PtpIpBackend {
@@ -43,7 +41,7 @@ int ndk_set_socket_wifi(int fd) {
 
 	// https://developer.android.com/ndk/reference/group/networking#android_setsocknetwork
 	void *lib = dlopen("libandroid.so", RTLD_NOW);
-	_android_setsocknetwork_td _android_setsocknetwork = dlsym(lib, "android_setsocknetwork");
+	_android_setsocknetwork_td _android_setsocknetwork = (_android_setsocknetwork_td)dlsym(lib, "android_setsocknetwork");
 
 	if (_android_setsocknetwork == NULL) {
 		return -1;
@@ -77,7 +75,7 @@ static int set_nonblocking_io(int sockfd, int enable) {
 
 #define ptp_verbose_log plat_dbg
 
-int ptpip_new_timeout_socket(char *addr, int port) {
+int ptpip_new_timeout_socket(char *addr, int port, long timeout_sec) {
 	int sockfd = socket(AF_INET, SOCK_STREAM, 0);
 
 	int rc = ndk_set_socket_wifi(sockfd);
@@ -147,7 +145,7 @@ int ptpip_new_timeout_socket(char *addr, int port) {
 	FD_ZERO(&fdset);
 	FD_SET(sockfd, &fdset);
 	struct timeval tv;
-	tv.tv_sec = 2;
+	tv.tv_sec = timeout_sec;
 	tv.tv_usec = 0;
 
 	plat_dbg("Waiting for select");
@@ -185,7 +183,7 @@ static struct PtpIpBackend *init_comm(struct PtpRuntime *r) {
 }
 
 int ptpip_connect(struct PtpRuntime *r, char *addr, int port) {
-	int fd = ptpip_new_timeout_socket(addr, port);
+	int fd = ptpip_new_timeout_socket(addr, port, 1);
 
 	struct PtpIpBackend *b = init_comm(r);
 
@@ -213,7 +211,7 @@ JNI_FUNC(jint, cConnectNative)(JNIEnv *env, jobject thiz, jstring ip, jint port)
 }
 
 int ptpip_connect_events(struct PtpRuntime *r, char *addr, int port) {
-	int fd = ptpip_new_timeout_socket(addr, port);
+	int fd = ptpip_new_timeout_socket(addr, port, 1);
 	struct PtpIpBackend *b = init_comm(r);
 	b->evfd = fd;
 	// No error checking.
@@ -234,7 +232,7 @@ JNI_FUNC(jint, cConnectNativeEvents)(JNIEnv *env, jobject thiz, jstring ip, jint
 }
 
 int ptpip_connect_video(struct PtpRuntime *r, char *addr, int port) {
-	int fd = ptpip_new_timeout_socket(addr, port);
+	int fd = ptpip_new_timeout_socket(addr, port, 1);
 	struct PtpIpBackend *b = init_comm(r);
 	b->vidfd = fd;
 	return 0;
diff --git a/lib/progress.c b/lib/progress.c
index 6ad3d09..c2d31cf 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -1,40 +1 @@
-// Progress bar / IO monitoring backend
-// Copyright 2024 by Daniel C (https://github.com/petabyt/camlib)
-#include <camlib.h>
-#include <time.h>
-#include <dlfcn.h>
-#include "app.h"
-#include "backend.h"
-
-JNI_FUNC(jboolean, cSetProgressBarObj)(JNIEnv *env, jobject thiz, jobject pg, jint size) {
-	static clock_t tm;
-	if (pg == NULL) {
-		plat_dbg("Time taken to download: %f", (double)(clock() - tm) / CLOCKS_PER_SEC);
-		(*env)->DeleteGlobalRef(env, backend.progress_bar);
-		backend.progress_bar = NULL;
-		return 0;
-	}
-	tm = clock();
-	backend.download_size = size;
-	backend.download_progress = 0;
-	backend.progress_bar = (*env)->NewGlobalRef(env, pg);
-	return 0;
-}
-
-void app_increment_progress_bar(int read) {
-	// Measures progress on all threads
-	static int last_p = 0;
-
-	backend.download_progress += read;
-
-	int n = (((double)backend.download_progress) / (double)backend.download_size * 100.0);
-	if (last_p != n) {
-		if (n > 100) return;
-
-		JNIEnv *env = get_jni_env();
-
-		jmethodID method = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, backend.progress_bar), "setProgress", "(I)V");
-		(*env)->CallVoidMethod(env, backend.progress_bar, method, n);
-	}
-	last_p = n;
-}
\ No newline at end of file
+// Progress bar / IO monitoring backend
// Copyright 2024 by Daniel C (https://github.com/petabyt/camlib)
#include <camlib.h>
#include <time.h>
#include <dlfcn.h>
#include "app.h"
#include "backend.h"

JNI_FUNC(jboolean, cSetProgressBarObj)(JNIEnv *env, jobject thiz, jobject pg, jint size) {
	static clock_t tm;
	if (pg == NULL) {
		plat_dbg("Time taken to download: %f", (double)(clock() - tm) / CLOCKS_PER_SEC);
		(*env)->DeleteGlobalRef(env, backend.progress_bar);
		backend.progress_bar = NULL;
		return 0;
	}
	tm = clock();
	backend.download_size = size;
	backend.download_progress = 0;
	backend.progress_bar = (*env)->NewGlobalRef(env, pg);
	return 0;
}
\ No newline at end of file
diff --git a/lib/scripts.c b/lib/scripts.c
index c4bbf91..bac97f9 100644
--- a/lib/scripts.c
+++ b/lib/scripts.c
@@ -30,7 +30,7 @@ uiScroll *fudge_scripts_screen() {
 	uiBox *box = uiNewVerticalBox();
 	uiBoxSetPadded(box, 1);
 
-	char *file = libu_get_txt_file(uiAndroidGetEnv(), uiAndroidGetCtx(), "script.lua");
+	char *file = ui_get_txt_file(uiAndroidGetEnv(), uiAndroidGetCtx(), "script.lua");
 
 	script_box = uiNewMultilineEntry();
 	uiMultilineEntrySetText(script_box, file);
@@ -42,10 +42,10 @@ uiScroll *fudge_scripts_screen() {
 	uiButtonOnClicked(b, on_click, NULL);
 	uiBoxAppend(box, uiControl(b), 0);
 
-	uiBoxAppend(box, uiControl(uiNewLabel("Lua plugins coming soon")), 0);
+	uiBoxAppend(box, uiControl(uiNewLabel("Lua plugins are a WIP")), 0);
 
 	uiBoxAppend(box, uiControl(uiNewLabel("Planned features:\n"
-						"- Scripts can have custom UIs\n"
+						"- Scripts can have custom UIs (libui-lua)\n"
 						"- Scripts can run as background tasks\n"
 						"- Automate things and workflows\n"
 						"- Bleeding edge experimental features!\n"
@@ -65,4 +65,4 @@ JNI_FUNC(jint, cFujiScriptsScreen)(JNIEnv *env, jobject thiz, jobject ctx) {
 
 	return 0;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/tester.c b/lib/tester.c
index 1f253d3..c4eefff 100644
--- a/lib/tester.c
+++ b/lib/tester.c
@@ -221,13 +221,15 @@ int fuji_test_usb(struct PtpRuntime *r) {
 
 	// Check size
 
-	tester_log("Downloading object of ID %d", arr->data[1]);
+	tester_log("Downloading object of ID %X", arr->data[1]);
 	rc = ptp_get_object(r, arr->data[1]);
 	tester_fail("Return code: %x, %d", ptp_get_return_code(r), ptp_get_payload_length(r));
 	if (rc) return rc;
 
 	rc = ptp_close_session(r);
 	if (rc) return rc;
+
+	ptp_device_close(r);
 }
 
 int fuji_test_suite(struct PtpRuntime *r, char *ip) {
diff --git a/lib/usb.c b/lib/usb.c
index 8969fa0..8de4f99 100644
--- a/lib/usb.c
+++ b/lib/usb.c
@@ -1,85 +1 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <linux/usbdevice_fs.h>
-#include <string.h>
-#include <camlib.h>
-#include "backend.h"
-#include "app.h"
-//#define PTP_FUNC(ret, name) JNIEXPORT ret JNICALL Java_camlib_CamlibBackend_##name
-
-// TODO: Use comm_backend?
-static struct PrivUSB {
-	jobject obj;
-	int fd;
-}usb_priv;
-
-int jni_setup_usb(JNIEnv *env, jobject obj) {
-	jclass class = (*env)->GetObjectClass(env, obj);
-	jmethodID get_fd = (*env)->GetMethodID(env, class, "getFileDescriptor", "()I");
-
-	jint fd = (*env)->CallIntMethod(env, obj, get_fd);
-	usb_priv.fd = (int)fd;
-}
-
-int jni_close_usb(JNIEnv *env) {
-	jclass class = (*env)->GetObjectClass(env, usb_priv.obj);
-	jmethodID close = (*env)->GetMethodID(env, class, "closeConnection", "()V");
-	(*env)->CallVoidMethod(env, usb_priv.obj, close);
-}
-
-JNI_FUNC(jint, cUSBConnectNative)(JNIEnv *env, jobject thiz, jobject usb) {
-	set_jni_env(env);
-
-	jni_setup_usb(env, usb);
-
-	ptp_reset(&backend.r);
-	backend.r.connection_type = PTP_USB;
-	backend.r.max_packet_size = 512;
-
-	return 0;
-}
-
-int ptp_device_init(struct PtpRuntime *r) {
-	// Unimplemented
-	return -1;
-}
-
-int ptp_cmd_write(struct PtpRuntime *r, void *to, int length) {
-	if (r->io_kill_switch) return -1;
-	struct usbdevfs_bulktransfer ctrl;
-	ctrl.ep = 0x01;
-	ctrl.len = length;
-	ctrl.data = to;
-	ctrl.timeout = PTP_TIMEOUT;
-	return ioctl(usb_priv.fd, USBDEVFS_BULK, &ctrl);
-}
-
-int ptp_cmd_read(struct PtpRuntime *r, void *to, int length) {
-	if (r->io_kill_switch) return -1;
-	struct usbdevfs_bulktransfer ctrl;
-	ctrl.ep = 0x81; // 0x82
-	ctrl.len = length;
-	ctrl.data = to;
-	ctrl.timeout = PTP_TIMEOUT;
-	int rc = ioctl(usb_priv.fd, USBDEVFS_BULK, &ctrl);
-	return rc;
-}
-
-int ptp_device_close(struct PtpRuntime *r) {
-	jni_close_usb(get_jni_env());
-	return -1;
-}
-
-int ptp_device_reset(struct PtpRuntime *r) {
-	return -1;
-}
-
-int ptp_read_int(struct PtpRuntime *r, void *to, int length) {
-	return -1;
-}
-
-int reset_int() {
-	return -1;
-}
+#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <linux/usbdevice_fs.h>
#include <string.h>
#include <camlib.h>
#include "backend.h"
#include "app.h"

// TODO: Use comm_backend?
static struct PrivUSB {
	jobject obj;
	int fd;
	int endpoint_in;
	int endpoint_out;
}usb_priv;

int jni_setup_usb(JNIEnv *env, jobject obj) {
	usb_priv.obj = (*env)->NewGlobalRef(env, obj);

	jclass class = (*env)->GetObjectClass(env, obj);
	jmethodID get_fd = (*env)->GetMethodID(env, class, "getFileDescriptor", "()I");
	jint fd = (*env)->CallIntMethod(env, obj, get_fd);
	usb_priv.fd = (int)fd;

	// Get endpoints - TODO: get interrupt endpoint
	jfieldID e_out = (*env)->GetFieldID(env, (*env)->FindClass(env, "camlib/SimpleUSB"), "endpointOut", "Landroid/hardware/usb/UsbEndpoint;");
	jfieldID e_in = (*env)->GetFieldID(env, (*env)->FindClass(env, "camlib/SimpleUSB"), "endpointIn", "Landroid/hardware/usb/UsbEndpoint;");
	jobject out = (*env)->GetObjectField(env, obj, e_out);
	jobject in = (*env)->GetObjectField(env, obj, e_in);
	jmethodID get_address = (*env)->GetMethodID(env, (*env)->FindClass(env, "android/hardware/usb/UsbEndpoint"), "getAddress", "()I");
	usb_priv.endpoint_out = (*env)->CallIntMethod(env, out, get_address);
	usb_priv.endpoint_in = (*env)->CallIntMethod(env, in, get_address);

	plat_dbg("USB Endpoints: %d< >%d", usb_priv.endpoint_in, usb_priv.endpoint_out);

	return 0;
}

JNI_FUNC(jint, cUSBConnectNative)(JNIEnv *env, jobject thiz, jobject usb) {
	set_jni_env(env);

	jni_setup_usb(env, usb);

	ptp_reset(&backend.r);
	backend.r.connection_type = PTP_USB;
	backend.r.max_packet_size = 512; // Android can go higher, but this will do

	return 0;
}

int ptp_device_init(struct PtpRuntime *r) {
	// connection done by frontend
	return -1;
}

int ptp_cmd_write(struct PtpRuntime *r, void *to, int length) {
	if (r->io_kill_switch) return -1;
	struct usbdevfs_bulktransfer ctrl;
	ctrl.ep = usb_priv.endpoint_out;
	ctrl.len = length;
	ctrl.data = to;
	ctrl.timeout = PTP_TIMEOUT;
	return ioctl(usb_priv.fd, USBDEVFS_BULK, &ctrl);
}

int ptp_cmd_read(struct PtpRuntime *r, void *to, int length) {
	if (r->io_kill_switch) return -1;
	struct usbdevfs_bulktransfer ctrl;
	ctrl.ep = usb_priv.endpoint_in;
	ctrl.len = length;
	ctrl.data = to;
	ctrl.timeout = PTP_TIMEOUT;
	int rc = ioctl(usb_priv.fd, USBDEVFS_BULK, &ctrl);

	if (rc > 0) app_increment_progress_bar(rc);

	return rc;
}

int ptp_device_close(struct PtpRuntime *r) {
	JNIEnv *env = get_jni_env();
	jclass class = (*env)->GetObjectClass(env, usb_priv.obj);
	jmethodID close = (*env)->GetMethodID(env, class, "closeConnection", "()V");
	(*env)->CallVoidMethod(env, usb_priv.obj, close);
	(*env)->DeleteGlobalRef(env, usb_priv.obj);
	return 0;
}

int ptp_device_reset(struct PtpRuntime *r) {
	return -1;
}

int ptp_read_int(struct PtpRuntime *r, void *to, int length) {
	return -1;
}

int reset_int() {
	return -1;
}
\ No newline at end of file