From f7649e331dcc795694c67a13c6cbe347766ff5a6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 3 Jan 2023 09:38:29 -0300
Subject: Fix some lint warnings

---
 cashier/build.gradle                           | 3 +--
 cashier/src/main/AndroidManifest.xml           | 3 +--
 merchant-terminal/build.gradle                 | 2 +-
 merchant-terminal/src/main/AndroidManifest.xml | 3 +--
 wallet/build.gradle                            | 2 +-
 wallet/src/main/AndroidManifest.xml            | 8 ++++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cashier/build.gradle b/cashier/build.gradle
index ef0f1c3..c238513 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -22,6 +22,7 @@ plugins {
 }
 
 android {
+    namespace 'net.taler.cashier'
     compileSdkVersion 33
     //noinspection GradleDependency
     buildToolsVersion "$build_tools_version"
@@ -69,8 +70,6 @@ android {
         ignore 'WrongConstant'
         ignoreWarnings false
     }
-    namespace 'net.taler.cashier'
-
 }
 
 dependencies {
diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml
index 398e545..5230be9 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.cashier">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 5e72b15..e144a71 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'net.taler.merchantpos'
     compileSdkVersion 33
     //noinspection GradleDependency
     buildToolsVersion "$build_tools_version"
@@ -59,7 +60,6 @@ android {
         ignore 'WrongConstant'
         ignoreWarnings false
     }
-    namespace 'net.taler.merchantpos'
 }
 
 dependencies {
diff --git a/merchant-terminal/src/main/AndroidManifest.xml b/merchant-terminal/src/main/AndroidManifest.xml
index 0c814e7..3b23dfc 100644
--- a/merchant-terminal/src/main/AndroidManifest.xml
+++ b/merchant-terminal/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.merchantpos">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.NFC" />
 
diff --git a/wallet/build.gradle b/wallet/build.gradle
index a0781d7..5836fdd 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -39,6 +39,7 @@ def gitCommit = { ->
 }
 
 android {
+    namespace 'net.taler.wallet'
     compileSdkVersion 33
     buildToolsVersion "$build_tools_version"
 
@@ -111,7 +112,6 @@ android {
         abortOnError true
         ignoreWarnings false
     }
-    namespace 'net.taler.wallet'
 }
 
 dependencies {
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
index 43ccdd4..23746cd 100644
--- a/wallet/src/main/AndroidManifest.xml
+++ b/wallet/src/main/AndroidManifest.xml
@@ -15,14 +15,15 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.wallet">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.NFC" />
 
     <uses-feature
@@ -47,7 +48,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-- 
cgit v1.2.3