fix: allow usage when hotspot mode is enabled.

codestation · Aug 9, 2016 · fa6dab3 · balika011 · Aug 9, 2016 · codestation
1 parent 425737d
commit fa6dab3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.codestation.henkakuserver"
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,8 +19,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.net.wifi.STATE_CHANGE" />
+                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/com/codestation/henkakuserver/MainActivity.java b/app/src/main/java/com/codestation/henkakuserver/MainActivity.java
@@ -37,6 +37,7 @@
 import android.widget.TextView;
 
 import java.util.Locale;
+import java.lang.reflect.Method;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -70,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         floatingActionButtonOnOff.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (isConnectedInWifi()) {
+                if (isConnectedInWifi(false)) {
                     if (!isStarted && startAndroidWebServer()) {
                         isStarted = true;
                         textViewMessage.setVisibility(View.VISIBLE);
@@ -134,6 +135,8 @@ private void initBroadcastReceiverNetworkStateChanged() {
         final IntentFilter filters = new IntentFilter();
         filters.addAction("android.net.wifi.WIFI_STATE_CHANGED");
         filters.addAction("android.net.wifi.STATE_CHANGE");
+        filters.addAction("android.net.wifi.WIFI_AP_STATE_CHANGED");
+
         broadcastReceiverNetworkState = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
@@ -144,9 +147,15 @@ public void onReceive(Context context, Intent intent) {
     }
 
     private String getIpAccess(boolean url) {
-        WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        int ipAddress = wifiManager.getConnectionInfo().getIpAddress();
-        final String formatedIpAddress = String.format(Locale.getDefault(), "%d.%d.%d.%d", (ipAddress & 0xff), (ipAddress >> 8 & 0xff), (ipAddress >> 16 & 0xff), (ipAddress >> 24 & 0xff));
+        String formatedIpAddress;
+
+        if (isConnectedInWifi(true)) {
+            WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+            int ipAddress = wifiManager.getConnectionInfo().getIpAddress();
+            formatedIpAddress = String.format(Locale.getDefault(), "%d.%d.%d.%d", (ipAddress & 0xff), (ipAddress >> 8 & 0xff), (ipAddress >> 16 & 0xff), (ipAddress >> 24 & 0xff));
+        } else {
+            formatedIpAddress = "192.168.43.1";
+        }
 
         if (url) {
             return "http://" + formatedIpAddress + ":";
@@ -160,11 +169,23 @@ private int getPortFromEditText() {
         return (valueEditText.length() > 0) ? Integer.parseInt(valueEditText) : DEFAULT_PORT;
     }
 
-    public boolean isConnectedInWifi() {
+    public boolean isConnectedInWifi(boolean wifiOnly) {
         WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
         NetworkInfo networkInfo = ((ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
-        return networkInfo != null && networkInfo.isAvailable() && networkInfo.isConnected()
+        boolean wifiEnabled = networkInfo != null && networkInfo.isAvailable() && networkInfo.isConnected()
                 && wifiManager.isWifiEnabled() && networkInfo.getTypeName().equals("WIFI");
+
+       if(!wifiOnly && !wifiEnabled) {
+           try {
+               final Method method = wifiManager.getClass().getDeclaredMethod("isWifiApEnabled");
+               method.setAccessible(true);
+               wifiEnabled = (Boolean) method.invoke(wifiManager);
+           } catch(Exception e) {
+               e.printStackTrace();
+           }
+       }
+
+       return wifiEnabled;
     }
     //endregion