Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes download bug + prepares v1.0.4

This commit is contained in:
tom79 2017-05-16 19:49:08 +02:00
parent 1cb118d99f
commit 291e6bba75
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 3 versionCode 4
versionName "1.0.3.1" versionName "1.0.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

9
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -493,16 +493,21 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
break; 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() { alertadd.setPositiveButton(R.string.download, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dlg, int sumthin) { public void onClick(DialogInterface dlg, int sumthin) {
if(Build.VERSION.SDK_INT >= 23 ){ if(Build.VERSION.SDK_INT >= 23 ){
if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ) { 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); ActivityCompat.requestPermissions((MainActivity)context, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_REQUEST_CODE);
} else { } else {
Helper.manageDownloads(context, attachment.getRemote_url());
Helper.manageDownloads(context, finalUrlDownload);
} }
}else{ }else{
Helper.manageDownloads(context, attachment.getRemote_url()); Helper.manageDownloads(context, finalUrlDownload);
} }
dlg.dismiss(); dlg.dismiss();
} }

1
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -27,6 +27,7 @@ import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.util.Log;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Toast; import android.widget.Toast;