diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle index fb293da..02be1b1 100644 --- a/Foodify/app/build.gradle +++ b/Foodify/app/build.gradle @@ -10,7 +10,7 @@ android { minSdk 23 targetSdk 30 versionCode 1 - versionName "96.0" + versionName "97.0" 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 7d3af1a..c604e47 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java @@ -41,6 +41,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.andremion.counterfab.CounterFab; import com.azhon.appupdate.manager.DownloadManager; +import com.azhon.appupdate.util.ApkUtil; import com.daimajia.slider.library.Animations.DescriptionAnimation; import com.daimajia.slider.library.SliderLayout; import com.daimajia.slider.library.SliderTypes.BaseSliderView; @@ -266,6 +267,8 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati .jumpInstallPage(false) .build(); + ApkUtil.Companion.deleteOldApk(this, "${externalCacheDir?.path}/app-debug.apk"); + manager.download(); } 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 8b680a0..ec94f8a 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java @@ -13,6 +13,7 @@ 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; @@ -21,6 +22,8 @@ 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; @@ -49,7 +52,9 @@ public class Welcome extends AppCompatActivity { //Init paper Paper.init(this); + deleteCache(this); + ApkUtil.Companion.deleteOldApk(this, "${externalCacheDir?.path}/app-debug.apk"); database = FirebaseDatabase.getInstance(); version = database.getReference("Version"); changelog = database.getReference("Changelog"); @@ -153,5 +158,29 @@ public class Welcome extends AppCompatActivity { } } + public static void deleteCache(Context context) { + try { + File dir = context.getCacheDir(); + deleteDir(dir); + } catch (Exception e) { e.printStackTrace();} + } + + public 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/app-debug.apk b/app-debug.apk index 16b7a79..8be2764 100644 Binary files a/app-debug.apk and b/app-debug.apk differ