From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Jul 2014 07:38:14 +0000 (+0200)
Subject: Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library
X-Git-Tag: oc-android-1.7.0_signed~267^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fe4fc7a61283b74a89f3586d51363ca32cd59db0?ds=sidebyside;hp=-c

Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library
---

fe4fc7a61283b74a89f3586d51363ca32cd59db0
diff --git a/owncloud-android-library b/owncloud-android-library
index 570c35c9..48d43b57 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 570c35c9214845dc744703669c0829d12fab431d
+Subproject commit 48d43b576c1411be4bbf8a9b96e351fa18948a2f
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 0d1d344f..9c47aa6c 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -110,7 +110,7 @@
         android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/shareIcon"
+        android:id="@+id/sharedIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -120,7 +120,7 @@
         android:src="@drawable/sharedlink" />
 
     <ImageView
-        android:id="@+id/shareWithMeIcon"
+        android:id="@+id/sharedWithMeIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 36bf5a7c..d001bf85 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -690,7 +690,7 @@ public class FileContentProvider extends ContentProvider {
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
 
             if (oldVersion < 7 && newVersion >= 7) {
-                Log_OC.i("SQL", "Entering in the #6 ADD in onUpgrade");
+                Log_OC.i("SQL", "Entering in the #7 ADD in onUpgrade");
                 db.beginTransaction();
                 try {
                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index f1790d19..408154ac 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -114,9 +114,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
             fileName.setText(name);
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
-            ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);
-            ImageView shareWithMeIconV = (ImageView) view.findViewById(R.id.shareWithMeIcon);
-            shareWithMeIconV.setVisibility(View.GONE);
+            ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
+            ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
+            sharedWithMeIconV.setVisibility(View.GONE);
 
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
@@ -166,7 +166,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
 
                 if (checkIfFileIsSharedWithMe(file)) {
-                    shareWithMeIconV.setVisibility(View.VISIBLE);
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);
                 }
             } 
             else {
@@ -180,16 +180,16 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
                 if (checkIfFileIsSharedWithMe(file)) {
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);
-                    shareWithMeIconV.setVisibility(View.VISIBLE);
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);
                 } else {
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
                 }
             }
 
             if (file.isShareByLink()) {
-                shareIconV.setVisibility(View.VISIBLE);
+                sharedIconV.setVisibility(View.VISIBLE);
             } else {
-                shareIconV.setVisibility(View.GONE);
+                sharedIconV.setVisibility(View.GONE);
             }
         }
 
diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index cd01df22..6190ebee 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -135,8 +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.shareIcon).setVisibility(View.GONE);
-            view.findViewById(R.id.shareWithMeIcon).setVisibility(View.GONE);
+            view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
+            view.findViewById(R.id.sharedWithMeIcon).setVisibility(View.GONE);
         }
 
         return view;