From b86cc33bbf9fa33165605eb37ed98958c0e0e55c Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Tue, 22 Jan 2019 00:06:40 -0500 Subject: [PATCH] Updafe formatting --- .../audinaut/activity/SubsonicFragmentActivity.java | 5 +++-- .../net/nullsum/audinaut/fragments/SubsonicFragment.java | 2 +- .../main/java/net/nullsum/audinaut/util/tags/Common.java | 8 ++++---- .../java/net/nullsum/audinaut/util/tags/FlacFile.java | 4 ++-- .../java/net/nullsum/audinaut/util/tags/ID3v2File.java | 4 ++-- .../main/java/net/nullsum/audinaut/util/tags/OggFile.java | 8 ++++---- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java index f353dd3..e9adb94 100644 --- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java +++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java @@ -169,7 +169,8 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo slideUpPanel = findViewById(R.id.slide_up_panel); panelSlideListener = new SlidingUpPanelLayout.PanelSlideListener() { @Override - public void onPanelSlide(View panel, float slideOffset) {} + public void onPanelSlide(View panel, float slideOffset) { + } @Override public void onPanelStateChanged(View panel, PanelState previousState, PanelState newState) { @@ -607,7 +608,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo return true; } } - + private void createAccount() { final Context context = this; diff --git a/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java b/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java index e5caa07..680e1de 100644 --- a/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java +++ b/app/src/main/java/net/nullsum/audinaut/fragments/SubsonicFragment.java @@ -1331,7 +1331,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR return getCurrentAdapter().getSelected(); } - void playNow(final boolean shuffle, final boolean append, final boolean playNext) { + void playNow(final boolean shuffle, final boolean append, final boolean playNext) { List songs = getSelectedEntries(); if (!songs.isEmpty()) { download(songs, append, !append, playNext, shuffle); diff --git a/app/src/main/java/net/nullsum/audinaut/util/tags/Common.java b/app/src/main/java/net/nullsum/audinaut/util/tags/Common.java index 507144c..89f8f04 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/tags/Common.java +++ b/app/src/main/java/net/nullsum/audinaut/util/tags/Common.java @@ -31,8 +31,8 @@ class Common { } /* - ** Returns a 32bit int from given byte offset in LE - */ + ** Returns a 32bit int from given byte offset in LE + */ private int b2le32(byte[] b, int off) { int r = 0; for (int i = 0; i < 4; i++) { @@ -50,8 +50,8 @@ class Common { } /* - ** convert 'byte' value into unsigned int - */ + ** convert 'byte' value into unsigned int + */ int b2u(byte x) { return (x & 0xFF); } 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 39605c4..0d0dfdc 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 @@ -52,8 +52,8 @@ class FlacFile extends Common { } /* Parses the metadata block at 'offset' and returns - ** [header_size, payload_size, type, stop_after] - */ + ** [header_size, payload_size, type, stop_after] + */ private int[] parse_metadata_block(RandomAccessFile s, long offset) throws IOException { int[] result = new int[4]; byte[] mb_head = new byte[4]; 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 bfbc20b..7b192db 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 @@ -56,8 +56,8 @@ class ID3v2File extends Common { } /* Parses all ID3v2 frames at the current position up until payload_len - ** bytes were read - */ + ** bytes were read + */ private HashMap parse_v3_frames(RandomAccessFile s, long payload_len) throws IOException { HashMap tags = new HashMap(); byte[] frame = new byte[10]; // a frame header is always 10 bytes 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 4e93044..f5e101c 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 @@ -49,8 +49,8 @@ class OggFile extends Common { /* Parses the ogg page at offset 'offset' and returns - ** [header_size, payload_size, type] - */ + ** [header_size, payload_size, type] + */ private long[] parse_ogg_page(RandomAccessFile s, long offset) throws IOException { long[] result = new long[3]; // [header_size, payload_size] byte[] p_header = new byte[OGG_PAGE_SIZE]; // buffer for the page header @@ -93,8 +93,8 @@ class OggFile extends Common { } /* In 'vorbiscomment' field is prefixed with \3vorbis in OGG files - ** we check that this marker is present and call the generic comment - ** parset with the correct offset (+7) */ + ** we check that this marker is present and call the generic comment + ** parset with the correct offset (+7) */ private HashMap parse_ogg_vorbis_comment(RandomAccessFile s, long offset, long pl_len) throws IOException { final int pfx_len = 7; byte[] pfx = new byte[pfx_len];