Skip to content

Commit a15b454

Browse files
author
ukanth
committed
more fixes for target sdk 34
1 parent 7619ecd commit a15b454

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

app/src/main/java/dev/ukanth/ufirewall/MainActivity.java

+20-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static dev.ukanth.ufirewall.util.SecurityUtil.REQ_ENTER_PATTERN;
3232

3333
import android.Manifest;
34+
import android.annotation.SuppressLint;
3435
import android.app.KeyguardManager;
3536
import android.app.NotificationManager;
3637
import android.content.ActivityNotFoundException;
@@ -113,6 +114,7 @@
113114
import dev.ukanth.ufirewall.util.PackageComparator;
114115
import dev.ukanth.ufirewall.util.SecurityUtil;
115116
import haibison.android.lockpattern.utils.AlpSettings;
117+
import kotlin.Suppress;
116118

117119

118120
public class MainActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, OnClickListener, SwipeRefreshLayout.OnRefreshListener,
@@ -280,6 +282,7 @@ private void registerLogService() {
280282
}
281283
}
282284

285+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
283286
private void registerUIRefresh() {
284287
IntentFilter filter = new IntentFilter("dev.ukanth.ufirewall.ui.CHECKREFRESH");
285288
uiRefreshReceiver = new BroadcastReceiver() {
@@ -295,9 +298,14 @@ public void onReceive(Context context, Intent intent) {
295298
}
296299
}
297300
};
298-
registerReceiver(uiRefreshReceiver, filter);
301+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
302+
registerReceiver(uiRefreshReceiver, filter, RECEIVER_EXPORTED);
303+
} else {
304+
registerReceiver(uiRefreshReceiver, filter);
305+
}
299306
}
300307

308+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
301309
private void registerThemeIntent() {
302310

303311
IntentFilter filter = new IntentFilter("dev.ukanth.ufirewall.theme.REFRESH");
@@ -308,7 +316,11 @@ public void onReceive(Context context, Intent intent) {
308316
recreate();
309317
}
310318
};
311-
registerReceiver(themeRefreshReceiver, filter);
319+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
320+
registerReceiver(themeRefreshReceiver, filter, RECEIVER_EXPORTED);
321+
} else {
322+
registerReceiver(themeRefreshReceiver, filter);
323+
}
312324
}
313325

314326
private void probeLogTarget() {
@@ -416,6 +428,7 @@ public void onBackPressed() {
416428
}*/
417429

418430

431+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
419432
private void registerToastbroadcast() {
420433
IntentFilter filter = new IntentFilter("TOAST");
421434
toastReceiver = new BroadcastReceiver() {
@@ -424,7 +437,11 @@ public void onReceive(Context context, Intent intent) {
424437
Api.toast(getApplicationContext(), intent.getExtras().get("MSG") != null ? intent.getExtras().get("MSG").toString() : "", Toast.LENGTH_SHORT);
425438
}
426439
};
427-
registerReceiver(toastReceiver, filter);
440+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
441+
registerReceiver(toastReceiver, filter, RECEIVER_EXPORTED);
442+
} else {
443+
registerReceiver(toastReceiver, filter);
444+
}
428445
}
429446

430447
private void registerUIbroadcast4() {

app/src/main/java/dev/ukanth/ufirewall/service/FirewallService.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,31 @@ public int onStartCommand(Intent intent, int flags, int startId) {
189189
connectivityReciver = new ConnectivityChangeReceiver();
190190
filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
191191
filter.addAction(ConnectivityChangeReceiver.TETHER_STATE_CHANGED_ACTION);
192-
registerReceiver(connectivityReciver, filter);
192+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
193+
registerReceiver(connectivityReciver, filter, RECEIVER_EXPORTED);
194+
} else {
195+
registerReceiver(connectivityReciver, filter);
196+
}
193197

194198
IntentFilter intentFilter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
195199
intentFilter.addDataScheme("package");
196200
packageReceiver = new PackageBroadcast();
197-
registerReceiver(packageReceiver, intentFilter);
201+
202+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
203+
registerReceiver(packageReceiver, intentFilter, RECEIVER_EXPORTED);
204+
} else {
205+
registerReceiver(packageReceiver, intentFilter);
206+
}
198207

199208

200209
intentFilter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
201210
intentFilter.addDataScheme("package");
202-
registerReceiver(packageReceiver, intentFilter);
211+
212+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
213+
registerReceiver(packageReceiver, intentFilter,RECEIVER_EXPORTED);
214+
} else {
215+
registerReceiver(packageReceiver, intentFilter);
216+
}
203217

204218
if(bluetoothAdapter == null) {
205219
bluetoothAdapter = getBTAdapter(context);

0 commit comments

Comments
 (0)