Give specific feedback when there is no WiFi connection when doing a search.

Author: Chris Bellew

Voice Control For Plex/src/main/java/com/atomjack/vcfp/LocalScan.java

@@ -6,8 +6,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -45,8 +43,8 @@ public LocalScan(Context ctx, Class cls, SharedPreferences prefs, LocalScanHandl
 
 	public void searchForPlexServers() {
 		Logger.d("searchForPlexServers()");
-		if(!isWifiConnected()) {
-			showNoWifiDialog();
+		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
+			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
 		}
 		searchDialog = new Dialog(context);
@@ -91,8 +89,8 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position, l
 	}
 
 	public void getClients() {
-		if(!isWifiConnected()) {
-			showNoWifiDialog();
+		if(!VoiceControlForPlexApplication.isWifiConnected(context)) {
+			VoiceControlForPlexApplication.showNoWifiDialog(context);
 			return;
 		}
 		PlexServer server = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
@@ -246,22 +244,4 @@ public void onFailure(Throwable error) {
 			});
 		}
 	}
-
-	public boolean isWifiConnected() {
-		ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-		NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-		return mWifi.isConnected();
-	}
-
-	public void showNoWifiDialog() {
-		AlertDialog.Builder usageDialog = new AlertDialog.Builder(context);
-		usageDialog.setTitle(R.string.no_wifi_connection);
-		usageDialog.setMessage(R.string.no_wifi_connection_message);
-		usageDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				dialog.dismiss();
-			}
-		});
-		usageDialog.show();
-	}
 }

Voice Control For Plex/src/main/java/com/atomjack/vcfp/PlexSearch.java

@@ -57,6 +57,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 		queryText = null;
 		BugSenseHandler.initAndStartSession(PlexSearch.this, MainActivity.BUGSENSE_APIKEY);
 
+
+		if(!VoiceControlForPlexApplication.isWifiConnected(this)) {
+			feedback.e(getResources().getString(R.string.no_wifi_connection_message));
+			return Service.START_NOT_STICKY;
+		}
+
 		String from = intent.getStringExtra("FROM");
 		if(from != null && from.equals("GDMReceiver")) {
 			videoPlayed = false;

Voice Control For Plex/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -6,7 +6,12 @@
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.Resources.NotFoundException;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 
 import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexServer;
@@ -100,4 +105,22 @@ public static boolean isVersionLessThan(String v1, String v2) {
 		VersionComparator cmp = new VersionComparator();
 		return cmp.compare(v1, v2) < 0;
 	}
+
+	public static boolean isWifiConnected(Context context) {
+		ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+		return mWifi.isConnected();
+	}
+
+	public static void showNoWifiDialog(Context context) {
+		AlertDialog.Builder usageDialog = new AlertDialog.Builder(context);
+		usageDialog.setTitle(R.string.no_wifi_connection);
+		usageDialog.setMessage(R.string.no_wifi_connection_message);
+		usageDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int id) {
+				dialog.dismiss();
+			}
+		});
+		usageDialog.show();
+	}
 }