Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd096e7e authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '2376-android_14_compatibility' into 'main' 

feat:2376: Fix registerReceiver for Android 14 compatibility.

See merge request !9
parents 47063de9 8e65abd2

build.gradle

+1 −3
Original line number Diff line number Diff line
@@ -4,11 +4,9 @@ apply from : '../dependencies.gradle' 
apply from : '../exportdependencies/publish.gradle'



android {

    ndkVersion '21.3.6528147'



    defaultConfig {

        minSdkVersion 24

        targetSdkVersion 33

        targetSdkVersion 34

    }



    buildTypes {

src/main/java/org/torproject/android/service/OrbotService.java

+2 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import IPtProxy.IPtProxy; 
import androidx.annotation.NonNull;

import androidx.annotation.RequiresApi;

import androidx.core.app.NotificationCompat;

import androidx.core.content.ContextCompat;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
@@ -574,7 +575,7 @@ public class OrbotService extends VpnService implements OrbotConstants { 
                filter.addAction(LOCAL_ACTION_NOTIFICATION_START);



                mActionBroadcastReceiver = new ActionBroadcastReceiver();

                registerReceiver(mActionBroadcastReceiver, filter);

                ContextCompat.registerReceiver(this, mActionBroadcastReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED);



                mIsServiceRunningBroadcastReceiver = new IsServiceRunningBroadcastReceiver();

                LocalBroadcastManager.getInstance(this).registerReceiver(