Make long click immediately select a file.

1 files changed, 200 insertions, 185 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
index 95fa3cb2..3b146828 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ListView;
@@ -30,160 +31,174 @@ import de.blinkt.openvpn.activities.FileSelect;
 
 public class FileSelectionFragment extends ListFragment {
 
-	private static final String ITEM_KEY = "key";
-	private static final String ITEM_IMAGE = "image";
-	private static final String ROOT = "/";
+    private static final String ITEM_KEY = "key";
+    private static final String ITEM_IMAGE = "image";
+    private static final String ROOT = "/";
 
 
-	private List<String> path = null;
-	private TextView myPath;
-	private ArrayList<HashMap<String, Object>> mList;
+    private List<String> path = null;
+    private TextView myPath;
+    private ArrayList<HashMap<String, Object>> mList;
 
-	private Button selectButton;
+    private Button selectButton;
 
 
-	private String parentPath;
-	private String currentPath = ROOT;
+    private String parentPath;
+    private String currentPath = ROOT;
 
 
-	private String[] formatFilter = null;
+    private String[] formatFilter = null;
 
-	private File selectedFile;
-	private HashMap<String, Integer> lastPositions = new HashMap<String, Integer>();
-	private String mStartPath;
-	private CheckBox mInlineImport;
-	private Button mClearButton;
-	private boolean mHideImport=false;
+    private File selectedFile;
+    private HashMap<String, Integer> lastPositions = new HashMap<String, Integer>();
+    private String mStartPath;
+    private CheckBox mInlineImport;
+    private Button mClearButton;
+    private boolean mHideImport = false;
 
 
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.file_dialog_main, container,false);
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.file_dialog_main, container, false);
 
-		myPath = (TextView) v.findViewById(R.id.path);
+        myPath = (TextView) v.findViewById(R.id.path);
 
-		mInlineImport = (CheckBox) v.findViewById(R.id.doinline);
+        mInlineImport = (CheckBox) v.findViewById(R.id.doinline);
 
-		if(mHideImport) {
-			mInlineImport.setVisibility(View.GONE);
-			mInlineImport.setChecked(false);
-		}
+        if (mHideImport) {
+            mInlineImport.setVisibility(View.GONE);
+            mInlineImport.setChecked(false);
+        }
 
 
+        selectButton = (Button) v.findViewById(R.id.fdButtonSelect);
+        selectButton.setEnabled(false);
+        selectButton.setOnClickListener(new OnClickListener() {
 
-		selectButton = (Button) v.findViewById(R.id.fdButtonSelect);
-		selectButton.setEnabled(false);
-		selectButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onFileSelectionClick();
+            }
+        });
 
-			@Override
-			public void onClick(View v) {
-				if (selectedFile != null) {
-					if(mInlineImport.isChecked())
+        mClearButton = (Button) v.findViewById(R.id.fdClear);
+        mClearButton.setOnClickListener(new OnClickListener() {
 
-						((FileSelect) getActivity()).importFile(selectedFile.getPath());
-					else 
-						((FileSelect) getActivity()).setFile(selectedFile.getPath());
-				}
-			}
-		});
+            @Override
+            public void onClick(View v) {
+                ((FileSelect) getActivity()).clearData();
+            }
+        });
+        if (!((FileSelect) getActivity()).showClear()) {
+            mClearButton.setVisibility(View.GONE);
+            mClearButton.setEnabled(false);
+        }
 
-		mClearButton = (Button) v.findViewById(R.id.fdClear);
-		mClearButton.setOnClickListener(new OnClickListener() {
+        getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+                                                     @Override
+                                                     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+                                                         onListItemClick(getListView(), view, position, id);
+                                                         onFileSelectionClick();
+                                                         return true;
+                                                     }
+                                                 }
 
-			@Override
-			public void onClick(View v) {
-				((FileSelect) getActivity()).clearData();
-			}
-		});
-		if(!((FileSelect) getActivity()).showClear()) {
-			mClearButton.setVisibility(View.GONE);
-			mClearButton.setEnabled(false);
-		}
+        );
 
-		return v;
-	}
+        return v;
+    }
 
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
+    private void onFileSelectionClick() {
+        if (selectedFile != null) {
+            if (mInlineImport.isChecked())
 
-		mStartPath = ((FileSelect) getActivity()).getSelectPath();
-		getDir(mStartPath);
-	}
+                ((FileSelect) getActivity()).importFile(selectedFile.getPath());
+            else
+                ((FileSelect) getActivity()).setFile(selectedFile.getPath());
+        }
+    }
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	}
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
 
-	private void getDir(String dirPath) {
+        mStartPath = ((FileSelect) getActivity()).getSelectPath();
+        getDir(mStartPath);
+    }
 
-		boolean useAutoSelection = dirPath.length() < currentPath.length();
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
 
-		Integer position = lastPositions.get(parentPath);
 
-		getDirImpl(dirPath);
+    private void getDir(String dirPath) {
 
-		if (position != null && useAutoSelection) {
-			getListView().setSelection(position);
-		}
+        boolean useAutoSelection = dirPath.length() < currentPath.length();
 
-	}
+        Integer position = lastPositions.get(parentPath);
 
-	/**
-	 * Monta a estrutura de arquivos e diretorios filhos do diretorio fornecido.
-	 * 
-	 * @param dirPath
-	 *            Diretorio pai.
-	 */
-	private void getDirImpl(final String dirPath) {
+        getDirImpl(dirPath);
 
-		currentPath = dirPath;
+        if (position != null && useAutoSelection) {
+            getListView().setSelection(position);
+        }
 
-		final List<String> item = new ArrayList<String>();
-		path = new ArrayList<String>();
-		mList = new ArrayList<HashMap<String, Object>>();
+    }
+
+    /**
+     * Monta a estrutura de arquivos e diretorios filhos do diretorio fornecido.
+     *
+     * @param dirPath Diretorio pai.
+     */
+    private void getDirImpl(final String dirPath) {
 
-		File f = new File(currentPath);
-		File[] files = f.listFiles();
-		if (files == null) {
-			currentPath = ROOT;
-			f = new File(currentPath);
-			files = f.listFiles();
-		}
+        currentPath = dirPath;
 
-		myPath.setText(getText(R.string.location) + ": " + currentPath);
+        final List<String> item = new ArrayList<String>();
+        path = new ArrayList<String>();
+        mList = new ArrayList<HashMap<String, Object>>();
 
-		if (!currentPath.equals(ROOT)) {
-
-			item.add(ROOT);
-			addItem(ROOT, R.drawable.ic_root_folder_am);
-			path.add(ROOT);
-
-			item.add("../");
-			addItem("../", R.drawable.ic_root_folder_am);
-			path.add(f.getParent());
-			parentPath = f.getParent();
-
-		}
-
-		TreeMap<String, String> dirsMap = new TreeMap<String, String>();
-		TreeMap<String, String> dirsPathMap = new TreeMap<String, String>();
-		TreeMap<String, String> filesMap = new TreeMap<String, String>();
-		TreeMap<String, String> filesPathMap = new TreeMap<String, String>();
-		for (File file : files) {
-			if (file.isDirectory()) {
-				String dirName = file.getName();
-				dirsMap.put(dirName, dirName);
-				dirsPathMap.put(dirName, file.getPath());
-			} else {
-				final String fileName = file.getName();
-				final String fileNameLwr = fileName.toLowerCase(Locale.getDefault());
-				// se ha um filtro de formatos, utiliza-o
-				if (formatFilter != null) {
-					boolean contains = false;
+        File f = new File(currentPath);
+        File[] files = f.listFiles();
+        if (files == null) {
+            currentPath = ROOT;
+            f = new File(currentPath);
+            files = f.listFiles();
+        }
+
+        myPath.setText(getText(R.string.location) + ": " + currentPath);
+
+        if (!currentPath.equals(ROOT)) {
+
+            item.add(ROOT);
+            addItem(ROOT, R.drawable.ic_root_folder_am);
+            path.add(ROOT);
+
+            item.add("../");
+            addItem("../", R.drawable.ic_root_folder_am);
+            path.add(f.getParent());
+            parentPath = f.getParent();
+
+        }
+
+        TreeMap<String, String> dirsMap = new TreeMap<String, String>();
+        TreeMap<String, String> dirsPathMap = new TreeMap<String, String>();
+        TreeMap<String, String> filesMap = new TreeMap<String, String>();
+        TreeMap<String, String> filesPathMap = new TreeMap<String, String>();
+        for (File file : files) {
+            if (file.isDirectory()) {
+                String dirName = file.getName();
+                dirsMap.put(dirName, dirName);
+                dirsPathMap.put(dirName, file.getPath());
+            } else {
+                final String fileName = file.getName();
+                final String fileNameLwr = fileName.toLowerCase(Locale.getDefault());
+                // se ha um filtro de formatos, utiliza-o
+                if (formatFilter != null) {
+                    boolean contains = false;
                     for (String aFormatFilter : formatFilter) {
                         final String formatLwr = aFormatFilter.toLowerCase(Locale.getDefault());
                         if (fileNameLwr.endsWith(formatLwr)) {
@@ -191,73 +206,73 @@ public class FileSelectionFragment extends ListFragment {
                             break;
                         }
                     }
-					if (contains) {
-						filesMap.put(fileName, fileName);
-						filesPathMap.put(fileName, file.getPath());
-					}
-					// senao, adiciona todos os arquivos
-				} else {
-					filesMap.put(fileName, fileName);
-					filesPathMap.put(fileName, file.getPath());
-				}
-			}
-		}
-		item.addAll(dirsMap.tailMap("").values());
-		item.addAll(filesMap.tailMap("").values());
-		path.addAll(dirsPathMap.tailMap("").values());
-		path.addAll(filesPathMap.tailMap("").values());
-
-		SimpleAdapter fileList = new SimpleAdapter(getActivity(), mList, R.layout.file_dialog_row, new String[] {
-			ITEM_KEY, ITEM_IMAGE }, new int[] { R.id.fdrowtext, R.id.fdrowimage });
-
-		for (String dir : dirsMap.tailMap("").values()) {
-			addItem(dir, R.drawable.ic_root_folder_am);
-		}
-
-		for (String file : filesMap.tailMap("").values()) {
-			addItem(file, R.drawable.ic_doc_generic_am);
-		}
-
-		fileList.notifyDataSetChanged();
-
-		setListAdapter(fileList);
-
-	}
-
-	private void addItem(String fileName, int imageId) {
-		HashMap<String, Object> item = new HashMap<String, Object>();
-		item.put(ITEM_KEY, fileName);
-		item.put(ITEM_IMAGE, imageId);
-		mList.add(item);
-	}
-
-
-	@Override
-	public void onListItemClick(ListView l, View v, int position, long id) {
-
-		File file = new File(path.get(position));
-
-		if (file.isDirectory()) {
-			selectButton.setEnabled(false);
-
-			if (file.canRead()) {
-				lastPositions.put(currentPath, position);
-				getDir(path.get(position));
-			} else {
-				Toast.makeText(getActivity(),
-						"[" + file.getName() + "] " + getActivity().getText(R.string.cant_read_folder),
-						Toast.LENGTH_SHORT).show();
-			}
-		} else {
-			selectedFile = file;
-			v.setSelected(true);
-			selectButton.setEnabled(true);
-		}
-	}
-
-	public void setNoInLine() {
-		mHideImport=true;
-	
-	}
+                    if (contains) {
+                        filesMap.put(fileName, fileName);
+                        filesPathMap.put(fileName, file.getPath());
+                    }
+                    // senao, adiciona todos os arquivos
+                } else {
+                    filesMap.put(fileName, fileName);
+                    filesPathMap.put(fileName, file.getPath());
+                }
+            }
+        }
+        item.addAll(dirsMap.tailMap("").values());
+        item.addAll(filesMap.tailMap("").values());
+        path.addAll(dirsPathMap.tailMap("").values());
+        path.addAll(filesPathMap.tailMap("").values());
+
+        SimpleAdapter fileList = new SimpleAdapter(getActivity(), mList, R.layout.file_dialog_row, new String[]{
+                ITEM_KEY, ITEM_IMAGE}, new int[]{R.id.fdrowtext, R.id.fdrowimage});
+
+        for (String dir : dirsMap.tailMap("").values()) {
+            addItem(dir, R.drawable.ic_root_folder_am);
+        }
+
+        for (String file : filesMap.tailMap("").values()) {
+            addItem(file, R.drawable.ic_doc_generic_am);
+        }
+
+        fileList.notifyDataSetChanged();
+
+        setListAdapter(fileList);
+
+    }
+
+    private void addItem(String fileName, int imageId) {
+        HashMap<String, Object> item = new HashMap<String, Object>();
+        item.put(ITEM_KEY, fileName);
+        item.put(ITEM_IMAGE, imageId);
+        mList.add(item);
+    }
+
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+
+        File file = new File(path.get(position));
+
+        if (file.isDirectory()) {
+            selectButton.setEnabled(false);
+
+            if (file.canRead()) {
+                lastPositions.put(currentPath, position);
+                getDir(path.get(position));
+            } else {
+                Toast.makeText(getActivity(),
+                        "[" + file.getName() + "] " + getActivity().getText(R.string.cant_read_folder),
+                        Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            selectedFile = file;
+            v.setSelected(true);
+            selectButton.setEnabled(true);
+        }
+    }
+
+    public void setNoInLine() {
+        mHideImport = true;
+
+    }
 
 }