Change targetSdkVersion to 31

Author: XuXiangJun

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.espressif.espblufi"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 26
-        versionName "1.6.0"
+        targetSdkVersion 31
+        versionCode 27
+        versionName "1.6.1"
     }
 
     buildTypes {
@@ -26,13 +26,13 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.0'
 
-    implementation 'io.reactivex.rxjava3:rxjava:3.0.13'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
 
-    implementation 'com.github.EspressifApp:lib-blufi-android:2.3.4'
+    implementation 'com.github.EspressifApp:lib-blufi-android:2.3.5'
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,9 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -25,6 +28,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ui.MainActivity"
+            android:exported="true"
             android:label="@string/main_title"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
@@ -36,15 +40,18 @@
         </activity>
         <activity
             android:name=".ui.BlufiActivity"
+            android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.ConfigureOptionsActivity"
+            android:exported="false"
             android:label="@string/configure_title"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.SettingsActivity"
+            android:exported="false"
             android:label="@string/settings_title"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />

app/src/main/java/com/espressif/espblufi/ui/BlufiActivity.java

@@ -1,5 +1,6 @@
 package com.espressif.espblufi.ui;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCallback;
@@ -41,6 +42,7 @@
 import blufi.espressif.response.BlufiStatusResponse;
 import blufi.espressif.response.BlufiVersionResponse;
 
+@SuppressLint("MissingPermission")
 public class BlufiActivity extends BaseActivity {
     private static final int REQUEST_CONFIGURE = 0x20;
 

app/src/main/java/com/espressif/espblufi/ui/MainActivity.java

@@ -1,6 +1,7 @@
 package com.espressif.espblufi.ui;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.BluetoothLeScanner;
@@ -47,6 +48,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+@SuppressLint("MissingPermission")
 public class MainActivity extends AppCompatActivity {
     private static final long TIMEOUT_SCAN = 4000L;
 
@@ -92,7 +94,17 @@ protected void onCreate(Bundle savedInstanceState) {
         mDeviceMap = new HashMap<>();
         mScanCallback = new ScanCallback();
 
-        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_PERMISSION);
+        List<String> permissionList = new ArrayList<>();
+        permissionList.add(Manifest.permission.ACCESS_FINE_LOCATION);
+        ActivityCompat.requestPermissions(
+                this,
+                new String[]{
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.BLUETOOTH_SCAN,
+                        Manifest.permission.BLUETOOTH_CONNECT
+                },
+                REQUEST_PERMISSION
+        );
     }
 
     @Override
@@ -105,6 +117,7 @@ protected void onDestroy() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         int size = permissions.length;
         for (int i = 0; i < size; ++i) {
             String permission = permissions[i];

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

log/updatelog-en.md

@@ -2,6 +2,13 @@
 
 # Update Log
 
+## v1.6.1
+- Change `targetSdkVersion` to 31
+- Update dependency libs version
+
+## v1.6.0
+- New app icon
+
 ## v1.5.3
 - Fix some bugs
 

log/updatelog-zh-rCN.md

@@ -2,6 +2,13 @@
 
 # 更新日志
 
+## 1.6.1
+- 修改 `targetSdkVersion` 为 31
+- 升级依赖库版本
+
+## v1.6.0
+- 新的应用图标
+
 ## 1.5.3
 - 修复 BUG