Browse Source

BugFix:
-Limiting connections to only WiFi because 3G connections are not supported yet.
-Replaced isNetworkAvailable() with isWifiConnected()

Shankar Karuppayah 10 years ago
parent
commit
52de12e826

+ 2 - 2
AndroidManifest.xml

@@ -19,9 +19,9 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-	<uses-permission android:name="android.permission.BLUETOOTH" />
+<!--	<uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
+-->
 	<uses-feature
         android:name="android.hardware.nfc"
         android:required="false" />

+ 7 - 4
src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java

@@ -396,10 +396,13 @@ public final class HelperUtils {
 	}
 	
 	public static boolean isNetworkAvailable(Context context) {
-		if(context == null) return false;
+         /*Temporary Fix: Remove this after fixing null string bug*/
+        return isWifiConnected(context);
+
 
-		ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-		NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
-		return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+//        if(context == null) return false;
+//		ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+//		NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+//		return activeNetworkInfo != null && activeNetworkInfo.isConnected();
 	}
 }