From c200566bcaec971e1756afe5ebf96baf09e88816 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Wed, 2 Jan 2019 22:44:52 +0530
Subject: Bump minSdk to 21 (#466)

* Bump minSdk to 21

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* PasswordGenerator: Constify things

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* Deprecate PRNG fixes

The problem being fixed doesn't exist on SDK 21 and above.

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* treewide: Switch to lambdas

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* treewide: Formatting fixes

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* treewide: Remove useless casts and add missing annotations

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
---
 .../com/zeapo/pwdstore/SelectFolderFragment.java   | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java
index f4ec98b2..1fe79a2a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java
@@ -1,50 +1,44 @@
 package com.zeapo.pwdstore;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.zeapo.pwdstore.utils.FolderRecyclerAdapter;
 import com.zeapo.pwdstore.utils.PasswordItem;
 import com.zeapo.pwdstore.utils.PasswordRepository;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Stack;
 
 /**
  * A fragment representing a list of Items.
- * <p />
+ * <p/>
  * Large screen devices (such as tablets) are supported by replacing the ListView
  * with a GridView.
- * <p />
+ * <p/>
  */
-public class SelectFolderFragment extends Fragment{
-
-    public interface OnFragmentInteractionListener {
-        void onFragmentInteraction(PasswordItem item);
-    }
+public class SelectFolderFragment extends Fragment {
 
     // store the pass files list in a stack
     private Stack<File> pathStack;
     private FolderRecyclerAdapter recyclerAdapter;
     private RecyclerView recyclerView;
     private OnFragmentInteractionListener mListener;
-
     /**
      * Mandatory empty constructor for the fragment manager to instantiate the
      * fragment (e.g. upon screen orientation changes).
      */
-    public SelectFolderFragment() {   }
+    public SelectFolderFragment() {
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -53,11 +47,11 @@ public class SelectFolderFragment extends Fragment{
 
         pathStack = new Stack<>();
         recyclerAdapter = new FolderRecyclerAdapter((SelectFolderActivity) getActivity(), mListener,
-                                                      PasswordRepository.getPasswords(new File(path), PasswordRepository.getRepositoryDirectory(getActivity()), getSortOrder()));
+                PasswordRepository.getPasswords(new File(path), PasswordRepository.getRepositoryDirectory(getActivity()), getSortOrder()));
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.password_recycler_view, container, false);
 
@@ -81,28 +75,27 @@ public class SelectFolderFragment extends Fragment{
     public void onAttach(final Context context) {
         super.onAttach(context);
         try {
-            mListener = new OnFragmentInteractionListener() {
-                public void onFragmentInteraction(PasswordItem item) {
-                    if (item.getType() == PasswordItem.TYPE_CATEGORY) {
-                        //push the category were we're going
-                        pathStack.push(item.getFile());
-
-                        recyclerView.scrollToPosition(0);
-                        recyclerAdapter.clear();
-                        recyclerAdapter.addAll(PasswordRepository.getPasswords(item.getFile(), PasswordRepository.getRepositoryDirectory(context), getSortOrder()));
-
-                        ((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-                    }
+            mListener = item -> {
+                if (item.getType() == PasswordItem.TYPE_CATEGORY) {
+                    //push the category were we're going
+                    pathStack.push(item.getFile());
+
+                    recyclerView.scrollToPosition(0);
+                    recyclerAdapter.clear();
+                    recyclerAdapter.addAll(PasswordRepository.getPasswords(item.getFile(), PasswordRepository.getRepositoryDirectory(context), getSortOrder()));
+
+                    ((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
                 }
             };
         } catch (ClassCastException e) {
             throw new ClassCastException(context.toString()
-                + " must implement OnFragmentInteractionListener");
+                    + " must implement OnFragmentInteractionListener");
         }
     }
 
     /**
      * gets the current directory
+     *
      * @return the current directory
      */
     public File getCurrentDir() {
@@ -115,4 +108,8 @@ public class SelectFolderFragment extends Fragment{
     private PasswordRepository.PasswordSortOrder getSortOrder() {
         return PasswordRepository.PasswordSortOrder.getSortOrder(PreferenceManager.getDefaultSharedPreferences(getActivity()));
     }
+
+    public interface OnFragmentInteractionListener {
+        void onFragmentInteraction(PasswordItem item);
+    }
 }
-- 
cgit v1.2.3