Try to fix crash

pull/123/head
FongMi 3 years ago
parent f171e72096
commit cd4345d04e
  1. 8
      app/src/main/java/com/fongmi/android/tv/server/Server.java
  2. 12
      app/src/main/java/com/fongmi/android/tv/utils/FileUtil.java

@ -67,12 +67,12 @@ public class Server implements Nano.Listener {
}
private String getIP() {
WifiManager manager = (WifiManager) App.get().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
int address = manager.getConnectionInfo().getIpAddress();
if (address != 0) return Formatter.formatIpAddress(address);
try {
WifiManager manager = (WifiManager) App.get().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
int address = manager.getConnectionInfo().getIpAddress();
if (address != 0) return Formatter.formatIpAddress(address);
return getHostAddress();
} catch (SocketException e) {
} catch (Exception e) {
return "";
}
}

@ -28,6 +28,9 @@ import java.io.InputStreamReader;
import java.net.URLConnection;
import java.security.MessageDigest;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class FileUtil {
@ -160,7 +163,7 @@ public class FileUtil {
public static void clearDir(File dir) {
if (dir == null) return;
if (dir.isDirectory()) for (File file : dir.listFiles()) clearDir(file);
if (dir.isDirectory()) for (File file : listFiles(dir)) clearDir(file);
if (dir.delete()) Log.d(TAG, "Deleted:" + dir.getAbsolutePath());
}
@ -208,10 +211,15 @@ public class FileUtil {
return TextUtils.isEmpty(mimeType) ? "*/*" : mimeType;
}
private static List<File> listFiles(File dir) {
File[] files = dir.listFiles();
return files == null ? Collections.emptyList() : Arrays.asList(files);
}
private static long getFolderSize(File file) {
long size = 0;
if (file == null) return 0;
if (file.isDirectory()) for (File f : file.listFiles()) size += getFolderSize(f);
if (file.isDirectory()) for (File f : listFiles(file)) size += getFolderSize(f);
else size = file.length();
return size;
}

Loading…
Cancel
Save