Download Bugs gefixt und Berechtigungsprüfung verbessert

.idea/misc.xml

@@ -25,5 +25,5 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/FUPlanner.iml" filepath="$PROJECT_DIR$/FUPlanner.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/FUPlanner.iml" filepath="$PROJECT_DIR$/.idea/FUPlanner.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

app/src/main/java/de/sebse/fuplanner/MainActivity.java

@@ -18,7 +18,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.function.BiConsumer;
 
 import de.sebse.fuplanner.fragments.CanteensFragment;
 import de.sebse.fuplanner.fragments.LoginFragment;
@@ -34,11 +36,12 @@ import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
 import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.types.LoginToken;
 import de.sebse.fuplanner.services.KVV.types.Modules;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
+import de.sebse.fuplanner.tools.RequestPermissionsResultListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 public class MainActivity extends AppCompatActivity
-        implements MainAcitivityListener,
+        implements MainActivityListener,
         NavigationView.OnNavigationItemSelectedListener,
         LoginFragment.OnLoginFragmentInteractionListener,
         ModulesFragment.OnModulesFragmentInteractionListener,
@@ -68,6 +71,7 @@ public class MainActivity extends AppCompatActivity
     private String fragmentData = "";
     private CanteenBrowser mCanteenBrowser;
     private boolean mOfflineMode = false;
+    private HashMap<String, RequestPermissionsResultListener> permissionListeners = new HashMap<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -215,6 +219,13 @@ public class MainActivity extends AppCompatActivity
         super.onSaveInstanceState(savedInstanceState);
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (RequestPermissionsResultListener listener: permissionListeners.values()) {
+            listener.callback(requestCode, permissions, grantResults);
+        }
+    }
+
     /* --------------------------------------------*/
     /* --------------------------------------------*/
     /* --------------------------------------------*/
@@ -482,4 +493,12 @@ public class MainActivity extends AppCompatActivity
     public void refreshFailed(boolean isFailed) {
         setRefreshFailedBanner(isFailed);
     }
+
+    public void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id) {
+        permissionListeners.put(id, listener);
+    }
+
+    public void removeRequestPermissionsResultListener(String id) {
+        permissionListeners.remove(id);
+    }
 }

app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java

@@ -14,7 +14,7 @@ import android.view.ViewGroup;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
@@ -87,8 +87,8 @@ public class CanteensFragment extends Fragment {
             throw new RuntimeException(context.toString()
                     + " must implement OnCanteensFragmentInteractionListener");
         }
-        if (context instanceof MainAcitivityListener)
+        if (context instanceof MainActivityListener)
-            ((MainAcitivityListener) context).onTitleTextChange(R.string.canteens);
+            ((MainActivityListener) context).onTitleTextChange(R.string.canteens);
         else
             throw new RuntimeException(context.toString() + "must implement MainActivityListener");
     }

app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java

@@ -19,7 +19,7 @@ import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
 import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.types.LoginToken;
 import de.sebse.fuplanner.services.KVV.types.Modules;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
@@ -120,8 +120,8 @@ public class LoginFragment extends Fragment {
             throw new RuntimeException(context.toString()
                     + " must implement OnLoginFragmentInteractionListener");
         }
-        if (context instanceof MainAcitivityListener)
+        if (context instanceof MainActivityListener)
-            ((MainAcitivityListener) context).onTitleTextChange(R.string.log_in);
+            ((MainActivityListener) context).onTitleTextChange(R.string.log_in);
         else
             throw new RuntimeException(context.toString() + "must implement MainActivityListener");
     }

app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java

@@ -14,7 +14,7 @@ import android.view.ViewGroup;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.KVV.KVV;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
@@ -87,8 +87,8 @@ public class ModulesFragment extends Fragment {
             throw new RuntimeException(context.toString()
                     + " must implement OnModulesFragmentInteractionListener");
         }
-        if (context instanceof MainAcitivityListener)
+        if (context instanceof MainActivityListener)
-            ((MainAcitivityListener) context).onTitleTextChange(R.string.courses);
+            ((MainActivityListener) context).onTitleTextChange(R.string.courses);
         else
             throw new RuntimeException(context.toString() + "must implement MainActivityListener");
     }

app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java

@@ -20,7 +20,7 @@ import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.types.Event;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.tools.UtilsDate;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.weekview.MonthLoader;
 import de.sebse.fuplanner.tools.ui.weekview.WeekView;
@@ -29,14 +29,14 @@ import de.sebse.fuplanner.tools.ui.weekview.WeekViewEvent;
 /**
  * A simple {@link Fragment} subclass.
  * Activities that contain this fragment must implement the
- * {@link MainAcitivityListener} interface
+ * {@link MainActivityListener} interface
  * to handle interaction events.
  * Use the {@link ScheduleFragment#newInstance} factory method to
  * create an instance of this fragment.
  *
  */
 public class ScheduleFragment extends Fragment implements MonthLoader.MonthChangeListener, WeekView.ScrollListener, WeekView.DoubleTapListener, WeekView.EventClickListener {
-    private MainAcitivityListener mListener;
+    private MainActivityListener mListener;
     private WeekView mWeekView;
     private final Logger log = new Logger(this);
     private Modules mModules = null;
@@ -99,8 +99,8 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof MainAcitivityListener) {
+        if (context instanceof MainActivityListener) {
-            mListener = (MainAcitivityListener) context;
+            mListener = (MainActivityListener) context;
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement OnFragmentInteractionListener");

app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java

@@ -13,7 +13,7 @@ import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
 import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
@@ -21,7 +21,7 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 /**
  * A simple {@link Fragment} subclass.
  * Activities that contain this fragment must implement the
- * {@link MainAcitivityListener} interface
+ * {@link MainActivityListener} interface
  * to handle interaction events.
  * Use the {@link DaySwitcherFragment#newInstance} factory method to
  * create an instance of this fragment.
@@ -32,7 +32,7 @@ public class DaySwitcherFragment extends Fragment implements DaySwitcherListener
     // Parameters
     private int mCanteenId;
 
-    private MainAcitivityListener mListener;
+    private MainActivityListener mListener;
     private final Logger log = new Logger(this);
     private ViewPager mViewPager;
     private DaySwitcherAdapter adapterViewPager;
@@ -90,8 +90,8 @@ public class DaySwitcherFragment extends Fragment implements DaySwitcherListener
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof MainAcitivityListener) {
+        if (context instanceof MainActivityListener) {
-            mListener = (MainAcitivityListener) context;
+            mListener = (MainActivityListener) context;
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement MainActivityListener");

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java

@@ -11,13 +11,13 @@ import android.view.ViewGroup;
 
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.KVV.types.Modules;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
  * A simple {@link Fragment} subclass.
  * Activities that contain this fragment must implement the
- * {@link MainAcitivityListener} interface
+ * {@link MainActivityListener} interface
  * to handle interaction events.
  * Use the {@link ModDetailFragment#newInstance} factory method to
  * create an instance of this fragment.
@@ -28,7 +28,7 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
     // Parameters
     private String mItemPos;
 
-    private MainAcitivityListener mListener;
+    private MainActivityListener mListener;
     private final Logger log = new Logger(this);
     private ViewPager mViewPager;
     private String mPageRestoreRequest = null;
@@ -97,8 +97,8 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof MainAcitivityListener) {
+        if (context instanceof MainActivityListener) {
-            mListener = (MainAcitivityListener) context;
+            mListener = (MainActivityListener) context;
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement MainActivityListener");

app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java

@@ -5,6 +5,7 @@ import android.Manifest;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
@@ -20,14 +21,18 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
+import de.sebse.fuplanner.fragments.LoginFragment;
 import de.sebse.fuplanner.services.KVV.KVV;
 import de.sebse.fuplanner.services.KVV.types.Modules;
 import de.sebse.fuplanner.services.KVV.types.Resource;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.Regex;
+import de.sebse.fuplanner.tools.RequestPermissionsResultListener;
 import de.sebse.fuplanner.tools.UtilsDate;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.treeview.DirectoryNodeBinder;
@@ -35,6 +40,8 @@ import de.sebse.fuplanner.tools.ui.treeview.FileNodeBinder;
 import de.sebse.fuplanner.tools.ui.treeview.TreeNode;
 import de.sebse.fuplanner.tools.ui.treeview.TreeViewAdapter;
 
+import static android.support.v4.content.ContextCompat.checkSelfPermission;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link ModDetailResourceFragment#newInstance} factory method to
@@ -47,6 +54,8 @@ public class ModDetailResourceFragment extends Fragment {
     private final Logger log = new Logger(this);
     private ModDetailResourceAdapter adapter;
     private SwipeRefreshLayout swipeLayout;
+    private MainActivityListener context;
+    private RequestedDownload requestedDownload;
 
 
     public ModDetailResourceFragment() {
@@ -95,7 +104,7 @@ public class ModDetailResourceFragment extends Fragment {
                     onToggle(!node.isExpand(), holder);
 //                    if (!node.isExpand())
 //                        adapter.collapseBrotherNode(node);
-                } else {
+                } else if(node.getContent() instanceof Resource.File) {
                     KVV kvv = ((MainActivity) getActivity()).getKVV();
                     kvv.getModule(mItemPos, (Modules.Module module) -> {
                         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext());
@@ -159,26 +168,28 @@ public class ModDetailResourceFragment extends Fragment {
         return view;
     }
 
-    private void download(Resource.File file, String modul, boolean downloadNew){
+    private void download(Resource.File file, String folderName, boolean downloadNew){
-        KVV kvv = ((MainActivity) getActivity()).getKVV();
+        if (getActivity() == null) {
-
+            showDownloadError();
+            return;
+        }
+        if (checkSelfPermission(getActivity(), android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+            // Access granted
+            downloadOrOpen(file, folderName, downloadNew);
+        } else {
+            this.requestedDownload = new RequestedDownload(file, folderName, downloadNew);
             ActivityCompat.requestPermissions(ModDetailResourceFragment.super.getActivity(),
                     new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                     1);
+        }
+    }
 
+    private void downloadOrOpen(Resource.File file, String folderName, boolean downloadNew) {
+        KVV kvv = this.context.getKVV();
         if(isExternalStorageWritable()){
             kvv.getResourceFile(success1 -> {
                 if (success1.equals("")){//Datei wurde nicht heruntergeladen
-                        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext());
+                    showDownloadError();
-                        alertDialogBuilder
-                                .setTitle(R.string.ErrorFileDownload)
-                                .setMessage(
-                                        R.string.ErrorFileDownloadText
-                                )
-                                .setCancelable(true)
-                                .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel());
-                        AlertDialog alertDialog = alertDialogBuilder.create();
-                        alertDialog.show();
                 }else {
                     if (Regex.has("^http", success1)){
                         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(success1));
@@ -189,18 +200,62 @@ public class ModDetailResourceFragment extends Fragment {
                     }
 
                 }
-                }, error -> {
+            }, log::e, file.getTitle(), file.getUrl(), folderName, downloadNew);
-
+        }
-                    log.e(error);
-                }, file.getTitle(), file.getUrl(), modul,  downloadNew );
     }
 
+    private void showDownloadError() {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext());
+        alertDialogBuilder
+                .setTitle(R.string.ErrorFileDownload)
+                .setMessage(
+                        R.string.ErrorFileDownloadText
+                )
+                .setCancelable(true)
+                .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel());
+        AlertDialog alertDialog = alertDialogBuilder.create();
+        alertDialog.show();
+    }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof MainActivityListener) {
+            this.context = ((MainActivityListener) context);
+            this.context.addRequestPermissionsResultListener((requestCode, permissions, grantResults) -> {
+                if (requestedDownload == null) {
+                    log.d("No request");
+                    return;
+                }
+                if (getActivity() == null) {
+                    showDownloadError();
+                    return;
+                }
+                ArrayList<Integer> intList = new ArrayList<>();
+                for (int i : grantResults)
+                {
+                    intList.add(i);
+                }
+                log.d(requestCode, Arrays.asList(permissions), intList);
+                int pos = Arrays.asList(permissions).indexOf("android.permission.WRITE_EXTERNAL_STORAGE");
+                if (pos != -1) {
+                    if (grantResults[pos] != -1) {
+                        downloadOrOpen(requestedDownload.file, requestedDownload.folderName, requestedDownload.downloadNew);
+                    } else {
+                        log.d(requestedDownload, pos, grantResults[pos]);
+                        showDownloadError();
+                    }
+                    requestedDownload = null;
+                }
+            }, "ModDetailResourceFragment");
+        } else
+            throw new RuntimeException(context.toString() + "must implement MainActivityListener");
+    }
 
-
+    @Override
-
+    public void onDetach() {
-
+        super.onDetach();
-
+        this.context.removeRequestPermissionsResultListener("ModDetailResourceFragment");
     }
 
     /* Checks if external storage is available for read and write */
@@ -286,4 +341,19 @@ public class ModDetailResourceFragment extends Fragment {
         }
     }
 
+
+
+
+
+    private class RequestedDownload {
+        Resource.File file;
+        String folderName;
+        boolean downloadNew;
+
+        RequestedDownload(Resource.File file, String folderName, boolean downloadNew) {
+            this.file = file;
+            this.folderName = folderName;
+            this.downloadNew = downloadNew;
+        }
+    }
 }

app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java

@@ -13,7 +13,7 @@ import de.sebse.fuplanner.services.Canteen.types.Canteen;
 import de.sebse.fuplanner.services.Canteen.types.Canteens;
 import de.sebse.fuplanner.services.Canteen.types.Day;
 import de.sebse.fuplanner.tools.AsyncQueue;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkError;
@@ -23,12 +23,12 @@ public class CanteenBrowser extends HTTPService {
     private Canteens canteens;
     private final AsyncQueue queue = new AsyncQueue();
     private final Context context;
-    private MainAcitivityListener mListener;
+    private MainActivityListener mListener;
 
     public CanteenBrowser(Context context) {
         super(context);
         this.context = context;
-        if (context instanceof MainAcitivityListener)
+        if (context instanceof MainActivityListener)
             mListener = (MainActivity) context;
         else
             throw new RuntimeException(context.toString() + "must implement MainActivityListener");

app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java

@@ -10,7 +10,7 @@ import java.util.HashMap;
 
 import de.sebse.fuplanner.services.KVV.types.LoginToken;
 import de.sebse.fuplanner.services.KVV.types.Modules;
-import de.sebse.fuplanner.tools.MainAcitivityListener;
+import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
@@ -25,11 +25,11 @@ public class KVV {
     private boolean isLoginPending = true;
     private final ArrayList<LastTokenCallback> updatingList;
     private final HashMap<String, Object> addons = new HashMap<>();
-    private final MainAcitivityListener mListener;
+    private final MainActivityListener mListener;
     private Logger log = new Logger(this);
 
     public KVV(Context context) {
-        mListener = (MainAcitivityListener) context;
+        mListener = (MainActivityListener) context;
         this.context = context;
         this.updatingList = new ArrayList<>();
     }

app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java

@@ -6,7 +6,7 @@ import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
 import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
 import de.sebse.fuplanner.services.KVV.KVV;
 
-public interface MainAcitivityListener {
+public interface MainActivityListener {
     void onTitleTextChange(String newTitle);
 
     void onTitleTextChange(@StringRes int titleId);
@@ -20,4 +20,8 @@ public interface MainAcitivityListener {
     void refreshFailed(boolean isFailed);
 
     CanteenBrowser getCanteenBrowser();
+
+    void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id);
+
+    void removeRequestPermissionsResultListener(String id);
 }

app/src/main/java/de/sebse/fuplanner/tools/RequestPermissionsResultListener.java

@@ -0,0 +1,5 @@
+package de.sebse.fuplanner.tools;
+
+public interface RequestPermissionsResultListener {
+    void callback(int requestCode, String[] permissions, int[] grantResults);
+}