From ec2442891590366b2c8a625551a92e74e9947393 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Mon, 13 Apr 2015 10:24:03 -0400 Subject: [PATCH] fix NPE crash if VPN prepare Intent is null on boot --- .../android/service/OnBootReceiver.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/service/OnBootReceiver.java b/src/org/torproject/android/service/OnBootReceiver.java index f87d2bb2..a97091e1 100644 --- a/src/org/torproject/android/service/OnBootReceiver.java +++ b/src/org/torproject/android/service/OnBootReceiver.java @@ -33,15 +33,15 @@ public class OnBootReceiver extends BroadcastReceiver { @SuppressLint("NewApi") public void startVpnService (Context context) - { - Intent intent = VpnService.prepare(context); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - - if (intent != null) { - context.startActivity(intent); - } + { + Intent intent = VpnService.prepare(context); - } + if (intent != null) { + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); + } + + } private void startService (String action, Context context) {