From 291e6bba754cf736852385e2ae3f496993ce7f53 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 16 May 2017 19:49:08 +0200
Subject: [PATCH] Fixes download bug + prepares v1.0.4

---
 app/build.gradle                                         | 4 ++--
 .../gouv/etalab/mastodon/drawers/StatusListAdapter.java  | 9 +++++++--
 .../main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fa7afe03a..e60f0b080 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 3
-        versionName "1.0.3.1"
+        versionCode 4
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 5183ea27a..e1fa30021 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -493,16 +493,21 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                 break;
             }
         }
+        String urlDownload = attachment.getRemote_url();
+        if( urlDownload == null || urlDownload.trim().equals(""))
+            urlDownload = attachment.getUrl();
+        final String finalUrlDownload = urlDownload;
         alertadd.setPositiveButton(R.string.download, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dlg, int sumthin) {
                 if(Build.VERSION.SDK_INT >= 23 ){
                     if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ) {
                         ActivityCompat.requestPermissions((MainActivity)context, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_REQUEST_CODE);
                     } else {
-                        Helper.manageDownloads(context, attachment.getRemote_url());
+
+                        Helper.manageDownloads(context, finalUrlDownload);
                     }
                 }else{
-                    Helper.manageDownloads(context, attachment.getRemote_url());
+                    Helper.manageDownloads(context, finalUrlDownload);
                 }
                 dlg.dismiss();
             }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 2c5fa7bf3..fea223b62 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -27,6 +27,7 @@ import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.util.Log;
 import android.view.WindowManager;
 import android.widget.Toast;