Fix filename generation from URL

DSteve595 · Sep 5, 2015 · 4e0d5eb · 4e0d5eb
1 parent bf1a240
commit 4e0d5eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Emoji Switcher/build.gradle b/Emoji Switcher/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 13
-        versionName "2.0"
+        versionCode 14
+        versionName "2.0.1"
     }
 
     compileOptions {

diff --git a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java
@@ -251,7 +251,13 @@ public static boolean isDownloaded(EmojiSet emojiSet) throws IOException {
     }
 
     private static String filenameFromUrl(String url) {
-        return FilenameUtils.getName(url);
+        String filename = FilenameUtils.getName(url);
+        int indexOfParam = filename.indexOf('?');
+        if (indexOfParam != -1) {
+            return filename.substring(0, indexOfParam);
+        } else {
+            return filename;
+        }
     }
 
     public static String filePath(Context context, EmojiSetListing listing) {