diff options
author | pacien | 2018-02-16 18:23:01 +0100 |
---|---|---|
committer | pacien | 2018-02-16 18:23:01 +0100 |
commit | c359d78bcd45cb506bac51a616ef62af0845df85 (patch) | |
tree | e526bbf710d301310fdee6a0da6399fb79c71f66 /app/src/main/AndroidManifest.xml | |
parent | 680fe07b6ea000ee29ac28e2f48665433e7011df (diff) | |
download | tincapp-c359d78bcd45cb506bac51a616ef62af0845df85.tar.gz |
Refactor activities and service, locking app at daemon startup and shutdown
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r-- | app/src/main/AndroidManifest.xml | 15 |
1 files changed, 5 insertions, 10 deletions
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 @@ | |||
24 | <action android:name="android.intent.action.MAIN"/> | 24 | <action android:name="android.intent.action.MAIN"/> |
25 | <category android:name="android.intent.category.LAUNCHER"/> | 25 | <category android:name="android.intent.category.LAUNCHER"/> |
26 | </intent-filter> | 26 | </intent-filter> |
27 | <intent-filter> | ||
28 | <action android:name="org.pacien.tincapp.intent.action.CONNECT"/> | ||
29 | <data android:scheme="tinc"/> | ||
30 | <category android:name="android.intent.category.DEFAULT"/> | ||
31 | </intent-filter> | ||
27 | </activity> | 32 | </activity> |
28 | 33 | ||
29 | <activity | 34 | <activity |
@@ -37,16 +42,6 @@ | |||
37 | android:name=".activities.StatusActivity" | 42 | android:name=".activities.StatusActivity" |
38 | android:configChanges="orientation|screenSize" | 43 | android:configChanges="orientation|screenSize" |
39 | android:theme="@style/AppTheme.NoActionBar"> | 44 | android:theme="@style/AppTheme.NoActionBar"> |
40 | </activity> | ||
41 | |||
42 | <activity | ||
43 | android:name=".activities.LaunchActivity" | ||
44 | android:theme="@style/AppTheme.NoActionBar"> | ||
45 | <intent-filter> | ||
46 | <action android:name="org.pacien.tincapp.intent.action.CONNECT"/> | ||
47 | <data android:scheme="tinc"/> | ||
48 | <category android:name="android.intent.category.DEFAULT"/> | ||
49 | </intent-filter> | ||
50 | <intent-filter> | 45 | <intent-filter> |
51 | <action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/> | 46 | <action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/> |
52 | <category android:name="android.intent.category.DEFAULT"/> | 47 | <category android:name="android.intent.category.DEFAULT"/> |