Patch 1

SECURITY.pv

@@ -0,0 +1,5 @@
+# Security Policy
+
+##not Supported Versions
+
+#keep privare

app/build.gradle

@@ -2,13 +2,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.ben-manes.versions'
 
 android {
     compileSdkVersion project.targetSdkVersion
-    buildToolsVersion project.buildToolsVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -22,6 +20,10 @@ android {
         lightningLite.setRoot('src/LightningLite')
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         debug {
             multiDexEnabled true
@@ -70,55 +72,49 @@ android {
             versionCode 102
         }
     }
-
-    lintOptions {
-        abortOnError true
-    }
-
     packagingOptions {
-        exclude '.readme'
+        resources {
+            excludes += ['.readme']
+        }
     }
+
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    lint {
+        abortOnError true
+    }
 }
 
 jacoco {
     toolVersion = '0.7.9' // See http://www.eclemma.org/jacoco/
 }
 
-dexcount {
-    includeClasses = false
-    includeFieldCount = false
-    format = "tree"
-    orderByMethodCount = true
-    verbose = false
-}
-
 dependencies {
     // multidex debug
     debugImplementation 'androidx.multidex:multidex:2.0.1'
 
     // test dependencies
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:3.17.2'
-    testImplementation 'org.mockito:mockito-core:3.5.10'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.mockito:mockito-core:3.11.2'
     testImplementation 'com.nhaarman:mockito-kotlin:1.6.0', {
         exclude group: 'org.jetbrains.kotlin'
     }
     testImplementation 'org.robolectric:robolectric:4.4'
 
     // support libraries
-    implementation "androidx.palette:palette:1.0.0"
-    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.palette:palette-ktx:1.0.0"
+    implementation "androidx.annotation:annotation:1.2.0"
     implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "com.google.android.material:material:1.2.1"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.core:core:1.3.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
-    implementation "androidx.fragment:fragment:1.2.5"
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation 'androidx.core:core-ktx:1.7.0-alpha01'
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation "androidx.drawerlayout:drawerlayout:1.1.1"
 
     // html parsing for reading mode
@@ -130,13 +126,13 @@ dependencies {
     kapt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion"
 
     // dependency injection
-    final def daggerVersion = '2.29'
+    final def daggerVersion = '2.38'
     implementation "com.google.dagger:dagger:$daggerVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     compileOnly 'javax.annotation:jsr250-api:1.0'
 
     // view binding
-    final def butterKnifeVersion = '10.2.1'
+    final def butterKnifeVersion = '10.2.3'
     implementation "com.jakewharton:butterknife:$butterKnifeVersion"
     kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
 
@@ -151,7 +147,7 @@ dependencies {
 
     // rx
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
 
     // tor proxy
@@ -168,7 +164,6 @@ dependencies {
 
     // kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.5.0-alpha02'
 }
 
 kapt {

app/src/main/AndroidManifest.xml

@@ -48,12 +48,11 @@
             android:value="2.1"/>
 
         <activity
-            android:name=".MainActivity"
+            android:name="acr.browser.lightning.DefaultBrowserActivity"
             android:alwaysRetainTaskState="true"
             android:clearTaskOnLaunch="false"
             android:colorMode="wideColorGamut"
             android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden|keyboard"
-            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:theme="@style/Theme.LightTheme"
             android:windowSoftInputMode="stateHidden|adjustResize">
@@ -139,14 +138,13 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".IncognitoActivity"
+            android:name="acr.browser.lightning.IncognitoBrowserActivity"
             android:alwaysRetainTaskState="true"
             android:colorMode="wideColorGamut"
             android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden|keyboard"
-            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:process=":incognito"
-            android:parentActivityName=".MainActivity"
+            android:parentActivityName="acr.browser.lightning.DefaultBrowserActivity"
             android:theme="@style/Theme.DarkTheme"
             android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>

app/src/main/html/bookmarks.html

@@ -11,13 +11,19 @@
     </title>
 </head>
 <style>
+    :root {
+        --body-bg: {COLOR}
+        --box-bg: {COLOR}
+        --box-txt: {COLOR}
+    }
+
     body {
-        background: #E5E5E5;
+        background: var(--body-bg);
         padding-top: 5px;
         max-width: 100%;
         min-height: 100%
     }
-    
+
     #content {
         width: 100%;
         max-width: 800px;
@@ -34,16 +40,13 @@
         width: 145px;
         margin: 6px;
         padding: 4px;
-        background-color: #fff;
-        border: 1px solid #d2d2d2;
-        border-top-width: 0;
-        border-bottom-width: 2px;
+        background-color: var(--box-bg);
         font-family: Arial;
-        color: #444;
+        color: var(--box-txt);
         font-size: 12px;
-        -moz-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        border-radius: 2px
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px
     }
 
     .box-content {
@@ -86,6 +89,8 @@
     .margin {
         margin: 10px
     }
+
+
 </style>
 
 <body>

app/src/main/html/homepage.html

@@ -2,17 +2,28 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-    <meta content="en-us" http-equiv="Content-Language" />
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta content="en-us" http-equiv="Content-Language"/>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>${TITLE}</title>
 </head>
 <style>
+    :root {
+        --body-bg: {COLOR}
+        --box-bg: {COLOR}
+        --box-txt: {COLOR}
+    }
+
     body {
-        background: #f5f5f5;
+        background: var(--body-bg);
         text-align: center;
         margin: 0px;
     }
+
+    input {
+        color: var(--box-txt);
+    }
 
     #search_input {
         height: 35px;
@@ -34,23 +45,22 @@
         display: table;
         vertical-align: middle;
         width: 90%;
-        height: 35px;
+        height: 40px;
         max-width: 500px;
         margin: 0 auto;
-        background-color: #fff;
-        box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.25);
+        background-color: var(--box-bg);
         font-family: Arial;
-        color: #444;
-        -moz-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        border-radius: 2px;
+        color: var(--box-txt);
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
     }
 
     #search_submit {
         outline: none;
         height: 37px;
         float: right;
-        color: #404040;
+        color: var(--box-txt);
         font-size: 16px;
         font-weight: bold;
         border: none;
@@ -80,55 +90,38 @@
         width: 50%;
         max-width: 300px;
     }
-
-    .box {
-        vertical-align: middle;
-        position: relative;
-        display: block;
-        margin: 10px;
-        padding-left: 10px;
-        padding-right: 10px;
-        padding-top: 5px;
-        padding-bottom: 5px;
-        background-color: #fff;
-        box-shadow: 0px 3px rgba(0, 0, 0, 0.1);
-        font-family: Arial;
-        color: #444;
-        font-size: 12px;
-        -moz-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        border-radius: 2px;
-    }
+
 
 </style>
 
 <body>
-    <div class="outer">
-        <div class="middle">
-            <div class="inner">
-                <img id="image_url" class="smaller" src="${IMAGE}">
-                </br>
-                </br>
-                <form onsubmit="return search()" class="search_bar" autocomplete="off">
-                    <input type="submit" id="search_submit" value="Search">
-                    <span>
-                        <input class="search" type="text" value="" id="search_input" />
+<div class="outer">
+    <div class="middle">
+        <div class="inner">
+            <img id="image_url" class="smaller" src="${IMAGE}">
+            </br>
+            </br>
+            <form onsubmit="return search()" class="search_bar" autocomplete="off">
+                <input type="submit" id="search_submit" value="Search">
+                <span>
+                        <input class="search" type="text" value="" id="search_input"/>
                     </span>
-                </form>
-                </br>
-                </br>
-            </div>
+            </form>
+            </br>
+            </br>
         </div>
     </div>
-    <script type="text/javascript">
+</div>
+<script type="text/javascript">
         function search() {
             if (document.getElementById("search_input").value != "") {
                 window.location.href = "${BASE_URL}" + document.getElementById("search_input").value;
                 document.getElementById("search_input").value = "";
             }
             return false;
         }
-    </script>
+
+</script>
 </body>
 
 </html>