Fix tablet landscape UI. Upgrade to Java 11. Update to SDK version 33…

…. Fix BT connect permissions issue.

MobilinkdTNC.iml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="MobilinkdTNC" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

build.gradle

@@ -21,8 +21,8 @@ allprojects {
 // modules in the project.
 ext {
     // The following are only a few examples of the types of properties you can define.
-    compileSdkVersion = 28
+    compileSdkVersion = 33
     // You can also create properties to specify versions for dependencies.
     // Having consistent versions between modules can avoid conflicts with behavior.
-    supportLibVersion = "28.0.0"
+    supportLibVersion = "33.0.0"
 }

library/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 33
     }
 
     buildTypes {

mobilinkdTNC/build.gradle

@@ -1,31 +1,35 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 33
+    buildToolsVersion '33.0.1'
 
     defaultConfig {
         applicationId "com.mobilinkd.tncconfig"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         // Defines the version number of your app.
-        versionCode 20
+        versionCode 23
 
         // Defines a user-friendly version name for your app.
-        versionName "1.4.1"
+        versionName "1.4.3"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    packagingOptions {
+        exclude 'META-INF/androidx.legacy_legacy-support-core-utils.version'
+    }
+
 }
 
 dependencies {

mobilinkdTNC/src/main/AndroidManifest.xml

@@ -3,8 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.mobilinkd.tncconfig">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" ></uses-permission>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="replace" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -19,6 +20,7 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name="com.mobilinkd.tncconfig.TncConfig"
+            android:exported="true"
             android:theme="@style/SampleTheme.Light"
             android:label="@string/app_name" >
             <intent-filter>
@@ -29,6 +31,7 @@
         </activity>
         <activity
             android:name="com.mobilinkd.tncconfig.DeviceListActivity"
+            android:exported="true"
             android:label="@string/title_activity_device_list"
             android:parentActivityName="com.mobilinkd.tncconfig.TncConfig" >
             <meta-data
@@ -37,6 +40,7 @@
         </activity>
         <activity
             android:name="com.mobilinkd.tncconfig.FirmwareUpdateActivity"
+            android:exported="true"
             android:label="@string/title_activity_firmware_update"
             android:theme="@style/FullscreenTheme" >
             <meta-data

mobilinkdTNC/src/main/java/com/mobilinkd/tncconfig/DeviceListActivity.java

@@ -32,6 +32,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 /**
  * This Activity appears as a dialog. It lists any paired devices and
@@ -86,15 +87,15 @@ protected void onCreate(Bundle savedInstanceState) {
         // Get a set of currently paired devices
         Set<BluetoothDevice> pairedDevices = mBtAdapter.getBondedDevices();
 
+        if (pairedDevices.size() == 0) {
+            Toast.makeText(this, R.string.msg_not_paired, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
         // If there are paired devices, add each one to the ArrayAdapter
-        if (pairedDevices.size() > 0) {
-            findViewById(R.id.title_paired_devices).setVisibility(View.VISIBLE);
-            for (BluetoothDevice device : pairedDevices) {
-                mPairedDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
-            }
-        } else {
-            String noDevices = getResources().getText(R.string.none_paired).toString();
-            mPairedDevicesArrayAdapter.add(noDevices);
+        findViewById(R.id.title_paired_devices).setVisibility(View.VISIBLE);
+        for (BluetoothDevice device : pairedDevices) {
+            mPairedDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
         }
     }
 
@@ -108,6 +109,11 @@ protected void onDestroy() {
         public void onItemClick(AdapterView<?> av, View v, int arg2, long arg3) {
             // Get the device MAC address, which is the last 17 chars in the View
             String info = ((TextView) v).getText().toString();
+
+            if (info == getResources().getText(R.string.none_paired).toString()) {
+                // do nothing...
+                return;
+            }
             String address = info.substring(info.length() - 17);
             if (D) Log.d(TAG, "onItemClick() -> " + address);