From 6aa7143a249db3fd055df01ef581c6a32194e686 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Mon, 10 Apr 2017 14:52:36 +0200
Subject: [PATCH] Improve AndroidManifest.xml readability

---
 .../src/android/AndroidManifest.xml           | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/retroshare-qml-app/src/android/AndroidManifest.xml b/retroshare-qml-app/src/android/AndroidManifest.xml
index 92bedacdd..42c2e3f93 100644
--- a/retroshare-qml-app/src/android/AndroidManifest.xml
+++ b/retroshare-qml-app/src/android/AndroidManifest.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0"?>
-<manifest package="org.retroshare.android.qml_app" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="RetroShare">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name=".RetroShareQmlActivity" android:label="RetroShare QML" android:screenOrientation="unspecified" android:launchMode="singleTop">
+<manifest package="org.retroshare.android.qml_app"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionName="1.0" android:versionCode="1"
+          android:installLocation="auto">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication"
+                 android:hardwareAccelerated="true"
+                 android:label="RetroShare">
+        <activity android:name=".RetroShareQmlActivity"
+                  android:label="RetroShare QML"
+                  android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
+                  android:screenOrientation="unspecified"
+                  android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -78,7 +87,8 @@
         </receiver>
 
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-        <service android:process=":rs" android:name=".RetroShareAndroidService" android:label="RetroShare Service" android:exported="true">
+        <service android:name=".RetroShareAndroidService" android:process=":rs"
+                 android:label="RetroShare Service" android:exported="true">
             <!-- android:exported="true" Added to be able to run the service from adb shell -->
             <!-- android:process=":rs" is needed to force the service to run on a separate process than the Activity -->
 
@@ -92,8 +102,9 @@
                  one is which.
             -->
 
-            <!-- Application to launch -->
-            <meta-data android:name="android.app.lib_name" android:value="retroshare-android-service"/>
+            <!-- Qt Application to launch -->
+            <meta-data android:name="android.app.lib_name"
+                       android:value="retroshare-android-service"/>
             <!-- Application to launch -->
 
             <!-- Ministro -->
@@ -124,7 +135,10 @@
         </service>
 
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-        <service android:process=":nf" android:name=".RetroShareAndroidNotifyService" android:label="RetroShare Notify Service" android:exported="true">
+        <service android:name=".RetroShareAndroidNotifyService"
+                 android:label="RetroShare Notify Service"
+                 android:process=":nf"
+                 android:exported="true">
             <!-- android:exported="true" Added to be able to run the service from adb shell -->
             <!-- android:process=":nf" is needed to force the service to run on a separate process than the Activity -->