cleanup

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

.idea/codeStyles/Project.xml

@@ -56,7 +56,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

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

@@ -1261,7 +1261,6 @@ 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());
 
         return contentValues;
     }
@@ -1286,7 +1285,6 @@ 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);
 
         return share;
     }

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

@@ -35,7 +35,7 @@ import java.util.List;
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 60;
+    public static final int DB_VERSION = 59;
 
     private ProviderMeta() {
         // No instance
@@ -171,7 +171,6 @@ public class ProviderMeta {
         public static final String OCSHARES_HIDE_DOWNLOAD = "hide_download";
         public static final String OCSHARES_SHARE_LINK = "share_link";
         public static final String OCSHARES_SHARE_LABEL = "share_label";
-        public static final String OCSHARES_VIDEO_VERIFICATION = "video_verification";
 
         public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE
                 + " collate nocase asc";

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

@@ -58,12 +58,6 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         updateOp.setHideFileDownload(hideFileDownload);
         updateOp.setLabel(label);
 
-//        if (publicShare.isFolder()) {
-//            updateOp.setPublicUploadOnFolder(publicUpload);
-//        } else {
-//            updateOp.setPublicUploadOnFile(publicUpload);
-//        }
-
         RemoteOperationResult result = updateOp.execute(client);
 
         if (result.isSuccess()) {

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

@@ -748,8 +748,7 @@ public class FileContentProvider extends ContentProvider {
                        + ProviderTableMeta.OCSHARES_NOTE + TEXT
                        + ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD + INTEGER
                        + ProviderTableMeta.OCSHARES_SHARE_LINK + TEXT
-                       + ProviderTableMeta.OCSHARES_SHARE_LABEL + TEXT
-                       + ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION + " INTEGER );");
+                       + ProviderTableMeta.OCSHARES_SHARE_LABEL + " TEXT );");
     }
 
     private void createCapabilitiesTable(SQLiteDatabase db) {
@@ -2267,24 +2266,6 @@ public class FileContentProvider extends ContentProvider {
             if (!upgraded) {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
-
-            if (oldVersion < 60 && newVersion >= 60) {
-                Log_OC.i(SQL, "Entering in the #60 add video verification to share table");
-                db.beginTransaction();
-                try {
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.OCSHARES_TABLE_NAME +
-                                   ADD_COLUMN + ProviderTableMeta.OCSHARES_VIDEO_VERIFICATION + " INTEGER ");
-
-                    upgraded = true;
-                    db.setTransactionSuccessful();
-                } finally {
-                    db.endTransaction();
-                }
-            }
-
-            if (!upgraded) {
-                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
-            }
         }
     }
 }

src/main/java/com/owncloud/android/services/OperationsService.java

@@ -106,7 +106,6 @@ public class OperationsService extends Service {
     public static final String EXTRA_SHARE_PUBLIC_UPLOAD = "SHARE_PUBLIC_UPLOAD";
     public static final String EXTRA_SHARE_PUBLIC_LABEL = "SHARE_PUBLIC_LABEL";
     public static final String EXTRA_SHARE_HIDE_FILE_DOWNLOAD = "HIDE_FILE_DOWNLOAD";
-    public static final String EXTRA_SHARE_VIDEO_VERIFICATION = "VIDEO_VERIFICATION";
     public static final String EXTRA_SHARE_ID = "SHARE_ID";
     public static final String EXTRA_SHARE_NOTE = "SHARE_NOTE";
     public static final String EXTRA_IN_BACKGROUND = "IN_BACKGROUND";

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

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