From 0fa0e55e2c374d3ce81100bd5e51d7088a3b2cd4 Mon Sep 17 00:00:00 2001
From: Eder Bastos <bastos.eder@gmail.com>
Date: Mon, 11 May 2015 21:40:42 -0400
Subject: [PATCH] Android: Fix a possible crash in the file browser if
 attempting to show a file with no extension.

---
 .../dolphinemu/model/FileListItem.java        |  30 ++++++++++++------
 Source/Android/code-style-java.jar            | Bin 1534 -> 1542 bytes
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
index 69b39438e8..b9c8a571cf 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
@@ -22,6 +22,7 @@ public class FileListItem implements Comparable<FileListItem>
 	public FileListItem(File file)
 	{
 		mPath = file.getAbsolutePath();
+		mFilename = file.getName();
 
 		if (file.isDirectory())
 		{
@@ -29,23 +30,32 @@ public class FileListItem implements Comparable<FileListItem>
 		}
 		else
 		{
-			String fileExtension = mPath.substring(mPath.lastIndexOf('.'));
+			String fileExtension = null;
 
-			// Extensions to filter by.
-			Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
-
-			// Check that the file has an appropriate extension before trying to read out of it.
-			if (allowedExtensions.contains(fileExtension))
+			int extensionStart = mPath.lastIndexOf('.');
+			if (extensionStart < 1)
 			{
-				mType = NativeLibrary.IsWiiTitle(mPath) ? TYPE_WII : TYPE_GC;
+				// Ignore hidden files & files without extensions.
+				mType = TYPE_OTHER;
 			}
 			else
 			{
-				mType = TYPE_OTHER;
+				fileExtension = mPath.substring(extensionStart);
+
+				// The extensions we care about.
+				Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
+
+				// Check that the file has an extension we care about before trying to read out of it.
+				if (allowedExtensions.contains(fileExtension))
+				{
+					mType = NativeLibrary.IsWiiTitle(mPath) ? TYPE_WII : TYPE_GC;
+				}
+				else
+				{
+					mType = TYPE_OTHER;
+				}
 			}
 		}
-
-		mFilename = file.getName();
 	}
 
 	public int getType()
diff --git a/Source/Android/code-style-java.jar b/Source/Android/code-style-java.jar
index 8140ad66f9d0318f07681facaddb87e9cc037492..04a041c0489f6bf0e73877deda94771fe6acdea9 100644
GIT binary patch
delta 869
zcmV-r1DgE)3x*7k><#EZtVYK~Fv|7<006L&`6Pc^Z<{a_e&4S^Xit?Ex6@u4kw`AM
z2_2UT$kyy(mPfq6$|VBR%fFu?geHNsi8fZM<qaSEe8=arzjFY|jb{|6u17;EL?omG
zQHg_v=SLr|$Q==f?*u`L7tD{Na{5w5nt~0eBYbV4OZ7$+?nsdFnNSo!eZ8zf+s3jv
zF&uyFn0R6%tm@aM<zUmm3eusWR0!wijSzXTKZLl3@@F{WD7*Y~7w%M`lmK9fPzNiW
zH8?dVd`Iv?LmU3fXFggG_m<38#FA*1#Qsba?tSLj*^hEI9f&N+s3@e2Fy9@BKS_|%
zGK&I+h70zn`4L^SZ9=<o*aqycEb>_!z!86K1vXCRt<aDwp(WghHh^CRb2)kjQUaAa
zc5BO0M`H);&>E>mCF--&)0L{>QbadlAoI#)v&VqilrcY=r)884xLoV<#CA*_+sJWL
zV`NvTYa5op3%Jsat~KFvGuF@u%F_zJtSv}s4pah3?sga<AkjSI%nrmW_yvkh;VyqH
zC?jk;Q(kda=pQT6n+oqC9y)TyrgD%A(m27qiW=xE)>H#E<y_ksbmZ|KPJT3_5i<+d
zw7OQc<K^`i%VWql?I3Fh6sTcIpmqQ+9t%IZ##6a8El!w)pk+a0gs^TZPdS|(l#py1
z{1Q!|qjG*!LqWXd+3L3^xKGa|#f^U?N%($wH;-5qA;|(-#pC0Yx-0QjwtUUHfty0Y
zTyN8s3(!!uZQPo-=;1>cL}|Zla}p?Q^`*IFijK~EG8!5@?Ua`k+ApNBHnSZV)FMlu
zwnYhSCL)1avMs0IJ9(YV^P7~+XfnK*7Ervz7Q>E^(>v+!eJ4D|7JUGUw^DzS_R0&@
z<1aaYEN($UQ&3&9H-2Y0ExGWI#B39D04v|$zxiy_yyN^o>F!-4|5C2quZ;nDj5CJs
z{TcI)#b7r<9`)xQJ2JGJp}n>BkJ;(I20JXi?vvMLVRoLqBW-QcmM`oG9m@r)Z*{Qs
zvEKMkVreXY(GPzEP)h>@6aWVR2nYZHL9CM&1W5w{L9CNv1j7yJK&(c`L@>(s0ssK8
vlQIQ70|7y-lW_$b0TGjp1snqbL9COk1seig1e0+DA(QF_4hEP600000!h?}@

delta 901
zcmV;01A6?14E_s{><ul7szx(#WxMVI004WD`6PeKZks?9-S;aH>MBw_N!3j(Y-s`$
zhm=PIxQ)B$h~lZC;bFlzkH7B)V`3Ye#A<1X>YeA#+;is~-v=Oh$&}H|^I61%*p1jg
zRFZJ+2l0nX_tq7M?*u_g<~&H^a{F8*nnDe%6MAKlbM;yjZryMJJCP`$`gvKywoPSo
zY&d_^G3nSQRMoFc%b})06{2H9sSr+28zJ&we+Y4f<<EEoD7*Y~7jP<2N&vJ(sDqWx
z8lISAxDh_n$cF#&H>~EacjL}h!n*M^O@gT?+y&gX7eC6~Y#{P<!9*eBE)Tqc_|pwD
zR<bBySTyGkS`f1}+a|P^L~X$STEqcw12}(Xt-vPftQ8sZN@xl9z7614!CbDMfRs>G
z9lLAGQb!jK)v+~FjjE_mj*nMWjh97q9fdM<E}K7u%x0Vi@hmH&Y{2EUE{|=;)TvDz
zM>R%vg}QcO2|a@=UF%vCKA5RSMp&Ly_+@V)N^_tRNb<JB2%#I#7NG1vyu@Fy*c5;6
z%)&CEwljf_vqJw^iQd$B_wmq)b73lbxeyHmhAwK5uT)bF(!?2jf_TbeZWf+dl_9l%
z3R)?ZFEGS+h_wR>)vzQ~)ACt`;a_MJ_}sLByG5{NVPiz7ZYqzQPWB=sn+D{=7&|KH
zqZ$f<>1C_m9^pPcMGA~=n!<fyFvowqijXcsR>gyL#=KP>Rkr-hx&cg)%RPV7me-P@
zY}>$^Put;r6vkP<oLCYnZ1tmg_7}q$#w!^bKs$r(!1_g&ukCCHMzzQis$Ee+n?xj3
zBil0l-qGtY&oe2VvUGShDWITR7R!!^(>v<FI46A0=Y52V2TV8Xl?l~@=M{hC&Tml4
zGE^nm8_yY#B`^GgFx$fHq00C7Z=P+IPn`dU?u&cmU*g*R-Wa+M$%50nV9NbNGuSPV
z&w`oH4+`y8=*6}5kJagZ4R*Nrx-VXr3$yd;9b{`$w)|j6<X9e9y{n_Gm-WVP5=&$G
zwSD*-P)h>@6aWAS2mo@6sz#F^1V{sNi>i}q1j7w2imFC4aAmvh0ssJelR5=F19FS1
zlX(RjJP8B<0BLS>bYX04Wn?aNcyv%p0RjpD3IG5I0044}szv|+00000000000012T
b000000000000000Rg=&KFb0qW00000Sgf7Y