Merge pull request #759 from anthonycr/dev

Version 5.0.2
anthonycr · Sep 7, 2019 · 1433e98 · 1433e98
2 parents 50c0e14 + d839283
commit 1433e98
Show file tree

Hide file tree

Showing 84 changed files with 968 additions and 734 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,15 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-28.0.3 # Temporary, used by I2P
+    - build-tools-29.0.2
+    - android-28 # Temporary, used by I2P
+    - android-29
   licenses:
     - 'android-sdk-license-.+'
     - '.*intel.+'
 before_install:
-  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-29"
   - chmod +x gradlew
   - git submodule update --init --recursive
 install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change Log
 ==========
 
+Version 5.0.2 *(2019-09-07)*
+----------------------------
+- Target Android 10 API 29
+- Update desktop and mobile user agents
+- Fixed segfault that occurred when some URLs were clicked
+- Added dialog to show SSL certificate info when SSL icon is tapped
+
 Version 5.0.1 *(2019-09-01)*
 ----------------------------
 - 64 bit I2P support

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
-        versionName project.versionName
+        versionName "5.0.2"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -60,14 +60,14 @@ android {
             dimension "capabilities"
             buildConfigField "boolean", "FULL_VERSION", "Boolean.parseBoolean(\"true\")"
             applicationId "acr.browser.lightning"
-            versionCode project.versionCode_plus
+            versionCode 100
         }
 
         lightningLite {
             dimension "capabilities"
             buildConfigField "boolean", "FULL_VERSION", "Boolean.parseBoolean(\"false\")"
             applicationId "acr.browser.barebones"
-            versionCode project.versionCode_lite
+            versionCode 101
         }
     }
 
@@ -112,13 +112,13 @@ dependencies {
     // support libraries
     implementation "androidx.palette:palette:1.0.0"
     implementation "androidx.annotation:annotation:1.1.0"
-    implementation "androidx.vectordrawable:vectordrawable-animated:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "com.google.android.material:material:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.0.0"
-    implementation "androidx.core:core:1.0.2"
+    implementation "androidx.core:core:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.fragment:fragment:1.0.0"
+    implementation "androidx.fragment:fragment:1.1.0"
     implementation "androidx.drawerlayout:drawerlayout:1.0.0"
 
     // html parsing for reading mode
@@ -154,7 +154,7 @@ dependencies {
 
     // rx
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.11'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
 
     // tor proxy
@@ -171,7 +171,7 @@ dependencies {
 
     // kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.2.0-alpha03'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha04'
 }
 
 kapt {

diff --git a/app/src/main/java/acr/browser/lightning/AppTheme.kt b/app/src/main/java/acr/browser/lightning/AppTheme.kt
@@ -0,0 +1,12 @@
+package acr.browser.lightning
+
+import acr.browser.lightning.preference.IntEnum
+
+/**
+ * The available app themes.
+ */
+enum class AppTheme(override val value: Int) : IntEnum {
+    LIGHT(0),
+    DARK(1),
+    BLACK(2)
+}
diff --git a/app/src/main/java/acr/browser/lightning/IncognitoActivity.kt b/app/src/main/java/acr/browser/lightning/IncognitoActivity.kt
@@ -12,6 +12,8 @@ import io.reactivex.Completable
 
 class IncognitoActivity : BrowserActivity() {
 
+    override fun provideThemeOverride(): Int? = R.style.Theme_DarkTheme
+
     @Suppress("DEPRECATION")
     public override fun updateCookiePreference(): Completable = Completable.fromAction {
         val cookieManager = CookieManager.getInstance()

diff --git a/app/src/main/java/acr/browser/lightning/adblock/NoOpAdBlocker.kt b/app/src/main/java/acr/browser/lightning/adblock/NoOpAdBlocker.kt
@@ -1,12 +1,12 @@
 package acr.browser.lightning.adblock
 
+import dagger.Reusable
 import javax.inject.Inject
-import javax.inject.Singleton
 
 /**
  * A no-op ad blocker implementation. Always returns false for [isAd].
  */
-@Singleton
+@Reusable
 class NoOpAdBlocker @Inject constructor() : AdBlocker {
 
     override fun isAd(url: String) = false

diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt
@@ -5,13 +5,15 @@ import acr.browser.lightning.log.Logger
 import acr.browser.lightning.preference.UserPreferences
 import android.app.Application
 import android.content.res.AssetManager
+import dagger.Reusable
 import io.reactivex.Single
 import okhttp3.OkHttpClient
 import javax.inject.Inject
 
 /**
  * A [HostsDataSourceProvider] backed by [UserPreferences].
  */
+@Reusable
 class PreferencesHostsDataSourceProvider @Inject constructor(
     private val userPreferences: UserPreferences,
     private val assetManager: AssetManager,

diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt
@@ -11,7 +11,7 @@ import acr.browser.lightning.html.bookmark.BookmarkPageFactory
 import acr.browser.lightning.html.homepage.HomePageFactory
 import acr.browser.lightning.log.Logger
 import acr.browser.lightning.preference.UserPreferences
-import acr.browser.lightning.ssl.SSLState
+import acr.browser.lightning.ssl.SslState
 import acr.browser.lightning.view.BundleInitializer
 import acr.browser.lightning.view.LightningView
 import acr.browser.lightning.view.TabInitializer
@@ -77,7 +77,7 @@ class BrowserPresenter(
 
     private fun onTabChanged(newTab: LightningView?) {
         logger.log(TAG, "On tab changed")
-        view.updateSslState(newTab?.currentSslState() ?: SSLState.None)
+        view.updateSslState(newTab?.currentSslState() ?: SslState.None)
 
         sslStateSubscription?.dispose()
         sslStateSubscription = newTab

diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt
@@ -1,6 +1,6 @@
 package acr.browser.lightning.browser
 
-import acr.browser.lightning.ssl.SSLState
+import acr.browser.lightning.ssl.SslState
 import android.view.View
 import androidx.annotation.StringRes
 
@@ -16,7 +16,7 @@ interface BrowserView {
 
     fun updateTabNumber(number: Int)
 
-    fun updateSslState(sslState: SSLState)
+    fun updateSslState(sslState: SslState)
 
     fun closeBrowser()
 

diff --git a/app/src/main/java/acr/browser/lightning/browser/ProxyChoice.kt b/app/src/main/java/acr/browser/lightning/browser/ProxyChoice.kt
@@ -0,0 +1,13 @@
+package acr.browser.lightning.browser
+
+import acr.browser.lightning.preference.IntEnum
+
+/**
+ * The available proxy choices.
+ */
+enum class ProxyChoice(override val value: Int) : IntEnum {
+    NONE(0),
+    ORBOT(1),
+    I2P(2),
+    MANUAL(3)
+}
diff --git a/app/src/main/java/acr/browser/lightning/browser/SearchBoxDisplayChoice.kt b/app/src/main/java/acr/browser/lightning/browser/SearchBoxDisplayChoice.kt
@@ -0,0 +1,12 @@
+package acr.browser.lightning.browser
+
+import acr.browser.lightning.preference.IntEnum
+
+/**
+ * An enum representing what detail level should be displayed in the search box.
+ */
+enum class SearchBoxDisplayChoice(override val value: Int) : IntEnum {
+    DOMAIN(0),
+    URL(1),
+    TITLE(2)
+}
diff --git a/app/src/main/java/acr/browser/lightning/browser/SearchBoxModel.kt b/app/src/main/java/acr/browser/lightning/browser/SearchBoxModel.kt
@@ -5,11 +5,13 @@ import acr.browser.lightning.preference.UserPreferences
 import acr.browser.lightning.utils.Utils
 import acr.browser.lightning.utils.isSpecialUrl
 import android.app.Application
+import dagger.Reusable
 import javax.inject.Inject
 
 /**
  * A UI model for the search box.
  */
+@Reusable
 class SearchBoxModel @Inject constructor(
     private val userPreferences: UserPreferences,
     application: Application
@@ -32,34 +34,21 @@ class SearchBoxModel @Inject constructor(
      * @param isLoading whether the page is currently loading or not.
      * @return the string that should be displayed by the search box.
      */
-    fun getDisplayContent(url: String, title: String?, isLoading: Boolean): String {
+    fun getDisplayContent(url: String, title: String?, isLoading: Boolean): String =
         when {
-            url.isSpecialUrl() -> return ""
-            isLoading -> return url
+            url.isSpecialUrl() -> ""
+            isLoading -> url
             else -> when (userPreferences.urlBoxContentChoice) {
-                1 -> {
-                    // URL, show the entire URL
-                    return url
-                }
-                2 -> {
-                    // Title, show the page's title
-                    return if (title?.isEmpty() == false) {
+                SearchBoxDisplayChoice.DOMAIN -> safeDomain(url)
+                SearchBoxDisplayChoice.URL -> url
+                SearchBoxDisplayChoice.TITLE ->
+                    if (title?.isEmpty() == false) {
                         title
                     } else {
                         untitledTitle
                     }
-                }
-                0 -> {
-                    // Default, show only the domain
-                    return safeDomain(url)
-                }
-                else -> {
-                    // Default, show only the domain
-                    return safeDomain(url)
-                }
             }
         }
-    }
 
     private fun safeDomain(url: String) = Utils.getDomainName(url)
 

diff --git a/app/src/main/java/acr/browser/lightning/browser/TabsManager.kt b/app/src/main/java/acr/browser/lightning/browser/TabsManager.kt
@@ -359,7 +359,7 @@ class TabsManager @Inject constructor(
         .flattenAsObservable { bundle ->
             bundle.keySet()
                 .filter { it.startsWith(BUNDLE_KEY) }
-                .map(bundle::getBundle)
+                .mapNotNull(bundle::getBundle)
         }
         .doOnNext { logger.log(TAG, "Restoring previous WebView state now") }