Merge branch 'develop' of https://github.com/Kunzisoft/KeePassDX into develop

ReadMe.md

@@ -1,6 +1,6 @@
 # Android Keepass DX
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/logo.png"> Keepass DX is a material design Keepass Client for manage keys and passwords in crypt database for your android device.
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/icon.png"> Keepass DX is a material design Keepass Client for manage keys and passwords in crypt database for your android device.
 
 ### Features
 
@@ -11,8 +11,8 @@
 - Material design with themes
 - Device integration and AutoFill (In progress)
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen1.jpg" width="220">
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen2.jpg" width="220">
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen1.jpg" width="220">
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen2.jpg" width="220">
 
 ## What is KeePass?
 
@@ -32,8 +32,8 @@ Even if the application is free, to maintain the application, you can make donat
 
 [![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation")
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen4.jpg" width="220">
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen5.jpg" width="220">
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen4.jpg" width="220">
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen5.jpg" width="220">
 
 ## Download
 

app/src/main/java/com/keepassdroid/PwGroupListAdapter.java

@@ -19,22 +19,22 @@
  */
 package com.keepassdroid;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
-import com.kunzisoft.keepass.R;
 import com.keepassdroid.database.PwEntry;
 import com.keepassdroid.database.PwGroup;
 import com.keepassdroid.view.PwEntryView;
 import com.keepassdroid.view.PwGroupView;
+import com.kunzisoft.keepass.R;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 public class PwGroupListAdapter extends BaseAdapter {
 
@@ -71,22 +71,24 @@ public class PwGroupListAdapter extends BaseAdapter {
 
 	private void filterAndSort() {
 		entriesForViewing = new ArrayList<PwEntry>();
-		
-		for (int i = 0; i < mGroup.childEntries.size(); i++) {
-			PwEntry entry = mGroup.childEntries.get(i);
-			if ( ! entry.isMetaStream() ) {
-				entriesForViewing.add(entry);
+
+		if (mGroup != null) {
+			for (int i = 0; i < mGroup.childEntries.size(); i++) {
+				PwEntry entry = mGroup.childEntries.get(i);
+				if (!entry.isMetaStream()) {
+					entriesForViewing.add(entry);
+				}
+			}
+
+			boolean sortLists = prefs.getBoolean(mAct.getString(R.string.sort_key), mAct.getResources().getBoolean(R.bool.sort_default));
+			if (sortLists) {
+				groupsForViewing = new ArrayList<PwGroup>(mGroup.childGroups);
+
+				Collections.sort(entriesForViewing, entryComp);
+				Collections.sort(groupsForViewing, groupComp);
+			} else {
+				groupsForViewing = mGroup.childGroups;
 			}
-		}
-		
-		boolean sortLists = prefs.getBoolean(mAct.getString(R.string.sort_key),	mAct.getResources().getBoolean(R.bool.sort_default)); 
-		if ( sortLists ) {
-			groupsForViewing = new ArrayList<PwGroup>(mGroup.childGroups);
-			
-			Collections.sort(entriesForViewing, entryComp);
-			Collections.sort(groupsForViewing, groupComp);
-		} else {
-			groupsForViewing = mGroup.childGroups;
 		}
 	}
 	

app/src/main/java/com/keepassdroid/UnavailableFeatureDialog.java

@@ -32,7 +32,7 @@ public class UnavailableFeatureDialog extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
         String message = getString(R.string.unavailable_feature_text).concat("\n");
-        if(Build.VERSION.SDK_INT <= minVersionRequired)
+        if(Build.VERSION.SDK_INT < minVersionRequired)
             message = message.concat(getString(R.string.unavailable_feature_version,
                     Build.VERSION.SDK_INT,
                     minVersionRequired));

app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java

@@ -269,8 +269,10 @@ public class FingerPrintHelper {
         } catch (KeyStoreException
                     | CertificateException
                     | NoSuchAlgorithmException
-                    | IOException e) {
-            fingerPrintCallback.onFingerPrintException(e);
+                    | IOException
+                    | NullPointerException e) {
+            if (fingerPrintCallback != null)
+                fingerPrintCallback.onFingerPrintException(e);
         }
     }
 

app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java

@@ -110,7 +110,7 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat {
                 SwitchPreference fingerprintEnablePreference = (SwitchPreference) findPreference(getString(R.string.fingerprint_enable_key));
                 if (!FingerPrintHelper.isFingerprintSupported(FingerprintManagerCompat.from(getContext()))) {
                     // False if under Marshmallow
-                    fingerprintEnablePreference.setDefaultValue(false);
+                    fingerprintEnablePreference.setChecked(false);
                     fingerprintEnablePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                         @Override
                         public boolean onPreferenceClick(Preference preference) {

fastlane/.gitignore

@@ -0,0 +1 @@
+report.xml

fastlane/Appfile

@@ -1,2 +1,2 @@
 json_key_file "./../Google_Play_Android_Developer.json" # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name "com.kunzisoft.keepass" # e.g. com.krausefx.app
+package_name "com.kunzisoft.keepass.free" # e.g. com.krausefx.app

fastlane/Fastfile

@@ -40,7 +40,11 @@ platform :android do
       skip_upload_metadata: "false",
       skip_upload_images: "true",
       skip_upload_screenshots: "false",
-      validate_only: "true",
+      apk: "./app/build/outputs/apk/free_google/release/app-free_google-release.apk",
+      validate_only: "false",
+    )
+    gradle(
+      task: 'clean'
     )
   end
 end