GithubStar/AmazeFileManager
1
0
Fork 0
mirror of https://github.com/TeamAmaze/AmazeFileManager.git synced 2026-10-18 13:51:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add null-guards for IP address.

Browse Source
This commit is contained in:
Bowie Chen
2019-10-29 21:17:56 +08:00
parent 7038b98122
commit 6e137dfd67
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/FtpService.java
+3
View File
@@ -320,6 +320,9 @@ public class FtpService extends Service implements Runnable {
Enumeration<InetAddress> addresses = netinterface.getInetAddresses();
while (addresses.hasMoreElements()) {
InetAddress address = addresses.nextElement();
if (address == null) {
continue;
}
if(address.getHostAddress().startsWith(WIFI_AP_ADDRESS_PREFIX) && isEnabledWifiHotspot(context))
return address;
app/src/main/java/com/amaze/filemanager/ui/notifications/FtpNotification.java
+9 -4
View File
@@ -88,12 +88,17 @@ public class FtpNotification extends BroadcastReceiver {
InetAddress address = FtpService.getLocalInetAddress(context);
String iptext = (secureConnection ? FtpService.INITIALS_HOST_SFTP : FtpService.INITIALS_HOST_FTP)
+ address.getHostAddress() + ":"
+ port + "/";
String address_text = "Address not found";
if (address != null) {
address_text = (secureConnection ? FtpService.INITIALS_HOST_SFTP : FtpService.INITIALS_HOST_FTP)
+ address.getHostAddress() + ":"
+ port + "/";
}
NotificationCompat.Builder builder = buildNotification(context,
R.string.ftp_notif_title, context.getString(R.string.ftp_notif_text, iptext), noStopButton);
R.string.ftp_notif_title, context.getString(R.string.ftp_notif_text, address_text), noStopButton);
notificationManager.notify(NotificationConstants.FTP_ID, builder.build());
}