From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Fri, 4 Mar 2016 20:57:26 +0000 (+0100)
Subject: Fix download title.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=969ea0063628e074662e7f04e50d9d509e5c1073

Fix download title.
---

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 44ae8c1..28a3635 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -622,9 +622,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
     }
 
     private void downloadDictionary(final String downloadUrl, long bytes, Button downloadButton) {
-        String fileName;
+        String destFile;
         try {
-            fileName = new URL(downloadUrl).getFile();
+            destFile = new File(new URL(downloadUrl).getPath()).getName();
         } catch (MalformedURLException e) {
             throw new RuntimeException("Invalid download URL!", e);
         }
@@ -645,7 +645,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         while (cursor.moveToNext()) {
             if (downloadUrl.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_URI))))
                 break;
-            if (fileName.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_TITLE))))
+            if (destFile.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_TITLE))))
                 break;
         }
         if (!cursor.isAfterLast()) {
@@ -661,10 +661,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         Request request = new Request(
                 Uri.parse(downloadUrl));
 
-        final String destFile = new File(fileName)
-                .getName();
         Log.d(LOG, "Downloading to: " + destFile);
-        request.setTitle(fileName);
+        request.setTitle(destFile);
 
         try {
             request.setDestinationInExternalFilesDir(getApplicationContext(), null, destFile);