Remove share_group_indicator string

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e8bf2d..e6e2303 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -371,7 +371,6 @@
     <string name="share_no_users">No data shared with users yet</string>
     <string name="share_add_user_or_group">Add User or Group</string>
     <string name="share_search">Search</string>
     <string name="share_no_users">No data shared with users yet</string>
     <string name="share_add_user_or_group">Add User or Group</string>
     <string name="share_search">Search</string>

-    <string name="share_group_indicator">(group)</string>

 
     <string name="search_users_and_groups_hint">Search users and groups</string>
     <string name="share_group_clarification">%1$s (group)</string>
 
     <string name="search_users_and_groups_hint">Search users and groups</string>
     <string name="share_group_clarification">%1$s (group)</string>

diff --git a/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java b/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
index 8989a97..76a804f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
@@ -75,7 +75,7 @@ public class ShareUserListAdapter extends ArrayAdapter {
             TextView userName = (TextView) view.findViewById(R.id.userOrGroupName);
             String name = share.getSharedWithDisplayName();
             if (share.getShareType() == ShareType.GROUP) {
             TextView userName = (TextView) view.findViewById(R.id.userOrGroupName);
             String name = share.getSharedWithDisplayName();
             if (share.getShareType() == ShareType.GROUP) {

-                name = name +  mContext.getResources().getString(R.string.share_group_indicator);
+                name = getContext().getString(R.string.share_group_clarification, name);

             }
             userName.setText(name);
 
             }
             userName.setText(name);
 

diff --git a/src/com/owncloud/android/ui/fragment/SearchFragment.java b/src/com/owncloud/android/ui/fragment/SearchFragment.java
index 06bddff..c946ee0 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/SearchFragment.java
+++ b/src/com/owncloud/android/ui/fragment/SearchFragment.java
@@ -2,6 +2,7 @@
  *   ownCloud Android client application
  *
  *   @author masensio
  *   ownCloud Android client application
  *
  *   @author masensio

+ *   @author David A. Velasco

  *   Copyright (C) 2015 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   Copyright (C) 2015 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 13c17c5..38deb99 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -244,6 +244,7 @@ public class ShareFileFragment extends Fragment {
         });
     }
 
         });
     }
 

+    // Call to Unshare operation

     private void unshareWith(OCShare share){
         OCFile file = ((FileActivity) getActivity()).getFile();
 
     private void unshareWith(OCShare share){
         OCFile file = ((FileActivity) getActivity()).getFile();