From 5b534a6ee31bb35f308d4c29c1701f1695f9217d Mon Sep 17 00:00:00 2001
From: Abdul Mannan Saeed <111820160@umt.edu.pk>
Date: Fri, 29 Apr 2022 12:17:21 -0700
Subject: [PATCH] Bug Fixes
Bug Fixes
---
.idea/misc.xml | 1 +
app/build.gradle | 44 ++++++++++++++++---
.../main/assets/homepage/homepage-dark.html | 12 ++---
app/src/main/assets/homepage/homepage.html | 12 ++---
app/src/main/assets/policy/policy.html | 14 +++---
.../dataManager/crawlerDataModel.java | 2 +-
.../libs/trueTime/trueTimeEncryption.java | 2 +-
.../pluginManager/pluginController.java | 1 +
app/variables.gradle | 4 +-
9 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0a18a4c..91255167 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -84,6 +84,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 552eeb42..1d2dff54 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import com.android.build.OutputFile
+
plugins {
id "com.jetbrains.python.envs" version "0.0.26"
}
@@ -27,7 +29,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
-
buildTypes {
release {
minifyEnabled project.ext.minifyEnabled
@@ -35,24 +36,29 @@ android {
proguardFiles getDefaultProguardFile(project.ext.proguard_file), project.ext.proguard_rule
}
}
+ lintOptions {
+ checkReleaseBuilds project.ext.checkReleaseBuilds
+ abortOnError project.ext.abortOnError
+ }
flavorDimensions project.ext.dimen
productFlavors {
- genesis {
+ orion {
dimension project.ext.dimen
}
}
splits {
abi {
- reset()
enable project.ext.splitEnabled
+
+ reset()
+
include project.ext.abi_x86, project.ext.abi_x86_x64, project.ext.abi_arm64, project.ext.abi_armeabi
}
}
-
bundle {
abi {
enableSplit = true
@@ -64,7 +70,7 @@ android {
res.srcDirs = project.ext.resource_directories
}
- genesisRelease.root = project.ext.releaseRoot
+ orionRelease.root = project.ext.releaseRoot
}
}
dependencies {
@@ -125,7 +131,33 @@ dependencies {
}
-
+/* Automated APK Generation */
+
+android.applicationVariants.all { variant ->
+
+ def buildType = variant.buildType.name
+
+ if (buildType == project.ext.buildType) {
+ def baseVersionCode = project.ext.vcode
+
+ variant.outputs.each { output ->
+ def abi = output.getFilter(OutputFile.ABI)
+ def versionCodeOverride = baseVersionCode
+ if (abi == project.ext.abi_x86) {
+ versionCodeOverride = versionCodeOverride + 3
+ } else if (abi == project.ext.abi_x86_x64) {
+ versionCodeOverride = versionCodeOverride + 2
+ } else if (abi == project.ext.abi_arm64) {
+ versionCodeOverride = versionCodeOverride + 1
+ } else if (abi == project.ext.abi_armeabi) {
+ versionCodeOverride = versionCodeOverride + 0
+ } else {
+ throw new RuntimeException(project.ext.abi_unknown + abi)
+ }
+ output.versionCodeOverride = versionCodeOverride
+ }
+ }
+}
diff --git a/app/src/main/assets/homepage/homepage-dark.html b/app/src/main/assets/homepage/homepage-dark.html
index 807b77bf..c8320b9f 100755
--- a/app/src/main/assets/homepage/homepage-dark.html
+++ b/app/src/main/assets/homepage/homepage-dark.html
@@ -48,7 +48,7 @@
-