From d0c45c1de12a38b5866bae73a09c63356beef405 Mon Sep 17 00:00:00 2001
From: Denton Gentry <dgentry@tailscale.com>
Date: Mon, 13 Mar 2023 11:28:13 -0700
Subject: [PATCH] Revert "IPNReceiver: Add intents to connect and disconnect
 VPN (#84)"

Reverting according to discussion in
https://github.com/tailscale/tailscale/issues/3547#issuecomment-1465035410

This reverts commit 51a53e54721fdb513d3c9331ae8e75a4b56a7cd2.
---
 android/src/main/AndroidManifest.xml          |  7 -------
 .../java/com/tailscale/ipn/IPNReceiver.java   | 20 -------------------
 cmd/tailscale/callbacks.go                    | 10 ----------
 3 files changed, 37 deletions(-)
 delete mode 100644 android/src/main/java/com/tailscale/ipn/IPNReceiver.java

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 7c4b06b..8dfe5f1 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -55,13 +55,6 @@
 				<data android:mimeType="video/*" />
 			</intent-filter>
 		</activity>
-		<receiver android:name="IPNReceiver"
-			android:exported="true">
-			<intent-filter>
-				<action android:name="com.tailscale.ipn.CONNECT_VPN" />
-				<action android:name="com.tailscale.ipn.DISCONNECT_VPN" />
-			</intent-filter>
-		</receiver>
 		<service android:name=".IPNService"
 			android:permission="android.permission.BIND_VPN_SERVICE"
 			android:exported="false">
diff --git a/android/src/main/java/com/tailscale/ipn/IPNReceiver.java b/android/src/main/java/com/tailscale/ipn/IPNReceiver.java
deleted file mode 100644
index e694727..0000000
--- a/android/src/main/java/com/tailscale/ipn/IPNReceiver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tailscale.ipn;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class IPNReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent.getAction() == "com.tailscale.ipn.CONNECT_VPN") {
-            connect();
-        } else if (intent.getAction() == "com.tailscale.ipn.DISCONNECT_VPN") {
-            disconnect();
-        }
-    }
-
-    private native void connect();
-    private native void disconnect();
-}
diff --git a/cmd/tailscale/callbacks.go b/cmd/tailscale/callbacks.go
index 1666c3f..0895a99 100644
--- a/cmd/tailscale/callbacks.go
+++ b/cmd/tailscale/callbacks.go
@@ -102,16 +102,6 @@ func Java_com_tailscale_ipn_IPNService_disconnect(env *C.JNIEnv, this C.jobject)
 	onDisconnect <- jni.NewGlobalRef(jenv, jni.Object(this))
 }
 
-//export Java_com_tailscale_ipn_IPNReceiver_connect
-func Java_com_tailscale_ipn_IPNReceiver_connect(env *C.JNIEnv, this C.jobject) {
-    requestBackend(ConnectEvent{Enable: true})
-}
-
-//export Java_com_tailscale_ipn_IPNReceiver_disconnect
-func Java_com_tailscale_ipn_IPNReceiver_disconnect(env *C.JNIEnv, this C.jobject) {
-    requestBackend(ConnectEvent{Enable: false})
-}
-
 //export Java_com_tailscale_ipn_App_onConnectivityChanged
 func Java_com_tailscale_ipn_App_onConnectivityChanged(env *C.JNIEnv, cls C.jclass, connected C.jboolean) {
 	select {