Bläddra i källkod

handle nullable contexts

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 7 månader sedan
förälder
incheckning
4a8ceb59aa

+ 2 - 1
app/src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -185,7 +185,8 @@ public class FileMenuFilter {
     }
 
     private void filterSendFiles(List<Integer> toHide, boolean inSingleFileFragment) {
-        if (!MDMConfig.INSTANCE.sendFilesSupport(context) || (overflowMenu || containsEncryptedFile()) ||
+        if ((context != null && !MDMConfig.INSTANCE.sendFilesSupport(context)) ||
+            (overflowMenu || containsEncryptedFile()) ||
             (!inSingleFileFragment && (isSingleSelection() || !allFileDown())) ||
             !toHide.contains(R.id.action_send_share_file)) {
             toHide.add(R.id.action_send_file);

+ 6 - 1
app/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -308,7 +308,7 @@ public class UserListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
         private final Context context;
 
-        AddAccountViewHolderItem(@NonNull AccountActionBinding binding, @NonNull Context context) {
+        AddAccountViewHolderItem(@NonNull AccountActionBinding binding, Context context) {
             super(binding.getRoot());
             this.context = context;
         }
@@ -319,6 +319,11 @@ public class UserListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
          * @param accountListAdapterListener {@link Listener}
          */
         private void bind(Listener accountListAdapterListener) {
+            if (context == null) {
+                Log_OC.d(TAG,"Context cannot be null, AddAccountViewHolderItem onClick is disabled");
+                return;
+            }
+
             if (MDMConfig.INSTANCE.showIntro(context)) {
                 itemView.setOnClickListener(v -> accountListAdapterListener.showFirstRunActivity());
             } else {