projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cea1a76
)
OC-2804: Fix bug: All files are marked as shared in uploads list
author
masensio
<masensio@solidgear.es>
Mon, 3 Feb 2014 12:13:01 +0000
(13:13 +0100)
committer
masensio
<masensio@solidgear.es>
Mon, 3 Feb 2014 12:13:01 +0000
(13:13 +0100)
owncloud-android-library
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
patch
|
blob
|
blame
|
history
diff --git
a/owncloud-android-library
b/owncloud-android-library
index
d731ff0
..
8c87d88
160000
(submodule)
--- a/
owncloud-android-library
+++ b/
owncloud-android-library
@@
-1
+1
@@
-Subproject commit
d731ff0e6638a168e10a92da3915fcdd2f65aa37
+Subproject commit
8c87d88cff376038248216ea2eb00c0c5ed110e0
diff --git
a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index
b96a41b
..
f31ca14
100644
(file)
--- a/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@
-1,6
+1,6
@@
/* ownCloud Android client application
\r
* Copyright (C) 2011 Bartek Przybylski
\r
/* ownCloud Android client application
\r
* Copyright (C) 2011 Bartek Przybylski
\r
- * Copyright (C) 2012-201
3
ownCloud Inc.
\r
+ * Copyright (C) 2012-201
4
ownCloud Inc.
\r
*
\r
* This program is free software: you can redistribute it and/or modify
\r
* it under the terms of the GNU General Public License version 2,
\r
*
\r
* This program is free software: you can redistribute it and/or modify
\r
* it under the terms of the GNU General Public License version 2,
\r
diff --git
a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index
7cd2c2a
..
5686874
100644
(file)
--- a/
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@
-1,6
+1,6
@@
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
- * Copyright (C) 2012-201
3
ownCloud Inc.
+ * Copyright (C) 2012-201
4
ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@@
-135,6
+135,8
@@
public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
view.findViewById(R.id.imageView2).setVisibility(View.INVISIBLE); // not GONE; the alignment changes; ugly way to keep it
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
view.findViewById(R.id.imageView2).setVisibility(View.INVISIBLE); // not GONE; the alignment changes; ugly way to keep it
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
+
+ view.findViewById(R.id.shareIcon).setVisibility(View.GONE);
}
return view;
}
return view;