diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
index a0eb750548..c64effaedf 100644
--- a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
@@ -21,5 +21,5 @@ open class CoreModule {
     fun provideResources(context: Context, fabricPrivacy: FabricPrivacy): ResourceHelper = ResourceHelperImplementation(context, fabricPrivacy)
 
     @Provides
-    fun smsManager() : SmsManager = SmsManager.getDefault()
+    fun smsManager(context: Context) : SmsManager = context.getSystemService(SmsManager::class.java)
 }
\ No newline at end of file
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index bdc627f4af..08e2a76f30 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -1,5 +1,5 @@
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 28
         targetSdkVersion 28