wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

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

@@ -1260,7 +1260,7 @@ public class FileDataStorageManager {
         contentValues.put(ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD, share.isHideFileDownload());
         contentValues.put(ProviderTableMeta.OCSHARES_SHARE_LINK, share.getShareLink());
         contentValues.put(ProviderTableMeta.OCSHARES_SHARE_LABEL, share.getLabel());
-        contentValues.put(ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION, share.isSendPasswordByTalk());
+        //contentValues.put(ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION, share.isSendPasswordByTalk());
 
         return contentValues;
     }
@@ -1285,7 +1285,7 @@ public class FileDataStorageManager {
         share.setHideFileDownload(getInt(cursor, ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD) == 1);
         share.setShareLink(getString(cursor, ProviderTableMeta.OCSHARES_SHARE_LINK));
         share.setLabel(getString(cursor, ProviderTableMeta.OCSHARES_SHARE_LABEL));
-        share.setSendPasswordByTalk(getInt(cursor, ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION) == 1);
+        //share.setSendPasswordByTalk(getInt(cursor, ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION) == 1);
 
         return share;
     }

src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java

@@ -57,7 +57,7 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         updateOp.setPassword(password);
         updateOp.setExpirationDate(expirationDateInMillis);
         updateOp.setHideFileDownload(hideFileDownload);
-        updateOp.setVideoVerification(videoVerification);
+        //updateOp.setVideoVerification(videoVerification);
         updateOp.setLabel(label);
 
         if (publicShare.isFolder()) {

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

@@ -59,8 +59,10 @@ class LinkShareViewHolder extends RecyclerView.ViewHolder {
             binding.copyLink.setVisibility(View.GONE);
         } else {
             if (!TextUtils.isEmpty(publicShare.getLabel())) {
-                String text = String.format(context.getString(R.string.share_link), publicShare.getLabel());
+                String text = String.format(context.getString(R.string.share_link_with_label), publicShare.getLabel());
                 binding.name.setText(text);
+            } else {
+                binding.name.setText(R.string.share_link);
             }
         }
 

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

@@ -95,7 +95,7 @@ class ShareViewHolder extends RecyclerView.ViewHolder {
     private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
         try {
             avatar.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadiusDimension));
-        } catch (NoSuchAlgorithmException e) {
+        } catch (NoSuchAlgorithmException | StringIndexOutOfBoundsException e) {
             avatar.setImageResource(fallback);
         }
     }

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

@@ -36,4 +36,6 @@ public interface ShareeListAdapterListener {
     void copyInternalLink();
 
     void createPublicShareLink();
+
+    void requestPasswordForShare(OCShare share, boolean askForPassword);
 }

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -374,7 +374,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
         super.onAttach(context);
         if (context instanceof ToolbarActivity) {
             toolbarActivity = (ToolbarActivity) context;
-            toolbarActivity.hideSortListGroup();
+            //toolbarActivity.hideSortListGroup(); TODO check if needed?
         }
     }
 

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -404,8 +404,8 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
         menu.findItem(R.id.action_share_send_note).setVisible(capabilities.getVersion().isNoteOnShareSupported());
 
         MenuItem videoVerification = menu.findItem(R.id.link_share_video_verification);
-        if (videoVerification != null) {
-            videoVerification.setChecked(publicShare.isSendPasswordByTalk());
+//        if (videoVerification != null) {
+//            videoVerification.setChecked(publicShare.isSendPasswordByTalk());
 
 
 //            -When enabling it:
@@ -414,7 +414,7 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
 //                -When disabling it:
 //            -If it is for a mail share, you must always set a new password (which is also different from the previous one)
 //                -If it is for a link share, you do not need to set a new password
-        }
+//        }
     }
 
     private boolean userOptionsItemSelected(Menu menu,
@@ -438,7 +438,7 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
                 return true;
             }
             case R.id.action_password: {
-                requestPasswordForShare(share);
+                requestPasswordForShare(share, capabilities.getFilesSharingPublicAskForOptionalPassword().isTrue());
                 return true;
             }
             case R.id.action_expiration_date: {

src/main/res/layout/file_details_share_internal_share_link.xml

@@ -21,7 +21,7 @@
   -->
 
 <LinearLayout android:id="@+id/copy_internal_container"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/sharee_list_item_size"
     android:layout_width="match_parent"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/standard_half_padding"

src/main/res/layout/file_details_share_link_share_item.xml

@@ -25,7 +25,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/share_by_link_container"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/standard_list_item_size"
+    android:layout_height="@dimen/sharee_list_item_size"
     android:orientation="horizontal">
 
     <ImageView

src/main/res/layout/file_details_share_public_link_add_new_item.xml

@@ -25,7 +25,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/add_public_share"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/standard_list_item_size"
+    android:layout_height="@dimen/sharee_list_item_size"
     android:orientation="horizontal">
 
     <ImageView

src/main/res/layout/file_details_share_share_item.xml

@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:layout_height="@dimen/standard_list_item_size"
+    android:layout_height="@dimen/sharee_list_item_size"
     android:weightSum="1"
     tools:ignore="UseCompoundDrawables">
 

src/main/res/layout/file_details_sharing_fragment.xml

@@ -17,7 +17,7 @@
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout android:id="@+id/shareContainer"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:paddingTop="@dimen/standard_eight_padding"
@@ -97,6 +97,7 @@
         android:dividerHeight="1dp"
         android:id="@+id/sharesList"
         android:layout_height="match_parent"
-        android:layout_width="match_parent" />
+        android:layout_width="match_parent"
+        android:layout_marginBottom="72dp" />
 
 </LinearLayout>

src/main/res/layout/toolbar_standard.xml

@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="?attr/actionBarSize"
             android:background="@color/bg_default"
-            android:paddingTop="@dimen/standard_eigth_padding"
+            android:paddingTop="@dimen/standard_eight_padding"
             android:visibility="gone"
             tools:visibility="visible">
 

src/main/res/values/dims.xml

@@ -40,6 +40,7 @@
     <dimen name="standard_eighth_margin">2dp</dimen>
     <dimen name="min_list_item_size">56dp</dimen>
     <dimen name="standard_list_item_size">72dp</dimen>
+    <dimen name="sharee_list_item_size">56dp</dimen>
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">12sp</dimen>
     <dimen name="list_item_share_right_margin">12dp</dimen>

src/main/res/values/strings.xml

@@ -934,7 +934,8 @@
     <string name="add_new_public_share">Add new public share link</string>
     <string name="edit_label">Change name</string>
     <string name="public_share_name">New name</string>
-    <string name="share_link">Share link (%1$s)</string>
+    <string name="share_link_with_label">Share link (%1$s)</string>
+    <string name="share_link">Share link</string>
     <string name="allow_creating">Allow creating</string>
     <string name="allow_deleting">Allow deleting</string>
     <string name="allow_resharing">Allow resharing</string>