From c359d78bcd45cb506bac51a616ef62af0845df85 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 16 Feb 2018 18:23:01 +0100
Subject: Refactor activities and service, locking app at daemon startup and
 shutdown

---
 app/src/main/AndroidManifest.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f03a640..6826920 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,11 @@
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
+			<intent-filter>
+				<action android:name="org.pacien.tincapp.intent.action.CONNECT"/>
+				<data android:scheme="tinc"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+			</intent-filter>
 		</activity>
 
 		<activity
@@ -37,16 +42,6 @@
 			android:name=".activities.StatusActivity"
 			android:configChanges="orientation|screenSize"
 			android:theme="@style/AppTheme.NoActionBar">
-		</activity>
-
-		<activity
-			android:name=".activities.LaunchActivity"
-			android:theme="@style/AppTheme.NoActionBar">
-			<intent-filter>
-				<action android:name="org.pacien.tincapp.intent.action.CONNECT"/>
-				<data android:scheme="tinc"/>
-				<category android:name="android.intent.category.DEFAULT"/>
-			</intent-filter>
 			<intent-filter>
 				<action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-- 
cgit v1.2.3