Эх сурвалжийг харах

minor code changes after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 жил өмнө
parent
commit
f07e14fd30

+ 3 - 5
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -23,7 +23,6 @@
 
 package com.owncloud.android.ui.fragment;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.SearchManager;
 import android.content.Context;
@@ -96,9 +95,6 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
     private static final String ARG_USER = "USER";
     public static final int PERMISSION_EDITING_ALLOWED = 17;
 
-    // to show share with users/groups info
-    private List<OCShare> shares;
-
     private OCFile file;
     private User user;
     private OCCapability capabilities;
@@ -283,7 +279,9 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
 
     private void setShareWithUserInfo() {
         // TODO Refactoring: create a new {@link ShareUserListAdapter} instance with every call should not be needed
-        shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(), account.name);
+        // to show share with users/groups info
+        List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
+                                                                            user.toPlatformAccount().name);
         if (shares.size() > 0) {
             AccountManager accountManager = AccountManager.get(getContext());
             String userId = accountManager.getUserData(user.toPlatformAccount(),

+ 0 - 1
src/main/res/layout/file_details_share_public_link_add_new_item.xml

@@ -30,7 +30,6 @@
     android:visibility="gone">
 
     <ImageView
-        android:id="@+id/copy_internal_link_icon"
         android:layout_width="@dimen/share_icon_size"
         android:layout_height="@dimen/share_icon_size"
         android:layout_gravity="center_vertical"

+ 0 - 1
src/main/res/values/dims.xml

@@ -135,7 +135,6 @@
     <dimen name="permission_dialog_text_size">18sp</dimen>
     <dimen name="button_corner_radius">24dp</dimen>
     <integer name="media_grid_width">4</integer>
-    <dimen name="copy_internal_link_padding">10dp</dimen>
     <dimen name="drawer_header_height">130dp</dimen>
     <dimen name="drawer_header_logo_width">170dp</dimen>
     <dimen name="account_action_button_margin">12dp</dimen>