bug fixes

.idea/gradle.xml

@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
+apply from: 'variables.gradle'
 
 apply plugin: 'maven'
 apply plugin: 'io.fabric'
 
-ext {
-    geckoviewChannel = ""
-    geckoviewVersion = "67.0.20190613202504"
-}
 
+ext {
+    geckoviewChannel = project.ext.firefox_channel
+    geckoviewVersion = project.ext.firefox_version
+}
 
 repositories {
     maven {
@@ -16,124 +17,94 @@ repositories {
         mavenCentral()
         google()
         jcenter()
-        maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
     }
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion project.ext.compileSdkVersion
     defaultConfig {
-        applicationId "com.darkweb.genesissearchengine"
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 126
-        versionName "126.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        applicationId project.ext.applicationId
+        minSdkVersion project.ext.minSdkVersion
+        targetSdkVersion project.ext.targetSdkVersion
+        versionCode project.ext.versionCode
+        versionName project.ext.versionName
     }
 
     flavorDimensions "abi"
-    // Note: compileOptions is only required for minSdkVersion < 24
-    // Note: compileOptions is only required for minSdkVersion < 26 (not 24)
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
 
-    flavorDimensions "abi"
+    flavorDimensions project.ext.dimen
 
     productFlavors {
-        /*arm {
-            versionCode 180
-            versionName "180"
-            dimension "abi"
-            buildConfigField "String", "VARIANT", "\"arm\""
-        }*/
-        aarch64 {
-            versionCode 181
-            versionName "181"
-            dimension "abi"
-            buildConfigField "String", "VARIANT", "\"aarch64\""
-        }/*
-        x86 {
-            versionCode 182
-            versionName "182"
-            dimension "abi"
-            buildConfigField "String", "VARIANT", "\"i686\""
+        arm {
+            versionCode project.ext.arm_vcode
+            versionName project.ext.arm_vname
+            dimension project.ext.dimen
+       }
+        aarch64 {
+            versionCode project.ext.aarch_vcode
+            versionName project.ext.aarch_vname
+            dimension project.ext.dimen
+        }
+        x86 {
+            versionCode project.ext.x86_vcode
+            versionName project.ext.x86_vname
+            dimension project.ext.dimen
+        }
+        x86_64 {
+            versionCode project.ext.x64_vcode
+            versionName project.ext.x64_vname
+            dimension project.ext.dimen
         }
-        /*x86_64 {
-            versionCode 183
-            versionName "183"
-            dimension "abi"
-            buildConfigField "String", "VARIANT", "\"x86_64\""
-        }*/
     }
 
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
-        splits {
-            abi {
-                enable true
-                reset()
-                include 'arm64-v8a'
-                include 'x86'
-                include 'armeabi-v7a'
-                include 'x86_64'
-
-                universalApk true
-            }
-        }
-    }
-}
-
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion '26.1.0'
-            }
-        }
     }
 }
 
 dependencies {
+
+    /*Default Libraries*/
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta2'
     implementation 'cz.msebera.android:httpclient:4.5.8'
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+    implementation 'com.google.android.material:material:1.1.0-alpha08'
+    implementation 'androidx.preference:preference:1.1.0-rc01'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
-    //x86Implementation     "org.mozilla.geckoview:geckoview-x86:67.0.20190613202504"
-    //x86_64Implementation  "org.mozilla.geckoview:geckoview-x86_64:67.0.20190613202504"
-    //armImplementation     "org.mozilla.geckoview:geckoview-armeabi-v7a:67.0.20190613202504"
+    /*Firefox ABI Splits*/
+    x86Implementation     "org.mozilla.geckoview:geckoview-x86:67.0.20190613202504"
+    x86_64Implementation  "org.mozilla.geckoview:geckoview-x86_64:67.0.20190613202504"
+    armImplementation     "org.mozilla.geckoview:geckoview-armeabi-v7a:67.0.20190613202504"
     aarch64Implementation "org.mozilla.geckoview:geckoview-arm64-v8a:67.0.20190613202504"
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0-alpha02'
-
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    /*Alert Dialog*/
     implementation 'com.crowdfire.cfalertdialog:cfalertdialog:1.1.0'
 
+    /*Onion Proxy*/
     implementation 'com.github.jehy:Tor-Onion-Proxy-Library:0.0.7'
     implementation 'org.slf4j:slf4j-api:2.0.0-alpha0'
     implementation 'org.slf4j:slf4j-android:1.7.26'
-    implementation 'com.google.android.gms:play-services-ads:18.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0-alpha03'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha03'
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true
-    }
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    /*Ads Manager*/
+    implementation 'com.google.android.gms:play-services-ads-lite:18.1.0'
+
+    /*Crashlytics*/
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar')
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'

app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/viewController.java

@@ -210,10 +210,6 @@ public class viewController
                         hideSplashScreen();
                     }
                 }
-                else if(msg.what == messages.SHOW_ADS)
-                {
-                    admanager.getInstance().showAd(true);
-                }
             }
         };
     }

app/variables.gradle

@@ -0,0 +1,30 @@
+/*arm versions*/
+    project.ext.arm_vname = '180'
+    project.ext.arm_vcode = 180
+
+/*aarch versions*/
+    project.ext.aarch_vname = '181'
+    project.ext.aarch_vcode = 181
+
+/*x86 versions*/
+    project.ext.x86_vname = '182'
+    project.ext.x86_vcode = 182
+
+/*x64 versions*/
+    project.ext.x64_vname = '183'
+    project.ext.x64_vcode = 183
+
+/*dimension*/
+    project.ext.dimen = 'abi'
+
+/*firefox version*/
+    project.ext.firefox_version = "67.0.20190613202504"
+    project.ext.firefox_channel = ""
+
+/*Application Preferences*/
+    project.ext.compileSdkVersion = 28
+    project.ext.minSdkVersion = 21
+    project.ext.targetSdkVersion = 28
+    project.ext.versionCode = 126
+    project.ext.versionName = "126.0"
+    project.ext.applicationId = "com.darkweb.genesissearchengine"

build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         google()
@@ -9,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'io.fabric.tools:gradle:1.29.0'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.0'
     }
 }