From 11705866e383fe6cbe2c9960099bf54385b805f2 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Thu, 22 Jul 2021 22:25:40 +0200
Subject: [PATCH] Fix the build by fixing some linter complaints

---
 .../java/com/beemdevelopment/aegis/ui/MainActivity.java    | 2 ++
 .../com/beemdevelopment/aegis/ui/PreferencesActivity.java  | 7 -------
 app/src/main/res/layout/activity_intro.xml                 | 4 ++--
 app/src/main/res/layout/dialog_icon_picker.xml             | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 0baab61e..14deb77f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -226,6 +226,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 startScanImageActivity();
                 break;
         }
+
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     private void onPreferencesResult(Intent data) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
index ea50eeb9..2300dcc5 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
@@ -3,7 +3,6 @@ package com.beemdevelopment.aegis.ui;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -51,12 +50,6 @@ public class PreferencesActivity extends AegisActivity implements
         setTitle(R.string.action_settings);
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        // pass permission request results to the fragment
-        _fragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     @Override
     protected void onRestoreInstanceState(final Bundle inState) {
         if (_fragment instanceof PreferencesFragment) {
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index e7e75a1b..79600e46 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -20,7 +20,7 @@
         android:layout_height="65dp"
         android:layout_margin="10dp"
         android:src="@drawable/circular_button_prev"
-        android:tint="?attr/iconColorPrimary"
+        app:tint="?attr/iconColorPrimary"
         android:background="?selectableItemBackgroundBorderless"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -39,7 +39,7 @@
         android:layout_height="65dp"
         android:layout_margin="10dp"
         android:src="@drawable/circular_button_next"
-        android:tint="?attr/iconColorPrimary"
+        app:tint="?attr/iconColorPrimary"
         android:background="?selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/dialog_icon_picker.xml b/app/src/main/res/layout/dialog_icon_picker.xml
index 6cd50396..a7cedc6e 100644
--- a/app/src/main/res/layout/dialog_icon_picker.xml
+++ b/app/src/main/res/layout/dialog_icon_picker.xml
@@ -47,7 +47,7 @@
             android:scaleType="centerCrop"
             android:background="?selectableItemBackgroundBorderless"
             android:src="@drawable/ic_dots_vertical_black_24dp"
-            android:tint="?attr/iconColorPrimary"/>
+            app:tint="?attr/iconColorPrimary"/>
     </RelativeLayout>
     <View
         android:layout_width="match_parent"