Fix printer Wi-Fi config flow to match working v1.0 behavior

.gitignore

@@ -1,6 +1,7 @@
 # Built application files
 *.apk
 *.aar
+!app/libs/BluetoothBinding.aar
 *.ap_
 *.aab
 

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.sunmi.printerconfig"
         minSdk 21
         targetSdk 35
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 11
+        versionName "1.0.10"
     }
 
     signingConfigs {
@@ -56,6 +56,7 @@ android {
 }
 
 dependencies {
+    implementation files('libs/BluetoothBinding.aar')
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

app/proguard-rules.pro

@@ -10,3 +10,12 @@
 
 # Keep printer configuration classes
 -keep class com.sunmi.printerconfig.** { *; }
+
+# Keep Sunmi SDK callback interfaces/classes used during Wi-Fi configuration.
+-keep class com.sunmi.cloudprinter.** { *; }
+-keep interface com.sunmi.cloudprinter.** { *; }
+
+# Keep callback implementers and SDK internals that may be invoked reflectively.
+-keep class * implements com.sunmi.cloudprinter.presenter.SunmiPrinterClient$IPrinterClient { *; }
+-keep class library.** { *; }
+-keep class com.inuker.bluetooth.library.** { *; }

app/src/main/AndroidManifest.xml

@@ -13,11 +13,14 @@
 
     <!-- Needed for Bluetooth discovery on Android 6-11 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- Wi-Fi permissions -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission
+        android:name="android.permission.NEARBY_WIFI_DEVICES"
+        android:usesPermissionFlags="neverForLocation" />
 
     <!-- Internet permission -->
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/com/sunmi/printerconfig/DiscoveredPrinter.java

@@ -0,0 +1,38 @@
+package com.sunmi.printerconfig;
+
+import java.util.Objects;
+
+public final class DiscoveredPrinter {
+    private final String address;
+    private final String name;
+
+    public DiscoveredPrinter(String address, String name) {
+        this.address = address == null ? "" : address.trim();
+        this.name = name == null ? "" : name.trim();
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof DiscoveredPrinter)) {
+            return false;
+        }
+        DiscoveredPrinter that = (DiscoveredPrinter) other;
+        return Objects.equals(address, that.address);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(address);
+    }
+}

app/src/main/java/com/sunmi/printerconfig/BluetoothDeviceAdapter.java → app/src/main/java/com/sunmi/printerconfig/DiscoveredPrinterAdapter.java

@@ -1,29 +1,24 @@
 package com.sunmi.printerconfig;
 
-import android.Manifest;
-import android.bluetooth.BluetoothDevice;
-import android.content.pm.PackageManager;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 
-public class BluetoothDeviceAdapter extends RecyclerView.Adapter<BluetoothDeviceAdapter.ViewHolder> {
-    private final List<BluetoothDevice> devices;
+public class DiscoveredPrinterAdapter extends RecyclerView.Adapter<DiscoveredPrinterAdapter.ViewHolder> {
+    private final List<DiscoveredPrinter> devices;
     private final OnDeviceClickListener listener;
 
     public interface OnDeviceClickListener {
-        void onDeviceClick(BluetoothDevice device);
+        void onDeviceClick(DiscoveredPrinter device);
     }
 
-    public BluetoothDeviceAdapter(List<BluetoothDevice> devices, OnDeviceClickListener listener) {
+    public DiscoveredPrinterAdapter(List<DiscoveredPrinter> devices, OnDeviceClickListener listener) {
         this.devices = devices;
         this.listener = listener;
     }
@@ -38,24 +33,18 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        BluetoothDevice device = devices.get(position);
-        boolean hasPermission = true;
+        DiscoveredPrinter device = devices.get(position);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            hasPermission = ContextCompat.checkSelfPermission(holder.itemView.getContext(),
-                Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED;
-        }
+        String baseName = device.getName().isEmpty()
+            ? holder.itemView.getContext().getString(R.string.unknown_device)
+            : device.getName();
 
-        if (hasPermission) {
-            String name = device.getName();
-            String address = device.getAddress();
-            holder.deviceName.setText(name != null ? name : "Unknown Device");
-            holder.deviceAddress.setText(address);
-        } else {
-            holder.deviceName.setText("Permission Required");
-            holder.deviceAddress.setText("");
+        if (PrinterDeviceClassifier.isLikelySunmi(device.getName())) {
+            baseName = baseName + " \u2022 " + holder.itemView.getContext().getString(R.string.likely_sunmi);
         }
 
+        holder.deviceName.setText(baseName);
+        holder.deviceAddress.setText(device.getAddress());
         holder.itemView.setOnClickListener(v -> listener.onDeviceClick(device));
     }
 
@@ -65,8 +54,8 @@ public int getItemCount() {
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView deviceName;
-        TextView deviceAddress;
+        private final TextView deviceName;
+        private final TextView deviceAddress;
 
         ViewHolder(View itemView) {
             super(itemView);