Skip to content

Android 12 compartibility fixes. #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chaoba merged 2 commits into from
Aug 18, 2021
Merged

Android 12 compartibility fixes. #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c219bd
Android 12 compartibility fixes.
Aug 16, 2021
aa30a7b
Update leakCanary dependency.
Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ android {
applicationId "com.mapbox.mapboxsdk.plugins.testapp"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled = true
}

buildTypes {
Expand Down Expand Up @@ -42,19 +43,6 @@ android {
}
}

// Disable Leak Canary for UI and unit test.
configurations.all { config ->
if (config.name.contains('UnitTest') || config.name.contains('AndroidTest')) {
config.resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'com.squareup.leakcanary'
&& details.requested.name == 'leakcanary-android') {
details.useTarget(group: details.requested.group, name: 'leakcanary-android-no-op',
version: details.requested.version)
}
}
}
}

dependencies {
// Kotlin
implementation dependenciesList.kotlin
Expand All @@ -64,12 +52,15 @@ dependencies {
exclude group: 'android.arch.lifecycle'
exclude group: 'com.google.android.gms'
})
implementation dependenciesList.mapboxGeocoding
implementation (dependenciesList.mapboxGeocoding, {
exclude group: 'com.squareup.okhttp3'
})
Comment on lines +55 to +57
Copy link
Member

@pengdev pengdev Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we exclude the okhttp specifically?

Copy link
Contributor Author

@Chaoba Chaoba Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will conflict with another version of okhttp and cause a compile error.

implementation dependenciesList.mapboxTurf

// Architecture
implementation dependenciesList.lifecycleExtensions
implementation dependenciesList.roomRuntime
implementation dependenciesList.androidxMultidex
kapt dependenciesList.roomCompiler

// Google Play Services
Expand Down Expand Up @@ -103,8 +94,6 @@ dependencies {

// Leak canary
debugImplementation dependenciesList.leakCanaryDebug
releaseImplementation dependenciesList.leakCanaryRelease
testImplementation dependenciesList.leakCanaryTest

// Plugin modules
implementation project(':plugin-traffic')
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" package="com.mapbox.mapboxsdk.plugins.testapp">

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<application
Expand All @@ -14,7 +15,8 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<activity android:name=".activity.FeatureOverviewActivity">
<activity android:name=".activity.FeatureOverviewActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down Expand Up @@ -276,7 +278,8 @@
android:name="com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadService"
android:exported="false"/>

<receiver android:name="com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadStateReceiver">
<receiver android:name="com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadStateReceiver"
android:exported="false">
<intent-filter>
<action android:name="com.mapbox.mapboxsdk.plugins.offline"/>
</intent-filter>
Expand Down
10 changes: 2 additions & 8 deletions app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
package com.mapbox.mapboxsdk.plugins.testapp

import android.app.Application
import androidx.multidex.MultiDexApplication

import com.mapbox.mapboxsdk.Mapbox
import com.squareup.leakcanary.LeakCanary

import timber.log.Timber

class PluginApplication : Application() {
class PluginApplication : MultiDexApplication() {

override fun onCreate() {
super.onCreate()
if (LeakCanary.isInAnalyzerProcess(this)) {
return
}

LeakCanary.install(this)
initializeLogger()
Mapbox.getInstance(this, getString(R.string.mapbox_access_token))
}
Expand Down
13 changes: 7 additions & 6 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]

version = [
mapboxMapSdk : '9.6.0',
mapboxMapSdk : '9.6.2',
mapboxJava : '5.5.0',
mapboxTurf : '5.5.0',
playLocation : '16.0.0',
Expand All @@ -18,7 +18,7 @@
constraintLayout : '1.1.2',
mockito : '2.23.4',
mockk : '1.9.3',
leakCanary : '1.6.3',
leakCanary : '2.7',
timber : '4.7.1',
testRunner : '1.0.2',
espresso : '3.0.2',
Expand All @@ -27,7 +27,9 @@
lifecycleLiveData : '1.1.1',
room : '1.1.0',
androidArchCore : '1.1.0',
robolectric : '3.8'
robolectric : '3.8',
androidXCore : '1.5.0',
androidxMultidex : '2.0.1'
]

pluginVersion = [
Expand Down Expand Up @@ -56,6 +58,7 @@
autoValuesParcelAdapter: "com.ryanharter.auto.value:auto-value-parcel-adapter:${version.autoValueParcel}",

// support
androidCore : "androidx.core:core:${version.androidXCore}",
supportAnnotation : 'androidx.annotation:annotation:1.0.0',
supportAppcompatV7 : 'androidx.appcompat:appcompat:1.0.0',
supportV4 : 'androidx.legacy:legacy-support-v4:1.0.0',
Expand All @@ -69,12 +72,10 @@
lifecycleCompiler : "android.arch.lifecycle:compiler:${version.lifecycleCompiler}",
roomRuntime : 'androidx.room:room-runtime:2.0.0',
roomCompiler : 'androidx.room:room-compiler:2.0.0',

androidxMultidex : "androidx.multidex:multidex:${version.androidxMultidex}",
// square crew
timber : "com.jakewharton.timber:timber:${version.timber}",
leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${version.leakCanary}",
leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}",
leakCanaryTest : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}",

// instrumentation test
testRunner : 'androidx.test.ext:junit:1.1.1',
Expand Down
7 changes: 6 additions & 1 deletion .../main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Build;

import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions;

Expand Down Expand Up @@ -90,14 +91,18 @@ static Intent createCancelIntent(Context context, OfflineDownloadOptions offline
}

static PendingIntent createNotificationIntent(Context context, OfflineDownloadOptions offlineDownload) {
int flags = PendingIntent.FLAG_UPDATE_CURRENT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
flags |= PendingIntent.FLAG_IMMUTABLE;
}
Class returnActivity = offlineDownload.notificationOptions().getReturnActivity();
Intent notificationIntent = new Intent(context, returnActivity);
notificationIntent.putExtra(KEY_BUNDLE, offlineDownload);
return PendingIntent.getActivity(
context,
0,
notificationIntent,
PendingIntent.FLAG_UPDATE_CURRENT
flags
);
}
}
7 changes: 5 additions & 2 deletions ...n-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ public static NotificationCompat.Builder toNotificationBuilder(Context context,
PendingIntent contentIntent,
NotificationOptions options,
Intent cancelIntent) {
int flags = PendingIntent.FLAG_CANCEL_CURRENT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
flags |= PendingIntent.FLAG_IMMUTABLE;
}
return new NotificationCompat.Builder(context, OfflineConstants.NOTIFICATION_CHANNEL)
.setContentTitle(options.contentTitle())
.setContentText(options.contentText())
Expand All @@ -51,7 +55,6 @@ public static NotificationCompat.Builder toNotificationBuilder(Context context,
.setContentIntent(contentIntent)
.addAction(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP ? 0 : R.drawable.ic_cancel,
options.cancelText(),
PendingIntent.getService(context, offlineDownload.uuid().intValue(), cancelIntent,
PendingIntent.FLAG_CANCEL_CURRENT));
PendingIntent.getService(context, offlineDownload.uuid().intValue(), cancelIntent, flags));
}
}
2 changes: 2 additions & 0 deletions plugin-scalebar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ android {

dependencies {
implementation dependenciesList.mapboxMapSdk
implementation dependenciesList.supportAnnotation
implementation dependenciesList.androidCore
javadocDeps dependenciesList.mapboxMapSdk
testImplementation dependenciesList.kotlin
testImplementation dependenciesList.mockk
Expand Down