Merge pull request #753 from anthonycr/dev

Version 5.0.1

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "i2p.android.base"]
+	path = i2p.android.base
+	url = https://github.com/i2p/i2p.android.base

CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+Version 5.0.1 *(2019-09-01)*
+----------------------------
+- 64 bit I2P support
+
 Version 5.0.0 *(2019-08-31)*
 ----------------------------
 - Minimum SDK Version 19

app/build.gradle

@@ -140,7 +140,11 @@ dependencies {
     implementation 'com.anthonycr.grant:permissions:1.1.2'
 
     // proxy support
-    implementation 'net.i2p.android:client:0.8'
+    // TODO: Replace I2P submodule with version 0.9.41 when it is available on maven
+    // implementation 'net.i2p.android:client:0.9.40'
+    // implementation 'net.i2p.android:helper:0.9.5'
+    implementation project(':client')
+    implementation project(':helper')
 
     implementation 'com.squareup.okhttp3:okhttp:3.12.3'
 

app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt

@@ -218,11 +218,11 @@ class SuggestionsAdapter(
 
         fun input(): Observable<CharSequence> = publishSubject.hide()
 
-        override fun performFiltering(constraint: CharSequence): FilterResults {
-            if (constraint.trim().isEmpty()) {
+        override fun performFiltering(constraint: CharSequence?): FilterResults {
+            if (constraint?.isBlank() != false) {
                 return FilterResults()
             }
-            publishSubject.onNext(constraint)
+            publishSubject.onNext(constraint.trim())
 
             return FilterResults().apply { count = 1 }
         }

build.gradle

@@ -25,7 +25,7 @@ ext {
     targetSdkVersion = 28
     buildToolsVersion = '28.0.3'
 
-    versionName = '5.0.0'
-    versionCode_lite = 99
-    versionCode_plus = 97
+    versionName = '5.0.1'
+    versionCode_lite = 100
+    versionCode_plus = 98
 }

gradle.properties

@@ -1,3 +1,8 @@
 kotlin.incremental=false
 android.useAndroidX=true
 android.enableJetifier=true
+
+# TODO: Remove when I2P 0.9.41 or later is available via maven
+I2P_VERSION=0.9.41
+ANDROID_BUILD_TARGET_SDK_VERSION=28
+ANDROID_BUILD_SDK_VERSION=28

gradle/maven-push.gradle

@@ -0,0 +1 @@
+// Empty file to fix I2P build

settings.gradle

@@ -1 +1,8 @@
-include ':app'
+include ':app'
+
+// TODO: Remove :client and :helper projects when 0.9.41 or later of I2P is available on maven
+include ':client'
+project(':client').projectDir = new File('i2p.android.base/lib/client')
+
+include ':helper'
+project(':helper').projectDir = new File('i2p.android.base/lib/helper')