From 7ba31b86172e68d821360798a8db85c74ed4b85b Mon Sep 17 00:00:00 2001 From: Joshua <8Joshua@web.de> Date: Thu, 18 Oct 2018 19:31:10 +0200 Subject: [PATCH] =?UTF-8?q?ResourceFragment=20aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moddetails/ModDetailResourceFragment.java | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java index d6755d3..adc6ef6 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java @@ -105,40 +105,29 @@ public class ModDetailResourceFragment extends Fragment { // if (!node.isExpand()) // adapter.collapseBrotherNode(node); } else if(node.getContent() instanceof Resource.File) { - KVV kvv = ((MainActivity) getActivity()).getKVV(); + KVV kvv = ModDetailResourceFragment.this.context.getKVV(); kvv.getModule(mItemPos, (Modules.Module module) -> { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext()); Resource.File file = (Resource.File) node.getContent(); - String ordnername = "FU-"+module.title; + String folderName = "FU-"+module.title; File f = new File(Environment.getExternalStoragePublicDirectory( - Environment.DIRECTORY_DOWNLOADS)+"/"+ordnername+"/"+file.getTitle()); + Environment.DIRECTORY_DOWNLOADS)+"/"+folderName+"/"+file.getTitle()); + alertDialogBuilder + .setTitle(file.getTitle()) + .setMessage( + getResources().getString(R.string.creator_name, file.getAuthor()) + "\n" + + getResources().getString(R.string.last_modified_on, UtilsDate.getModifiedDateTime(context, file.getModifiedDate())) + ) + .setCancelable(true) + .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel()); if (f.exists()) {//prüffen ob bereits herunter geladen alertDialogBuilder - .setTitle(file.getTitle()) - .setMessage( - getResources().getString(R.string.creator_name, file.getAuthor()) + "\n" + - getResources().getString(R.string.last_modified_on, UtilsDate.getModifiedDateTime(context, file.getModifiedDate())) - ) - .setCancelable(true) - .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel()) - .setNegativeButton(R.string.openFile, (dialog, id) -> download(file, ordnername, false)) - .setPositiveButton(R.string.download, (dialog, id) -> download(file, ordnername, true)); - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); - } - else { - alertDialogBuilder - .setTitle(file.getTitle()) - .setMessage( - getResources().getString(R.string.creator_name, file.getAuthor()) + "\n" + - getResources().getString(R.string.last_modified_on, UtilsDate.getModifiedDateTime(context, file.getModifiedDate())) - ) - .setCancelable(true) - .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel()) - .setPositiveButton(R.string.download, (dialog, id) -> download(file, ordnername, true)); - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); + .setNegativeButton(R.string.openFile, (dialog, id) -> download(file, folderName, false)); } + alertDialogBuilder + .setPositiveButton(R.string.download, (dialog, id) -> download(file, folderName, true)); + AlertDialog alertDialog = alertDialogBuilder.create(); + alertDialog.show(); }, error -> { log.e(error);