From a24faf6faed95a4a028ca07af672fceb4d3507f2 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Sat, 24 Aug 2019 23:03:36 -0400
Subject: [PATCH] Code cleanup

---
 .../net/nullsum/audinaut/activity/SubsonicActivity.java     | 2 +-
 app/src/main/java/net/nullsum/audinaut/util/Util.java       | 6 +++---
 .../main/java/net/nullsum/audinaut/util/tags/FlacFile.java  | 2 +-
 .../main/java/net/nullsum/audinaut/util/tags/ID3v2File.java | 2 +-
 .../main/java/net/nullsum/audinaut/util/tags/OggFile.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
index ba9dd4c..8e64d17 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -144,7 +144,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         switch (requestCode) {
             case PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE: {
                 // If request is cancelled, the result arrays are empty.
diff --git a/app/src/main/java/net/nullsum/audinaut/util/Util.java b/app/src/main/java/net/nullsum/audinaut/util/Util.java
index 140859c..62580ef 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/Util.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/Util.java
@@ -793,9 +793,9 @@ public final class Util {
             m = t.length();
         }
 
-        int p[] = new int[n + 1];
-        int d[] = new int[n + 1];
-        int _d[];
+        int[] p = new int[n + 1];
+        int[] d = new int[n + 1];
+        int[] _d;
 
         int i;
         int j;
diff --git a/app/src/main/java/net/nullsum/audinaut/util/tags/FlacFile.java b/app/src/main/java/net/nullsum/audinaut/util/tags/FlacFile.java
index 0d0dfdc..a76a315 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/tags/FlacFile.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/tags/FlacFile.java
@@ -31,7 +31,7 @@ class FlacFile extends Common {
     public HashMap getTags(RandomAccessFile s) throws IOException {
         int xoff = 4;  // skip file magic
         int retry = 64;
-        int r[];
+        int[] r;
         HashMap tags = new HashMap();
 
         for (; retry > 0; retry--) {
diff --git a/app/src/main/java/net/nullsum/audinaut/util/tags/ID3v2File.java b/app/src/main/java/net/nullsum/audinaut/util/tags/ID3v2File.java
index 5028dbf..ef89813 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/tags/ID3v2File.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/tags/ID3v2File.java
@@ -106,7 +106,7 @@ class ID3v2File extends Common {
             rv[1] = getDecodedString(v);
         } else if (k.equals("TXXX")) {
             /* A freestyle field, ieks! */
-            String txData[] = getDecodedString(v).split(Character.toString('\0'), 2);
+            String[] txData = getDecodedString(v).split(Character.toString('\0'), 2);
             /* Check if we got replaygain info in key\0value style */
             if (txData.length == 2) {
                 if (txData[0].matches("^(?i)REPLAYGAIN_(ALBUM|TRACK)_GAIN$")) {
diff --git a/app/src/main/java/net/nullsum/audinaut/util/tags/OggFile.java b/app/src/main/java/net/nullsum/audinaut/util/tags/OggFile.java
index f5e101c..b2f0101 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/tags/OggFile.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/tags/OggFile.java
@@ -37,7 +37,7 @@ class OggFile extends Common {
         HashMap tags = new HashMap();
 
         for (; retry > 0; retry--) {
-            long res[] = parse_ogg_page(s, offset);
+            long[] res = parse_ogg_page(s, offset);
             if (res[2] == OGG_TYPE_COMMENT) {
                 tags = parse_ogg_vorbis_comment(s, offset + res[0], res[1]);
                 break;