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

diff --git a/owncloud-android-library b/owncloud-android-library
index 570c35c..48d43b5 160000 (submodule)
--- 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 0d1d344..9c47aa6 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -110,7 +110,7 @@
         android:orientation="vertical">\r
 \r
     <ImageView\r
         android:orientation="vertical">\r
 \r
     <ImageView\r

-        android:id="@+id/shareIcon"\r
+        android:id="@+id/sharedIcon"\r

         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r
         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r


@@ -120,7 +120,7 @@
         android:src="@drawable/sharedlink" />\r
 \r
     <ImageView\r
         android:src="@drawable/sharedlink" />\r
 \r
     <ImageView\r

-        android:id="@+id/shareWithMeIcon"\r
+        android:id="@+id/sharedWithMeIcon"\r

         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r
         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r

diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 36bf5a7..d001bf8 100644 (file)
--- 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", "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 +
                 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 f1790d1..408154a 100644 (file)
--- 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 {
 \r
             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
 \r
             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r

-            ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);\r
-            ImageView shareWithMeIconV = (ImageView) view.findViewById(R.id.shareWithMeIcon);\r
-            shareWithMeIconV.setVisibility(View.GONE);\r
+            ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
+            ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);\r
+            sharedWithMeIconV.setVisibility(View.GONE);\r

 \r
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
 \r
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r


@@ -166,7 +166,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                 fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r

-                    shareWithMeIconV.setVisibility(View.VISIBLE);\r
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);\r

                 }\r
             } \r
             else {\r
                 }\r
             } \r
             else {\r


@@ -180,16 +180,16 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);\r
 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);\r

-                    shareWithMeIconV.setVisibility(View.VISIBLE);\r
+                    sharedWithMeIconV.setVisibility(View.VISIBLE);\r

                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
                 }\r
             }\r
 \r
             if (file.isShareByLink()) {\r
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
                 }\r
             }\r
 \r
             if (file.isShareByLink()) {\r

-                shareIconV.setVisibility(View.VISIBLE);\r
+                sharedIconV.setVisibility(View.VISIBLE);\r

             } else {\r
             } else {\r

-                shareIconV.setVisibility(View.GONE);\r
+                sharedIconV.setVisibility(View.GONE);\r

             }\r
         }\r
 \r
             }\r
         }\r
 \r

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index cd01df2..6190ebe 100644 (file)
--- 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.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;
         }
 
         return view;