show notes on receiving shares

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -207,6 +207,7 @@ public boolean saveFile(OCFile file) {
         cv.put(ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT, file.getUnreadCommentsCount());
         cv.put(ProviderTableMeta.FILE_OWNER_ID, file.getOwnerId());
         cv.put(ProviderTableMeta.FILE_OWNER_DISPLAY_NAME, file.getOwnerDisplayName());
+        cv.put(ProviderTableMeta.FILE_NOTE, file.getNote());
 
         boolean sameRemotePath = fileExists(file.getRemotePath());
         if (sameRemotePath ||
@@ -447,6 +448,7 @@ private ContentValues createContentValueForFile(OCFile folder) {
         cv.put(ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT, folder.getUnreadCommentsCount());
         cv.put(ProviderTableMeta.FILE_OWNER_ID, folder.getOwnerId());
         cv.put(ProviderTableMeta.FILE_OWNER_DISPLAY_NAME, folder.getOwnerDisplayName());
+        cv.put(ProviderTableMeta.FILE_NOTE, folder.getNote());
 
         return cv;
     }
@@ -485,6 +487,7 @@ private ContentValues createContentValueForFile(OCFile file, OCFile folder) {
         cv.put(ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT, file.getUnreadCommentsCount());
         cv.put(ProviderTableMeta.FILE_OWNER_ID, file.getOwnerId());
         cv.put(ProviderTableMeta.FILE_OWNER_DISPLAY_NAME, file.getOwnerDisplayName());
+        cv.put(ProviderTableMeta.FILE_NOTE, file.getNote());
 
         return cv;
     }
@@ -983,6 +986,7 @@ private OCFile createFileInstance(Cursor c) {
             file.setUnreadCommentsCount(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT)));
             file.setOwnerId(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_OWNER_ID)));
             file.setOwnerDisplayName(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_OWNER_DISPLAY_NAME)));
+            file.setNote(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NOTE)));
         }
 
         return file;

src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -87,6 +87,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     @Getter @Setter private int unreadCommentsCount;
     @Getter @Setter private String ownerId;
     @Getter @Setter private String ownerDisplayName;
+    @Getter @Setter String note;
 
     /**
      * URI to the local path of the file contents, if stored in the device; cached after first call

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -71,6 +71,7 @@
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.net.URLEncoder;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
 import androidx.annotation.Nullable;
@@ -872,6 +873,16 @@ Drawable doAvatarInBackground() {
 
             int px = getAvatarDimension();
 
+            boolean notOnSameServer = false;
+
+            if (notOnSameServer) {
+                try {
+                    return TextDrawable.createAvatar(mAccount.name, mAvatarRadius);
+                } catch (NoSuchAlgorithmException e) {
+                    Log_OC.e(this, "Error creating avatar", e);
+                }
+            }
+
             // Download avatar from server
             if (mClient != null) {
                 GetMethod get = null;

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -32,7 +32,7 @@
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 43;
+    public static final int DB_VERSION = 44;
 
     private ProviderMeta() {
     }
@@ -108,6 +108,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String FILE_UNREAD_COMMENTS_COUNT = "unread_comments_count";
         public static final String FILE_OWNER_ID = "owner_id";
         public static final String FILE_OWNER_DISPLAY_NAME = "owner_display_name";
+        public static final String FILE_NOTE = "note";
 
         public static final String[] FILE_ALL_COLUMNS = {
             _ID, FILE_PARENT, FILE_NAME, FILE_CREATION, FILE_MODIFIED,

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -700,7 +700,8 @@ private void createFilesTable(SQLiteDatabase db) {
                        + ProviderTableMeta.FILE_HAS_PREVIEW + INTEGER
                        + ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT + INTEGER
                        + ProviderTableMeta.FILE_OWNER_ID + TEXT
-                       + ProviderTableMeta.FILE_OWNER_DISPLAY_NAME + " TEXT);"
+                       + ProviderTableMeta.FILE_OWNER_DISPLAY_NAME + TEXT
+                       + ProviderTableMeta.FILE_NOTE + " TEXT);"
         );
     }
 
@@ -1882,6 +1883,24 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             if (!upgraded) {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
+
+            if (oldVersion < 44 && newVersion >= 44) {
+                Log_OC.i(SQL, "Entering in the #44 add note to file table");
+                db.beginTransaction();
+                try {
+                    db.execSQL(ALTER_TABLE + ProviderTableMeta.FILE_TABLE_NAME +
+                                   ADD_COLUMN + ProviderTableMeta.FILE_NOTE + " TEXT ");
+
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
+            if (!upgraded) {
+                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+            }
         }
 
         @Override

src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java

@@ -71,6 +71,6 @@ public FileDetailActivitiesFragment getFileDetailActivitiesFragment() {
 
     @Override
     public int getCount() {
-        return file.canReshare() ? 2 : 1;
+        return 2;
     }
 }