diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle index f41034e..6ba663b 100644 --- a/Foodify/app/build.gradle +++ b/Foodify/app/build.gradle @@ -10,7 +10,7 @@ android { minSdk 23 targetSdk 30 versionCode 1 - versionName "97.1" + versionName "97.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java index 4fe652d..630e189 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java @@ -1,7 +1,6 @@ package com.waterbase.foodify; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; @@ -84,6 +83,8 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati private long backPressedTime; + public static File apkFile = new File("/storage/emulated/0/Android/data/com.waterbase.foodify/cache/app-debug.apk"); + String versionNameApp = BuildConfig.VERSION_NAME; FirebaseDatabase database; @@ -185,11 +186,9 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati //Check Update if (Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)) { alertDialogUpdate(); - } - - //Get size Cache - if(getSizeCache() > 50 && Double.parseDouble(versionNameApp) == Double.parseDouble(Common.versionAppNewest)){ - deleteCache(this); + } else { + if(apkFile.exists()) + apkFile.delete(); } //Init database @@ -255,29 +254,6 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati } - } - - private long getSizeCache() { - long size = 0; - size += getDirSize(this.getCacheDir()); - size += getDirSize(this.getExternalCacheDir()); - return (size/1024)/1024; - } - - public long getDirSize(File dir){ - long size = 0; - for (File file : dir.listFiles()) { - if (file != null && file.isDirectory()) { - size += getDirSize(file); - } else if (file != null && file.isFile()) { - size += file.length(); - } - } - return size; - } - - private void checkUpdate(){ - } private void alertDialogUpdate() { @@ -710,28 +686,4 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati backPressedTime = System.currentTimeMillis(); } - - private static void deleteCache(Context context) { - try { - File dir = context.getCacheDir(); - deleteDir(dir); - } catch (Exception e) { e.printStackTrace();} - } - - private static boolean deleteDir(File dir) { - if (dir != null && dir.isDirectory()) { - String[] children = dir.list(); - for (int i = 0; i < children.length; i++) { - boolean success = deleteDir(new File(dir, children[i])); - if (!success) { - return false; - } - } - return dir.delete(); - } else if(dir!= null && dir.isFile()) { - return dir.delete(); - } else { - return false; - } - } } \ No newline at end of file diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java index 19c3776..50e1f32 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java @@ -1,9 +1,7 @@ package com.waterbase.foodify; import android.app.ProgressDialog; -import android.content.Context; import android.content.Intent; -import android.graphics.Typeface; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -13,7 +11,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import com.azhon.appupdate.util.ApkUtil; import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; @@ -22,12 +19,6 @@ import com.google.firebase.database.ValueEventListener; import com.waterbase.foodify.Common.Common; import com.waterbase.foodify.Model.User; -import java.io.File; - -import io.github.inflationx.calligraphy3.CalligraphyConfig; -import io.github.inflationx.calligraphy3.CalligraphyInterceptor; -import io.github.inflationx.viewpump.ViewPump; -import io.github.inflationx.viewpump.ViewPumpContextWrapper; import io.paperdb.Paper; public class Welcome extends AppCompatActivity { diff --git a/app-debug.apk b/app-debug.apk index 949a408..cae81ec 100644 Binary files a/app-debug.apk and b/app-debug.apk differ