Show error when trying to scan for servers or clients if there's no WiFi connection; Fixed display of tasker/utter!/autovoice menu items.

Author: Chris Bellew

Voice Control For Plex/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

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

@@ -13,13 +13,16 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
@@ -73,8 +76,6 @@ public class MainActivity extends Activity implements TextToSpeech.OnInitListene
 	private SharedPreferences mPrefs;
 	private SharedPreferences.Editor mPrefsEditor;
 
-	private Menu menu;
-
 	private int serversScanned = 0;
 	AlertDialog.Builder helpDialog;
 
@@ -96,20 +97,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		setContentView(R.layout.main);
 
-		if (hasValidAutoVoice() || hasValidUtter()) {
-
-		} else if (!hasValidGoogleSearch()) {
-			if (!hasValidTasker()) {
-				menu.findItem(R.id.menu_install_tasker).setVisible(true);
-			}
-			if (!hasValidUtter()) {
-				menu.findItem(R.id.menu_install_utter).setVisible(true);
-			}
-			if (!hasValidAutoVoice()) {
-				menu.findItem(R.id.menu_install_autovoice).setVisible(true);
-			}
-		}
-
 		this.server = gson.fromJson(mPrefs.getString("Server", ""), PlexServer.class);
 		this.client = gson.fromJson(mPrefs.getString("Client", ""), PlexClient.class);
 
@@ -404,8 +391,12 @@ public void onClick(DialogInterface dialog, int id) {
 		});
 		usageDialog.show();
 	}
-	
+
 	private void searchForPlexServers() {
+		if(!isWifiConnected()) {
+			showNoWifiDialog();
+			return;
+		}
 		searchDialog = new Dialog(this);
 
 		searchDialog.setContentView(R.layout.search_popup);
@@ -593,6 +584,10 @@ public void onFailure(Throwable error) {
 	}
 
 	private void getClients() {
+		if(!isWifiConnected()) {
+			showNoWifiDialog();
+			return;
+		}
 		if(server == null || server.name.equals(getResources().getString(R.string.scan_all))) {
 			scanForClients();
 		} else {
@@ -718,7 +713,18 @@ private void saveSettings() {
 	public boolean onCreateOptionsMenu(Menu _menu) {
 		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.menu_main, _menu);
-		menu = _menu;
+		if (!hasValidAutoVoice() || !hasValidUtter()) {
+			_menu.findItem(R.id.menu_tasker_import).setVisible(false);
+			if (!hasValidTasker()) {
+				_menu.findItem(R.id.menu_install_tasker).setVisible(true);
+			}
+			if (!hasValidUtter()) {
+				_menu.findItem(R.id.menu_install_utter).setVisible(true);
+			}
+			if (!hasValidAutoVoice()) {
+				_menu.findItem(R.id.menu_install_autovoice).setVisible(true);
+			}
+		}
 		return true;
 	}
 
@@ -805,6 +811,24 @@ public void onClick(DialogInterface d, int n) {
 			}
 		}
 	}
+
+	public boolean isWifiConnected() {
+		ConnectivityManager connManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+		NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+		return mWifi.isConnected();
+	}
+
+	public void showNoWifiDialog() {
+		AlertDialog.Builder usageDialog = new AlertDialog.Builder(MainActivity.this);
+		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/VoiceControlForPlexApplication.java

@@ -99,5 +99,4 @@ public static boolean isVersionLessThan(String v1, String v2) {
 		VersionComparator cmp = new VersionComparator();
 		return cmp.compare(v1, v2) < 0;
 	}
-
 }

Voice Control For Plex/src/main/res/values/strings.xml

@@ -60,4 +60,6 @@
     <string name="widget_instructions">To trigger voice recognition, simply add the <b>Voice Control for Plex</b> widget on to your home screen.</string>
     <string name="title_changelog">What\'s New</string>
     <string name="changelog_close">Close</string>
+    <string name="no_wifi_connection">No WiFi Connection</string>
+    <string name="no_wifi_connection_message">A WiFi connection is required. Please check your WiFi settings and try again.</string>
 </resources>