Merge pull request #29 from cslrfid/release-2.3.0

Release 2.3.0

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 32
-        versionName "2.2.0"
+        versionCode 34
+        versionName "2.3.0"
     }
 }
 

app/src/main/java/com/csl/cs108ademoapp/fragments/ConnectionFragment.java

@@ -73,7 +73,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
                 if (mCs108Library4a.isBleConnected() && readerDevice.isConnected() && (readerDevice.getSelected() || false)) {
                     mCs108Library4a.disconnect(false);
-                    readerDevice.setConnected(false);
+                    readersList.clear();
                 } else if (mCs108Library4a.isBleConnected() == false && readerDevice.getSelected() == false) {
                     boolean validStart = false;
                     if (deviceConnectTask == null) {
@@ -95,15 +95,17 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                     }
                 }
 
-                if (readerDevice.getSelected()) readerDevice.setSelected(false);
-                else readerDevice.setSelected(true);
-                readersList.set(position, readerDevice);
-                for (int i = 0; i < readersList.size(); i++) {
-                    if (i != position) {
-                        ReaderDevice readerDevice1 = readersList.get(i);
-                        if (readerDevice1.getSelected()) {
-                            readerDevice1.setSelected(false);
-                            readersList.set(i, readerDevice1);
+                if (readersList.size() > position) {
+                    if (readerDevice.getSelected()) readerDevice.setSelected(false);
+                    else readerDevice.setSelected(true);
+                    readersList.set(position, readerDevice);
+                    for (int i = 0; i < readersList.size(); i++) {
+                        if (i != position) {
+                            ReaderDevice readerDevice1 = readersList.get(i);
+                            if (readerDevice1.getSelected()) {
+                                readerDevice1.setSelected(false);
+                                readersList.set(i, readerDevice1);
+                            }
                         }
                     }
                 }
@@ -157,7 +159,7 @@ public void run() {
             }
             if (operating == false) {
                 deviceScanTask = new DeviceScanTask();
-                deviceScanTask.execute(); mCs108Library4a.appendToLog("Started DeviceScanTask");
+                deviceScanTask.execute();
             }
             mHandler.postDelayed(checkRunnable, 5000);
         }
@@ -291,7 +293,7 @@ protected void onPreExecute() {
 
             MainActivity.mCs108Library4a.appendToLog("start of Connection with mrfidToWriteSize = " + mCs108Library4a.mrfidToWriteSize());
             mCs108Library4a.connect(connectingDevice);
-            waitTime = 20;
+            waitTime = 30;
             setting = -1;
             progressDialog = new CustomProgressDialog(getActivity(), prgressMsg);
             progressDialog.show();
@@ -333,7 +335,7 @@ protected void onCancelled(Integer result) {
                 Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.error_bluetooth_connection_failed), Toast.LENGTH_SHORT).show();
             }
             super.onCancelled();
-            mCs108Library4a.disconnect(false); mCs108Library4a.appendToLog("done");
+            mCs108Library4a.disconnect(false);
 
             bConnecting = false;
         }

app/src/main/java/com/csl/cs108ademoapp/fragments/HomeFragment.java

@@ -42,7 +42,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
             actionBar.setTitle(R.string.title_activity_home);
         }
         MainActivity.mDid = null;
-        if (MainActivity.sharedObjects.versioinWarningShown == false)
+        if (true || MainActivity.sharedObjects.versioinWarningShown == false)
             mHandler.post(runnableConfiguring);
     }
 

app/src/main/java/com/csl/cs108ademoapp/fragments/InventoryRfidiMultiFragment.java

@@ -265,6 +265,7 @@ public void onPause() {
 
     @Override
     public void onDestroy() {
+        mHandler.removeCallbacks(runnableCheckReady);
         MainActivity.mCs108Library4a.setNotificationListener(null);
         if (inventoryRfidTask != null) {
             if (DEBUG) MainActivity.mCs108Library4a.appendToLog("InventoryRfidiMultiFragment().onDestory(): VALID inventoryRfidTask");
@@ -354,6 +355,7 @@ void startStopHandler(boolean buttonTrigger) {
                 return;
             } else if (MainActivity.mCs108Library4a.mrfidToWriteSize() != 0) {
                 Toast.makeText(MainActivity.mContext, R.string.toast_not_ready, Toast.LENGTH_SHORT).show();
+                mHandler.post(runnableCheckReady);
                 return;
             }
             if (bAdd2End) rfidListView.setTranscriptMode(AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
@@ -568,4 +570,20 @@ void startInventoryTask() {
         }
         inventoryRfidTask.execute();
     }
+
+    private final Runnable runnableCheckReady = new Runnable() {
+        @Override
+        public void run() {
+            if (MainActivity.mCs108Library4a.mrfidToWriteSize() != 0) {
+                button.setEnabled(false);
+                button.setText("Please wait");
+                MainActivity.mCs108Library4a.setNotificationListener(null);
+                mHandler.postDelayed(runnableCheckReady, 500);
+            } else {
+                button.setText("Start");
+                button.setEnabled(true);
+                setNotificationListener();
+            }
+        }
+    };
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

cs108library4a/build.gradle

@@ -5,9 +5,9 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 32
-        versionName "2.2.0"
-        buildConfigField 'String', 'VERSION_NAME', "\"2.2.0\""
+        versionCode 34
+        versionName "2.3.0"
+        buildConfigField 'String', 'VERSION_NAME', "\"2.3.0\""
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }