From fcdef568ea42a0dab6a2ac30b5de10c3918a1a33 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 21 Oct 2015 09:40:39 +0200 Subject: [PATCH 1/1] Remove share_group_indicator string --- res/values/strings.xml | 1 - src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java | 2 +- src/com/owncloud/android/ui/fragment/SearchFragment.java | 1 + src/com/owncloud/android/ui/fragment/ShareFileFragment.java | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6e8bf2dd..e6e2303e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -371,7 +371,6 @@ No data shared with users yet Add User or Group Search - (group) Search users and groups %1$s (group) diff --git a/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java b/src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java index 8989a97a..76a804fd 100644 --- 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) { - name = name + mContext.getResources().getString(R.string.share_group_indicator); + name = getContext().getString(R.string.share_group_clarification, 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 06bddff5..c946ee01 100644 --- 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 + * @author David A. Velasco * 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 13c17c5f..38deb99f 100644 --- 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(); -- 2.11.0