auto delete uploaded images

.gitignore

@@ -49,6 +49,8 @@ debugkey.properties
 # Misc
 .DS_Store
 app/seed.txt
+app/map.txt
+app/release
 out/
 
 *.store

app/build.gradle

@@ -18,11 +18,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-        disable 'MissingTranslation'
-    }
-
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -62,7 +57,7 @@ android {
             resValue "string", "account_type", "com.seafile.seadroid2.debug.account.api2"
             buildConfigField "String", "ACCOUNT_TYPE", '"com.seafile.seadroid2.debug.account.api2"'
             signingConfig signingConfigs.debug
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
             applicationVariants.all { variant ->
                 variant.outputs.all { output ->
@@ -121,5 +116,9 @@ android {
         implementation 'com.github.bumptech.glide:glide:4.9.0'
         annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     }
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
 }
 

app/src/main/java/com/seafile/seadroid2/cameraupload/CameraUploadDBHelper.java

@@ -34,7 +34,7 @@ public class CameraUploadDBHelper extends SQLiteOpenHelper {
             "CREATE TABLE " + PHOTOCACHE_TABLE_NAME + " ("
                     + PHOTOCACHE_COLUMN_ID + " INTEGER PRIMARY KEY, "
                     + PHOTOCACHE_COLUMN_FILE + " TEXT NOT NULL, "
-                    + PHOTOCACHE_COLUMN_DATE_ADDED + " BIGINT NOT NULL);";
+                    + PHOTOCACHE_COLUMN_DATE_ADDED + " BIGINT NOT NULL)";
 
     private static final String[] projection = {
             PHOTOCACHE_COLUMN_ID,
@@ -83,9 +83,9 @@ public void onCreate(SQLiteDatabase db) {
 
     private void createPhotoCacheTable(SQLiteDatabase db) {
         db.execSQL(SQL_CREATE_PHOTOCACHE_TABLE);
-        db.execSQL("CREATE INDEX photo_repoid_index ON " + PHOTOCACHE_TABLE_NAME
+        db.execSQL("CREATE INDEX photo_file_index ON " + PHOTOCACHE_TABLE_NAME
                 + " (" + PHOTOCACHE_COLUMN_FILE + ");");
-        db.execSQL("CREATE INDEX photo_account_index ON " + PHOTOCACHE_TABLE_NAME
+        db.execSQL("CREATE INDEX photo_date_index ON " + PHOTOCACHE_TABLE_NAME
                 + " (" + PHOTOCACHE_COLUMN_DATE_ADDED + ");");
     }
 
@@ -142,7 +142,6 @@ public void markAsUploaded(File file) {
     }
 
     public void markAsUploaded(String path, long modified) {
-
         ContentValues values = new ContentValues();
         values.put(PHOTOCACHE_COLUMN_FILE, path);
         values.put(PHOTOCACHE_COLUMN_DATE_ADDED, modified);
@@ -181,8 +180,8 @@ public boolean isInRepo(File file){
     }
 
     public boolean isInRepo(String bucketName, String filename, long filelength){
-        String prefix = filename.substring(0, filename.lastIndexOf("."));
-        String suffix = filename.substring(filename.lastIndexOf("."));
+//        String prefix = filename.substring(0, filename.lastIndexOf("."));
+//        String suffix = filename.substring(filename.lastIndexOf("."));
 //        Cursor c = database.query(
 //                REPOCACHE_TABLE_NAME,
 //                repo_projection,

app/src/main/res/layout/cuc_activity_layout.xml

@@ -6,10 +6,10 @@
                 android:orientation="vertical" >
 
     <android.support.v4.view.ViewPager
-            android:id="@+id/cuc_pager"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_above="@+id/cuc_indicator" />
+        android:id="@+id/cuc_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/cuc_indicator" />
 
     <com.viewpagerindicator.LinePageIndicator
             android:id="@+id/cuc_indicator"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip