PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an NPE in WifiSettings." into jb-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2012-09-27 18:14:45 -07:00
committed by Android (Google) Code Review
parent 48af3cdbd9 001e14a118
commit b08739003a
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -245,30 +245,39 @@ public class WifiSettings extends SettingsPreferenceFragment
public void onSuccess() { public void onSuccess() {
} }
public void onFailure(int reason) { public void onFailure(int reason) {
Toast.makeText(getActivity(), Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity,
R.string.wifi_failed_connect_message, R.string.wifi_failed_connect_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
}
}; };
mSaveListener = new WifiManager.ActionListener() { mSaveListener = new WifiManager.ActionListener() {
public void onSuccess() { public void onSuccess() {
} }
public void onFailure(int reason) { public void onFailure(int reason) {
Toast.makeText(getActivity(), Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity,
R.string.wifi_failed_save_message, R.string.wifi_failed_save_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
}
}; };
mForgetListener = new WifiManager.ActionListener() { mForgetListener = new WifiManager.ActionListener() {
public void onSuccess() { public void onSuccess() {
} }
public void onFailure(int reason) { public void onFailure(int reason) {
Toast.makeText(getActivity(), Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity,
R.string.wifi_failed_forget_message, R.string.wifi_failed_forget_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
}
}; };
if (savedInstanceState != null if (savedInstanceState != null
@@ -290,7 +299,7 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
final ConnectivityManager connectivity = (ConnectivityManager) final ConnectivityManager connectivity = (ConnectivityManager)
getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); activity.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity != null if (connectivity != null
&& connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
activity.finish(); activity.finish();
@@ -305,7 +314,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mEnableNextOnConnection) { if (mEnableNextOnConnection) {
if (hasNextButton()) { if (hasNextButton()) {
final ConnectivityManager connectivity = (ConnectivityManager) final ConnectivityManager connectivity = (ConnectivityManager)
getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); activity.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity != null) { if (connectivity != null) {
NetworkInfo info = connectivity.getNetworkInfo( NetworkInfo info = connectivity.getNetworkInfo(
ConnectivityManager.TYPE_WIFI); ConnectivityManager.TYPE_WIFI);
@@ -737,7 +746,10 @@ public class WifiSettings extends SettingsPreferenceFragment
updateAccessPoints(); updateAccessPoints();
updateConnectionState(info.getDetailedState()); updateConnectionState(info.getDetailedState());
if (mAutoFinishOnConnection && info.isConnected()) { if (mAutoFinishOnConnection && info.isConnected()) {
getActivity().finish(); Activity activity = getActivity();
if (activity != null) {
activity.finish();
}
return; return;
} }
} else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) { } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
@@ -774,7 +786,10 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
private void updateWifiState(int state) { private void updateWifiState(int state) {
getActivity().invalidateOptionsMenu(); Activity activity = getActivity();
if (activity != null) {
activity.invalidateOptionsMenu();
}
switch (state) { switch (state) {
case WifiManager.WIFI_STATE_ENABLED: case WifiManager.WIFI_STATE_ENABLED:
@@ -820,8 +835,11 @@ public class WifiSettings extends SettingsPreferenceFragment
mRetry = 0; mRetry = 0;
} else if (++mRetry >= 3) { } else if (++mRetry >= 3) {
mRetry = 0; mRetry = 0;
Toast.makeText(getActivity(), R.string.wifi_fail_to_scan, Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, R.string.wifi_fail_to_scan,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
}
return; return;
} }
sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS); sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);