Code tidy up

• update to latest libs
• remove unused images
• switch to kotlin short formats
• clean up compiler warnings

Author: subsymbolic

app/build.gradle

@@ -87,11 +87,11 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportLibrary"
     implementation "com.android.support:design:$supportLibrary"
     implementation "com.android.support.constraint:constraint-layout:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.9.0"
+    implementation "com.squareup.okhttp3:okhttp:3.9.1"
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
-    implementation "io.reactivex.rxjava2:rxjava:2.1.6"
+    implementation "io.reactivex.rxjava2:rxjava:2.1.7"
     implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
     implementation "com.jakewharton.timber:timber:4.6.0"
     implementation "android.arch.lifecycle:extensions:$architectureComponents"

app/lint.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="IconColors">
+        <ignore path="src/main/res/drawable*/privacy_icon_unknown.*" />
+    </issue>
+    <issue id="IconExpectedSize">
+        <ignore path="src/main/res/drawable-*/privacy_icon_unknown.*" />
+    </issue>
+</lint>

app/src/androidTest/java/com/duckduckgo/app/privacydashboard/PrivacyDashboardViewModelTest.kt

@@ -109,7 +109,6 @@ class PrivacyDashboardViewModelTest {
         assertEquals("10 Major Tracker Networks Blocked", testee.viewState.value?.majorNetworksText)
     }
 
-    private fun getStringResource(id: Int): String {
-        return InstrumentationRegistry.getTargetContext().getString(id)
-    }
+    private fun getStringResource(id: Int): String =
+            InstrumentationRegistry.getTargetContext().getString(id)
 }

app/src/androidTest/java/com/duckduckgo/app/trackerdetection/AdBlockClientInstrumentationTest.kt

@@ -66,7 +66,6 @@ class AdBlockClientInstrumentationTest {
         assertFalse(testee.matches(nonTrackerUrl, documentUrl, resourceType))
     }
 
-    private fun data(): ByteArray {
-        return javaClass.classLoader.getResource("binary/easylist_sample").readBytes()
-    }
+    private fun data(): ByteArray =
+            javaClass.classLoader.getResource("binary/easylist_sample").readBytes()
 }

app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt

@@ -91,9 +91,7 @@ class BrowserWebViewClient @Inject constructor(
         return false
     }
 
-    private fun WebView.elementClicked(): String? {
-        return safeHitTestResult().extra
-    }
+    private fun WebView.elementClicked(): String? = safeHitTestResult().extra
 
     /**
      * Access the webview hit test result from any thread; jumps onto the main thread to achieve this

app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt

@@ -64,7 +64,7 @@ class QueryUrlConverter @Inject constructor(private val requestRewriter: DuckDuc
     }
 
     override fun convertUri(input: String): String {
-        var uri = Uri.parse(input).withScheme()
+        val uri = Uri.parse(input).withScheme()
 
         if (uri.host == baseUrl) {
             return requestRewriter.rewriteRequestWithCustomQueryParams(uri).toString()

app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt

@@ -42,9 +42,7 @@ class NetworkModule {
 
     @Provides
     @Singleton
-    fun moshi(): Moshi {
-        return Moshi.Builder().add(DisconnectJsonAdapter()).build()
-    }
+    fun moshi(): Moshi = Moshi.Builder().add(DisconnectJsonAdapter()).build()
 
     @Provides
     @Singleton
@@ -58,7 +56,6 @@ class NetworkModule {
     }
 
     @Provides
-    fun trackerListService(retrofit: Retrofit): TrackerListService {
-        return retrofit.create(TrackerListService::class.java)
-    }
+    fun trackerListService(retrofit: Retrofit): TrackerListService =
+            retrofit.create(TrackerListService::class.java)
 }

app/src/main/java/com/duckduckgo/app/privacydashboard/PrivacyDashboardViewModel.kt

@@ -25,8 +25,8 @@ import com.duckduckgo.app.privacymonitor.HttpsStatus
 import com.duckduckgo.app.privacymonitor.PrivacyMonitor
 import javax.inject.Inject
 
-
-class PrivacyDashboardViewModel @Inject constructor(@SuppressLint("StaticFieldLeak") private val context: Context) : ViewModel() {
+@SuppressLint("StaticFieldLeak")
+class PrivacyDashboardViewModel @Inject constructor(private val context: Context) : ViewModel() {
 
     data class ViewState(
             val domain: String,

app/src/main/java/com/duckduckgo/app/trackerdetection/AdBlockClient.kt

@@ -21,19 +21,14 @@ import com.duckduckgo.app.trackerdetection.model.ResourceType
 import timber.log.Timber
 
 
-class AdBlockClient : Client {
+class AdBlockClient(override val name: ClientName) : Client {
 
-    override val name: ClientName
     private val nativeClientPointer: Long
     private var rawDataPointer: Long
     private var processedDataPointer: Long
 
     init {
         System.loadLibrary("adblockclient-lib")
-    }
-
-    constructor(name: ClientName) {
-        this.name = name
         nativeClientPointer = createClient()
         rawDataPointer = 0
         processedDataPointer = 0
@@ -59,15 +54,12 @@ class AdBlockClient : Client {
 
     private external fun loadProcessedData(clientPointer: Long, data: ByteArray): Long
 
-    fun getProcessedData(): ByteArray {
-        return getProcessedData(nativeClientPointer)
-    }
+    fun getProcessedData(): ByteArray = getProcessedData(nativeClientPointer)
 
     private external fun getProcessedData(clientPointer: Long): ByteArray
 
-    override fun matches(url: String, documentUrl: String, resourceType: ResourceType): Boolean {
-        return matches(nativeClientPointer, url, documentUrl, resourceType.filterOption)
-    }
+    override fun matches(url: String, documentUrl: String, resourceType: ResourceType): Boolean =
+            matches(nativeClientPointer, url, documentUrl, resourceType.filterOption)
 
     private external fun matches(clientPointer: Long, url: String, documentUrl: String, filterOption: Int): Boolean
 

app/src/main/java/com/duckduckgo/app/trackerdetection/DisconnectClient.kt

@@ -28,8 +28,6 @@ class DisconnectClient(override val name: Client.ClientName, private val tracker
                 .any { sameOrSubdomain(url, it.url) }
     }
 
-    private fun bannedCategories(): List<String> {
-        return listOf("Analytics", "Advertising", "Social")
-    }
+    private fun bannedCategories(): List<String> = listOf("Analytics", "Advertising", "Social")
 
 }