Merge remote-tracking branch 'upstream/master' into unittest

Conflicts:
	res/values/strings.xml
	src/cgeo/geocaching/cgCache.java

1 files changed, 5 insertions, 5 deletions

diff --git a/src/cgeo/geocaching/files/FileList.java b/src/cgeo/geocaching/files/FileList.java
index 67e89a0..eae1e4d 100644
--- a/src/cgeo/geocaching/files/FileList.java
+++ b/src/cgeo/geocaching/files/FileList.java
@@ -127,7 +127,7 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
 	 * @return The folder to start the recursive search in
 	 */
 	protected abstract String[] getBaseFolders();
-	
+
 	/**
 	 * Triggers the deriving class to set the title
 	 */
@@ -221,18 +221,18 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
 
 		return;
 	}
-	
-	public FileList(final String extension) {
+
+	protected FileList(final String extension) {
 		setExtensions(new String[] {extension});
 	}
 
-	public FileList(final String[] extensions) {
+	protected FileList(final String[] extensions) {
 		setExtensions(extensions);
 	}
 
 	private void setExtensions(String[] extensionsIn) {
 		for (String extension : extensionsIn) {
-			if (!extension.startsWith(".")) {
+			if (extension.length() == 0 || extension.charAt(0) != '.') {
 				extension = "." + extension;
 			}
 		}