From 0e5b211082dfcc898314ff98a44721840db83929 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Mon, 1 Mar 2021 09:45:12 +0100
Subject: [PATCH] Manifest and XMLs: fix various linter errors

---
 AndroidManifest.xml            | 11 ++++++-----
 res/layout/buttons.xml         |  1 -
 res/layout/main.xml            |  4 +---
 res/layout/message_act.xml     |  6 ++----
 res/layout/prefsymbol.xml      |  4 +---
 res/layout/stationactivity.xml |  4 +---
 6 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8524d5d..17fb147 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.aprsdroid.app"
-      android:versionCode="19"
-      android:versionName="1.6.0"
-      android:installLocation="auto">
+	xmlns:tools="http://schemas.android.com/tools"
+	package="org.aprsdroid.app"
+	android:installLocation="auto">
 
     <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
     <uses-feature android:name="android.hardware.location" android:required="false" />
@@ -28,6 +27,7 @@
     <application android:label="@string/app_name" android:icon="@drawable/icon"
 	    android:name=".APRSdroidApplication"
 	    android:usesCleartextTraffic="true"
+	    android:allowBackup="true"
 	    android:theme="@style/DefaultTheme" >
 
 	<meta-data
@@ -147,7 +147,8 @@
 			android:mimeType="application/x-pkcs12" />
 	    </intent-filter>
 	</activity>
-	<service android:name=".AprsService" android:label="@string/aprsservice">
+	<service android:name=".AprsService" android:label="@string/aprsservice"
+		tools:ignore="ExportedService" >
 	    <intent-filter>
 		<action android:name="org.aprsdroid.app.SERVICE" />
 		<action android:name="org.aprsdroid.app.ONCE" />
diff --git a/res/layout/buttons.xml b/res/layout/buttons.xml
index 43e995f..2569a59 100644
--- a/res/layout/buttons.xml
+++ b/res/layout/buttons.xml
@@ -14,6 +14,5 @@ android:layout_weight="1"
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
 android:text="@string/startlog"
-android:layout_below="@+id/singlebtn"
 />
 </merge>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 4698419..b2ce706 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -25,9 +25,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
 android:id="@+id/buttonlayout"
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
-android:orientation="horizontal"
-xmlns:android="http://schemas.android.com/apk/res/android"
->
+android:orientation="horizontal">
 <include layout="@layout/buttons" />
 </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/message_act.xml b/res/layout/message_act.xml
index 9039a94..c2e1f2d 100644
--- a/res/layout/message_act.xml
+++ b/res/layout/message_act.xml
@@ -13,15 +13,13 @@ xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_weight="1"
 	android:descendantFocusability="blocksDescendants"
 	android:stackFromBottom="true"
-	android:transcriptMode="alwaysScroll" />
+	android:transcriptMode="alwaysScroll"
 	/>
 <LinearLayout
 android:id="@+id/buttonlayout"
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
-android:orientation="horizontal"
-xmlns:android="http://schemas.android.com/apk/res/android"
->
+android:orientation="horizontal">
 <EditText android:id="@+id/msginput"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
diff --git a/res/layout/prefsymbol.xml b/res/layout/prefsymbol.xml
index e61ec41..864bb55 100644
--- a/res/layout/prefsymbol.xml
+++ b/res/layout/prefsymbol.xml
@@ -23,9 +23,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="wrap_content"
 	android:padding="4sp"
 	android:orientation="horizontal"
-	android:gravity="center"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	>
+	android:gravity="center">
 	<TextView
 		android:layout_width="wrap_content" 
 		android:layout_height="wrap_content"
diff --git a/res/layout/stationactivity.xml b/res/layout/stationactivity.xml
index 8931cd1..011459b 100644
--- a/res/layout/stationactivity.xml
+++ b/res/layout/stationactivity.xml
@@ -33,9 +33,7 @@
 	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		>
+		android:orientation="horizontal">
 		<Button
 			android:id="@+id/map"
 			android:layout_width="fill_parent"