From 95306377b492d3dc1cc69f2054542862d4e74814 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 10 May 2019 15:34:25 +0800
Subject: [PATCH 1/3] Hide WPS if unsupported

---
 .../vpnhotspot/net/wifi/WifiP2pManagerHelper.kt   | 15 ++++++++-------
 mobile/src/main/res/layout/listitem_repeater.xml  |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
index 794ec602..22197122 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
@@ -39,18 +39,19 @@ object WifiP2pManagerHelper {
      *
      * Source: https://android.googlesource.com/platform/frameworks/base/+/android-4.3_r0.9/wifi/java/android/net/wifi/p2p/WifiP2pManager.java#958
      */
-    private val startWps by lazy {
-        WifiP2pManager::class.java.getDeclaredMethod("startWps",
-                WifiP2pManager.Channel::class.java, WpsInfo::class.java, WifiP2pManager.ActionListener::class.java)
-    }
-    fun WifiP2pManager.startWps(c: WifiP2pManager.Channel, wps: WpsInfo, listener: WifiP2pManager.ActionListener) {
+    @JvmStatic
+    val startWps by lazy {
         try {
-            startWps.invoke(this, c, wps, listener)
+            WifiP2pManager::class.java.getDeclaredMethod("startWps",
+                    WifiP2pManager.Channel::class.java, WpsInfo::class.java, WifiP2pManager.ActionListener::class.java)
         } catch (e: NoSuchMethodException) {
             DebugHelper.logEvent("NoSuchMethod_startWps")
-            listener.onFailure(UNSUPPORTED)
+            null
         }
     }
+    fun WifiP2pManager.startWps(c: WifiP2pManager.Channel, wps: WpsInfo, listener: WifiP2pManager.ActionListener) {
+        startWps!!.invoke(this, c, wps, listener)
+    }
 
     /**
      * Available since Android 4.2.
diff --git a/mobile/src/main/res/layout/listitem_repeater.xml b/mobile/src/main/res/layout/listitem_repeater.xml
index d8723abb..4c075827 100644
--- a/mobile/src/main/res/layout/listitem_repeater.xml
+++ b/mobile/src/main/res/layout/listitem_repeater.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <data>
+        <import type="be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper"/>
         <variable
             name="data"
             type="be.mygod.vpnhotspot.manage.RepeaterManager.Data"/>
@@ -73,7 +74,7 @@
             android:background="?android:attr/selectableItemBackground"
             android:padding="16dp"
             android:onClick="@{_ -> data.wps()}"
-            android:visibility="@{data.serviceStarted}">
+            android:visibility="@{data.serviceStarted &amp;&amp; WifiP2pManagerHelper.startWps != null}">
 
             <Space
                 android:layout_width="40dp"

From a7890bdd3bc0ff17722d75557ff3aa034faf58cb Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Mon, 13 May 2019 18:44:55 +0800
Subject: [PATCH 2/3] Update fabric

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b6668a65..5160a8b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
         classpath 'com.google.gms:google-services:4.2.0'
-        classpath 'io.fabric.tools:gradle:1.28.1'
+        classpath 'io.fabric.tools:gradle:1.29.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

From abcbc74c3770abdfcc43bfa9cca84a9a2956b051 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Mon, 13 May 2019 18:45:27 +0800
Subject: [PATCH 3/3] v2.4.4

---
 mobile/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 5d0b0b61..9acc422f 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -20,8 +20,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         resConfigs "ru", "zh-rCN"
-        versionCode 203
-        versionName "2.4.3"
+        versionCode 204
+        versionName '2.4.4'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {