Explorar o código

Splitted User ClickListener interface in two methods

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
Kilian Périsset %!s(int64=4) %!d(string=hai) anos
pai
achega
5464453901

+ 18 - 14
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -470,9 +470,22 @@ public class ManageAccountsActivity extends FileActivity implements UserListAdap
         }
     }
 
-    @Override
-    public void onClick(User user, View view) {
+    public static void openAccountRemovalConfirmationDialog(User user, FragmentManager fragmentManager) {
+        AccountRemovalConfirmationDialog dialog =
+            AccountRemovalConfirmationDialog.newInstance(user);
+        dialog.show(fragmentManager, "dialog");
+    }
+
+    private void openAccount(User user) {
+        final Intent intent = new Intent(this, UserInfoActivity.class);
+        intent.putExtra(UserInfoActivity.KEY_ACCOUNT, user);
+        OwnCloudAccount oca = user.toOwnCloudAccount();
+        intent.putExtra(KEY_DISPLAY_NAME, oca.getDisplayName());
+        startActivityForResult(intent, KEY_USER_INFO_REQUEST_CODE);
+    }
 
+    @Override
+    public void onOptionItemClicked(User user, View view) {
         if (view.getId() == R.id.account_menu) {
             ImageView menuButton = findViewById(R.id.account_menu);
 
@@ -492,18 +505,9 @@ public class ManageAccountsActivity extends FileActivity implements UserListAdap
         }
     }
 
-    public static void openAccountRemovalConfirmationDialog(User user, FragmentManager fragmentManager) {
-        AccountRemovalConfirmationDialog dialog =
-            AccountRemovalConfirmationDialog.newInstance(user);
-        dialog.show(fragmentManager, "dialog");
-    }
-
-    private void openAccount(User user) {
-        final Intent intent = new Intent(this, UserInfoActivity.class);
-        intent.putExtra(UserInfoActivity.KEY_ACCOUNT, user);
-        OwnCloudAccount oca = user.toOwnCloudAccount();
-        intent.putExtra(KEY_DISPLAY_NAME, oca.getDisplayName());
-        startActivityForResult(intent, KEY_USER_INFO_REQUEST_CODE);
+    @Override
+    public void onAccountClicked(User user) {
+        openAccount(user);
     }
 
     /**

+ 4 - 2
src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -314,7 +314,7 @@ public class UserListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         @Override
         public void onClick(View v) {
             if (clickListener != null && v.isEnabled()) {
-                clickListener.onClick(user, v);
+                clickListener.onOptionItemClicked(user, v);
             }
         }
     }
@@ -331,6 +331,8 @@ public class UserListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public interface ClickListener {
-        void onClick(User user, View view);
+        void onOptionItemClicked(User user, View view);
+
+        void onAccountClicked(User user);
     }
 }

+ 6 - 1
src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java

@@ -131,7 +131,12 @@ public class MultipleAccountsDialog extends DialogFragment implements Injectable
     }
 
     @Override
-    public void onClick(User user, View view) {
+    public void onOptionItemClicked(User user, View view) {
+        // Do nothing
+    }
+
+    @Override
+    public void onAccountClicked(User user) {
         final ReceiveExternalFilesActivity parentActivity = (ReceiveExternalFilesActivity) getActivity();
         if (parentActivity != null) {
             parentActivity.changeAccount(user.toPlatformAccount());