Minor fixes

AndreyPavlenko · Apr 27, 2019 · 65bfc18 · 65bfc18
1 parent 890e246
commit 65bfc18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
-def version = '1.3.0'
-def versionNum = 64
+def version = '1.3.1'
+def versionNum = 65
 def basic_version = '1.0.0'
 def basic_versionNum = 1
 

diff --git a/src/main/java/com/ap/transmission/btc/Utils.java b/src/main/java/com/ap/transmission/btc/Utils.java
@@ -22,7 +22,6 @@
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.provider.DocumentFile;
-import android.system.ErrnoException;
 import android.system.Os;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -104,7 +103,7 @@ public static String getIPAddress(Context context) {
 
   public static InetAddress getInterfaceAddress(Context context) {
     InetAddress result = ifaddr;
-    if(result != null) return result;
+    if (result != null) return result;
 
     Context ctx = context.getApplicationContext();
     ConnectivityManager cmgr = (ConnectivityManager) ctx.getSystemService(CONNECTIVITY_SERVICE);
@@ -242,7 +241,7 @@ public static String getRealDirPath(Context ctx, Uri dirUri) {
       } else {
         err(TAG, "getRealDirPath: pfd is null");
       }
-    } catch (IOException | ErrnoException ex) {
+    } catch (Exception ex) {
       Log.e(TAG, "Failed to resolve real path: " + dirUri, ex);
     } finally {
       if (pfd != null) try { pfd.close(); } catch (IOException ignored) {}
@@ -253,7 +252,7 @@ public static String getRealDirPath(Context ctx, Uri dirUri) {
   }
 
   @TargetApi(VERSION_CODES.LOLLIPOP)
-  public static String getDescriptorPath(ParcelFileDescriptor fd) throws ErrnoException {
+  public static String getDescriptorPath(ParcelFileDescriptor fd) throws Exception {
     String path = Os.readlink("/proc/self/fd/" + fd.getFd());
 
     if (path.startsWith("/mnt/media_rw/")) {
@@ -428,9 +427,9 @@ public static void copyAssets(AssetManager amgr, String src, File dstDir, boolea
 
   private static void copyAssets(AssetManager amgr, String src, File dstDir, byte[] buf)
       throws IOException {
-    String ls[] = amgr.list(src);
+    String[] ls = amgr.list(src);
 
-    if (ls.length > 0) {
+    if ((ls != null) && (ls.length > 0)) {
       for (String f : ls) {
         copyAssets(amgr, src + '/' + f, dstDir, buf);
       }
@@ -859,7 +858,7 @@ public static void enableMenuIcons(PopupMenu popup) {
       f.setAccessible(true);
       Object h = f.get(popup);
       h.getClass().getDeclaredMethod("setForceShowIcon", boolean.class).invoke(h, true);
-    } catch (Exception ignore) {ignore.printStackTrace();}
+    } catch (Exception ignore) { }
   }
 
   public static void openUri(Activity a, Uri uri, String mime) {