From 9cdf8d877eaf643ebdbd1755716d72ce78df195e Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Mon, 26 Jun 2017 10:38:59 +0200
Subject: [PATCH] fixed build error with current Xamarin version by disabling
 minification in android-filechooser release build

---
 .../android-filechooser-AS/app/build.gradle   |  3 ++-
 .../kp2afilechooser/Kp2aFileProvider.java     | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/java/android-filechooser-AS/app/build.gradle b/src/java/android-filechooser-AS/app/build.gradle
index 92a61e6f..5dc632e4 100644
--- a/src/java/android-filechooser-AS/app/build.gradle
+++ b/src/java/android-filechooser-AS/app/build.gradle
@@ -11,8 +11,9 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+            debuggable false
         }
     }
     compileOptions {
diff --git a/src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java b/src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java
index e0f1824b..8a2bca34 100644
--- a/src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java
+++ b/src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java
@@ -7,7 +7,13 @@ package keepass2android.kp2afilechooser;
 
 
 
-import java.io.File;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MatrixCursor.RowBuilder;
+import android.net.Uri;
+import android.util.Log;
+
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,22 +21,14 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MatrixCursor.RowBuilder;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.util.Log;
+
 import group.pals.android.lib.ui.filechooser.R;
 import group.pals.android.lib.ui.filechooser.providers.BaseFileProviderUtils;
 import group.pals.android.lib.ui.filechooser.providers.ProviderUtils;
 import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileContract.BaseFile;
 import group.pals.android.lib.ui.filechooser.providers.basefile.BaseFileProvider;
-
 import group.pals.android.lib.ui.filechooser.utils.FileUtils;
 import group.pals.android.lib.ui.filechooser.utils.Utils;
 
@@ -220,7 +218,6 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
         }
     }// query()
 
-    @Nullable
     private MatrixCursor getCheckConnectionCursor(Uri uri) {
         try
         {