Share restriction

res/layout/phone_book.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:layout_width="match_parent">
+
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/Phonebook"
+        />
+</RelativeLayout>

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

@@ -1887,6 +1887,7 @@ public OCCapability saveCapabilities(OCCapability capability){
         cv.put(ProviderTableMeta.CAPABILITIES_VERSION_EDITION, capability.getVersionEdition());
         cv.put(ProviderTableMeta.CAPABILITIES_CORE_POLLINTERVAL, capability.getCorePollinterval());
         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_API_ENABLED, capability.getFilesSharingApiEnabled().getValue());
+        cv.put(ProviderTableMeta.CAPABILITIES_SHARING_INDIVIDUAL_RESTRICTION, capability.getmIndividualFileSharingRestriction().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_ENABLED,
                 capability.getFilesSharingPublicEnabled().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_PASSWORD_ENFORCED,
@@ -2028,6 +2029,9 @@ private OCCapability createCapabilityInstance(Cursor c) {
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_CORE_POLLINTERVAL)));
             capability.setFilesSharingApiEnabled(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_API_ENABLED))));
+            capability.setmIndividualFileSharingRestriction
+                    (CapabilityBooleanType.fromValue(c.getInt(c
+                    .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_INDIVIDUAL_RESTRICTION))));
             capability.setFilesSharingPublicEnabled(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_ENABLED))));
             capability.setFilesSharingPublicPasswordEnforced(CapabilityBooleanType.fromValue(c.getInt(c

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

@@ -33,7 +33,7 @@
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 20;
+    public static final int DB_VERSION = 21;
 
     private ProviderMeta() {
     }
@@ -123,6 +123,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_SHARING_API_ENABLED = "sharing_api_enabled";
         public static final String CAPABILITIES_SHARING_PUBLIC_ENABLED = "sharing_public_enabled";
         public static final String CAPABILITIES_SHARING_PUBLIC_PASSWORD_ENFORCED = "sharing_public_password_enforced";
+        public static final String CAPABILITIES_SHARING_INDIVIDUAL_RESTRICTION = "sharing_restrict_individual_file";
         public static final String CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED =
                 "sharing_public_expire_date_enabled";
         public static final String CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS =

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

@@ -836,22 +836,28 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_MULTIPLE
                             + " INTEGER " + " DEFAULT -1");
+
+
                     upgraded = true;
                     db.setTransactionSuccessful();
 
                 } finally {
                     db.endTransaction();
                 }
             }
-            if (oldVersion < 20 && newVersion >= 20) {
+            if (oldVersion <= 20 && newVersion >= 21) {
 
                 Log_OC.i("SQL", "Entering in the #20 ADD in onUpgrade");
                 db.beginTransaction();
                 try {
-                    db.execSQL("ALTER TABLE " + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+/*                    db.execSQL("ALTER TABLE " + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.
                             CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY + " INTEGER " +
-                            " DEFAULT -1");
+                            " DEFAULT -1");*/
+
+                    db .execSQL("ALTER TABLE " + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                            " ADD COLUMN " + ProviderTableMeta.CAPABILITIES_SHARING_INDIVIDUAL_RESTRICTION + " INTEGER " +
+                            " DEFAULT 0");
                     upgraded = true;
                     db.setTransactionSuccessful();
 
@@ -931,6 +937,7 @@ private void createCapabilitiesTable(SQLiteDatabase db){
                 + ProviderTableMeta.CAPABILITIES_VERSION_EDITION + " TEXT, "
                 + ProviderTableMeta.CAPABILITIES_CORE_POLLINTERVAL + " INTEGER, "
                 + ProviderTableMeta.CAPABILITIES_SHARING_API_ENABLED + " INTEGER, " // boolean
+                + ProviderTableMeta.CAPABILITIES_SHARING_INDIVIDUAL_RESTRICTION + " INTEGER, "
                 + ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_ENABLED + " INTEGER, "  // boolean
                 + ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_PASSWORD_ENFORCED + " INTEGER, "    // boolean
                 + ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED + " INTEGER, "  // boolean

src/com/owncloud/android/ui/activity/PhoneBook.java

@@ -0,0 +1,23 @@
+package com.owncloud.android.ui.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.webkit.WebView;
+
+import com.owncloud.android.R;
+
+public class PhoneBook extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.phone_book);
+
+        WebView webView = (WebView) findViewById(R.id.Phonebook);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.getSettings().setDomStorageEnabled(true);
+        webView.loadUrl("https://phonebook.cern.ch/phonebook/");
+
+
+    }
+}