From 0d55f71ff5049f0e0abbc866c7f5d84ea2164207 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Thu, 22 Nov 2018 16:20:40 +0530
Subject: Additional fixes (#449)

* Convert ToCloneOrNot to Kotlin

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* Cleanup and fix memory leak in SshKeyGen

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* Fix manifest issues

- Indent with 4 spaces
- Fix typo'd meta-data values

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* travis: Install build tools 28.0.3

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
---
 app/src/main/AndroidManifest.xml | 127 +++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 65 deletions(-)

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1bb0b487..16db4cbd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,77 +10,74 @@
 		tools:ignore="ProtectedPermissions"/>
 	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-	<application android:allowBackup="true"
-		android:icon="@mipmap/ic_launcher"
-		android:label="@string/app_name"
-		android:theme="@style/AppTheme"
-		android:supportsRtl="true">
-		<activity android:name=".PasswordStore" android:label="@string/app_name"
-			android:configChanges="orientation|screenSize">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
+    <application android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+        android:supportsRtl="true">
+        <activity
+            android:name=".PasswordStore"
+            android:label="@string/app_name"
+            android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".git.GitActivity"
+            android:parentActivityName=".PasswordStore">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.zeapo.pwdstore.PasswordStore" />
+        </activity>
 
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity android:name=".git.GitActivity"
-			android:parentActivityName=".PasswordStore">
-			<meta-data android:name="android.PARENT_ACTIVITY1"
-				android:value="com.zeapo.pwdstore.PasswordStore" />
-		</activity>
+        <activity
+            android:name=".UserPreference"
+            android:parentActivityName=".PasswordStore">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.zeapo.pwdstore.PasswordStore" />
+        </activity>
 
-        <activity android:name=".UserPreference"
-			android:parentActivityName=".PasswordStore">
+        <activity
+            android:name=".SshKeyGen"
+            android:parentActivityName=".PasswordStore">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.zeapo.pwdstore.PasswordStore" />
+        </activity>
 
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				android:value="com.zeapo.pwdstore.PasswordStore" />
-		</activity>
+        <service
+            android:name=".autofill.AutofillService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+            <meta-data android:name="android.accessibilityservice" android:resource="@xml/autofill_config" />
+        </service>
 
-		<activity android:name=".SshKeyGen"
-			android:parentActivityName=".PasswordStore">
+        <activity
+            android:name=".autofill.AutofillActivity"
+            android:parentActivityName=".PasswordStore"
+            android:documentLaunchMode="intoExisting"
+            android:excludeFromRecents="true"
+            tools:ignore="UnusedAttribute">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.zeapo.pwdstore.PasswordStore" />
+        </activity>
 
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				android:value="com.zeapo.pwdstore.PasswordStore" />
-		</activity>
+        <activity
+            android:name=".autofill.AutofillPreferenceActivity"
+            android:parentActivityName=".PasswordStore">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.zeapo.pwdstore.PasswordStore" />
+        </activity>
 
-		<service android:name=".autofill.AutofillService"
-			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-			<intent-filter>
-				<action android:name="android.accessibilityservice.AccessibilityService" />
-			</intent-filter>
-			<meta-data android:name="android.accessibilityservice"
-					   android:resource="@xml/autofill_config" />
-		</service>
-
-		<activity android:name=".autofill.AutofillActivity"
-			android:parentActivityName=".PasswordStore"
-			android:documentLaunchMode="intoExisting"
-			android:excludeFromRecents="true"
-			tools:ignore="UnusedAttribute">
-
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				android:value="com.zeapo.pwdstore.PasswordStore" />
-		</activity>
-
-		<activity android:name=".autofill.AutofillPreferenceActivity"
-			android:parentActivityName=".PasswordStore">
-
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				android:value="com.zeapo.pwdstore.PasswordStore" />
-		</activity>
-
-		<activity
-			android:name="com.nononsenseapps.filepicker.FilePickerActivity"
-			android:label="@string/app_name"
-			android:theme="@style/FilePickerTheme">
-			<intent-filter>
-				<action android:name="android.intent.action.GET_CONTENT" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
+        <activity
+            android:name="com.nononsenseapps.filepicker.FilePickerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FilePickerTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".crypto.PgpActivity"
-			android:parentActivityName=".PasswordStore"/>
-		<activity android:name=".SelectFolderActivity" />
-	</application>
+            android:parentActivityName=".PasswordStore"/>
+        <activity android:name=".SelectFolderActivity" />
+    </application>
 
 </manifest>
-- 
cgit v1.2.3