Skip to content

Commit 41f19d6

Browse files
committed
Merge branch 'task/android_15_support' into 'master'
Android 15 support See merge request app-frameworks/esp-rainmaker-android!107
2 parents c764db7 + e31004f commit 41f19d6

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ if (localProperties.getProperty("isChinaRegion", "false") != "true") {
6464

6565
android {
6666

67-
compileSdk 34
67+
compileSdk 35
6868

6969
defaultConfig {
7070
applicationId "com.espressif.rainmaker"
7171
minSdkVersion 27
72-
targetSdkVersion 34
73-
versionCode 140
74-
versionName "3.5.2 - ${getGitHash()}"
72+
targetSdkVersion 35
73+
versionCode 143
74+
versionName "3.5.3 - ${getGitHash()}"
7575
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
7676

7777
buildConfigField "String", "GitHash", "\"${getGitHash()}\""

app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<category android:name="android.intent.category.DEFAULT" />
7777
<category android:name="android.intent.category.BROWSABLE" />
7878

79-
<data android:scheme="wxcced7aa3898dff73" /> <!-- Replace with your AppID -->
79+
<data android:scheme="your_app_id" /> <!-- Replace with your AppID -->
8080
</intent-filter>
8181
</activity>
8282

app/src/main/java/com/espressif/ui/activities/AboutAppActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class AboutAppActivity : AppCompatActivity() {
6363
var version = ""
6464
try {
6565
val pInfo = packageManager.getPackageInfo(packageName, 0)
66-
version = pInfo.versionName
66+
version = pInfo.versionName.toString()
6767
} catch (e: PackageManager.NameNotFoundException) {
6868
e.printStackTrace()
6969
}

app/src/main/java/com/espressif/ui/activities/ConsentActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ConsentActivity : AppCompatActivity() {
5858
var version = ""
5959
try {
6060
val pInfo = packageManager.getPackageInfo(packageName, 0)
61-
version = pInfo.versionName
61+
version = pInfo.versionName.toString()
6262
} catch (e: PackageManager.NameNotFoundException) {
6363
e.printStackTrace()
6464
}

app/src/main/java/com/espressif/ui/fragments/LoginFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
229229
try {
230230
val pInfo =
231231
requireActivity().packageManager.getPackageInfo(requireActivity().packageName, 0)
232-
version = pInfo.versionName
232+
version = pInfo.versionName.toString()
233233
} catch (e: Exception) {
234234
e.printStackTrace()
235235
}

0 commit comments

Comments
 (0)