Skip to content

Commit 1daf88f

Browse files
committed
Fix a bunch more Lint warnings
1 parent 7ba29ec commit 1daf88f

File tree

8 files changed

+29
-36
lines changed

8 files changed

+29
-36
lines changed

app/src/main/java/org/cgutman/usbip/server/protocol/dev/UsbIpDevicePacket.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ public static UsbIpDevicePacket read(InputStream in) throws IOException {
7070

7171
@Override
7272
public String toString() {
73-
StringBuilder sb = new StringBuilder();
74-
sb.append(String.format("Command: 0x%x\n", command));
75-
sb.append(String.format("Seq: %d\n", seqNum));
76-
sb.append(String.format("Dev ID: 0x%x\n", devId));
77-
sb.append(String.format("Direction: %d\n", direction));
78-
sb.append(String.format("Endpoint: %d\n", ep));
79-
return sb.toString();
73+
String sb = String.format("Command: 0x%x\n", command) +
74+
String.format("Seq: %d\n", seqNum) +
75+
String.format("Dev ID: 0x%x\n", devId) +
76+
String.format("Direction: %d\n", direction) +
77+
String.format("Endpoint: %d\n", ep);
78+
return sb;
8079
}
8180

8281
public byte[] serialize() {

app/src/main/java/org/cgutman/usbip/server/protocol/dev/UsbIpSubmitUrb.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ public static UsbIpSubmitUrb read(byte[] header, InputStream in) throws IOExcept
5656

5757
@Override
5858
public String toString() {
59-
StringBuilder sb = new StringBuilder();
60-
sb.append(super.toString());
61-
sb.append(String.format("Xfer flags: 0x%x\n", transferFlags));
62-
sb.append(String.format("Xfer length: %d\n", transferBufferLength));
63-
sb.append(String.format("Start frame: %d\n", startFrame));
64-
sb.append(String.format("Number Of Packets: %d\n", numberOfPackets));
65-
sb.append(String.format("Interval: %d\n", interval));
66-
return sb.toString();
59+
String sb = super.toString() +
60+
String.format("Xfer flags: 0x%x\n", transferFlags) +
61+
String.format("Xfer length: %d\n", transferBufferLength) +
62+
String.format("Start frame: %d\n", startFrame) +
63+
String.format("Number Of Packets: %d\n", numberOfPackets) +
64+
String.format("Interval: %d\n", interval);
65+
return sb;
6766
}
6867

6968
@Override

app/src/main/java/org/cgutman/usbip/server/protocol/dev/UsbIpSubmitUrbReply.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ protected byte[] serializeInternal() {
3838

3939
@Override
4040
public String toString() {
41-
StringBuilder sb = new StringBuilder();
42-
sb.append(super.toString());
43-
sb.append(String.format("Status: 0x%x\n", status));
44-
sb.append(String.format("Actual length: %d\n", actualLength));
45-
sb.append(String.format("Start frame: %d\n", startFrame));
46-
sb.append(String.format("Number Of Packets: %d\n", numberOfPackets));
47-
sb.append(String.format("Error Count: %d\n", errorCount));
48-
return sb.toString();
41+
String sb = super.toString() +
42+
String.format("Status: 0x%x\n", status) +
43+
String.format("Actual length: %d\n", actualLength) +
44+
String.format("Start frame: %d\n", startFrame) +
45+
String.format("Number Of Packets: %d\n", numberOfPackets) +
46+
String.format("Error Count: %d\n", errorCount);
47+
return sb;
4948
}
5049
}

app/src/main/java/org/cgutman/usbip/server/protocol/dev/UsbIpUnlinkUrb.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ public static UsbIpUnlinkUrb read(byte[] header, InputStream in) throws IOExcept
3535

3636
@Override
3737
public String toString() {
38-
StringBuilder sb = new StringBuilder();
39-
sb.append(super.toString());
40-
sb.append(String.format("Sequence number to unlink: %d\n", seqNumToUnlink));
41-
return sb.toString();
38+
String sb = super.toString() +
39+
String.format("Sequence number to unlink: %d\n", seqNumToUnlink);
40+
return sb;
4241
}
4342

4443
@Override

app/src/main/java/org/cgutman/usbip/server/protocol/dev/UsbIpUnlinkUrbReply.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ protected byte[] serializeInternal() {
2020

2121
@Override
2222
public String toString() {
23-
StringBuilder sb = new StringBuilder();
24-
sb.append(super.toString());
25-
sb.append(String.format("Status: 0x%x\n", status));
26-
return sb.toString();
23+
String sb = super.toString() +
24+
String.format("Status: 0x%x\n", status);
25+
return sb;
2726
}
2827
}

app/src/main/java/org/cgutman/usbip/service/UsbIpService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.cgutman.usbipserverforandroid.R;
3131

3232
import android.annotation.SuppressLint;
33-
import android.app.Notification;
3433
import android.app.NotificationChannel;
3534
import android.app.NotificationManager;
3635
import android.app.PendingIntent;
@@ -819,7 +818,7 @@ public void abortUrbRequest(Socket s, UsbIpUnlinkUrb msg) {
819818
-22); // EINVAL
820819
}
821820

822-
class AttachedDeviceContext {
821+
static class AttachedDeviceContext {
823822
public UsbDevice device;
824823
public UsbDeviceConnection devConn;
825824
public ThreadPoolExecutor requestPool;

app/src/main/res/layout/activity_usbip_config.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
32
android:layout_width="fill_parent"
43
android:layout_height="fill_parent"
54
android:paddingBottom="@dimen/activity_vertical_margin"
65
android:paddingLeft="@dimen/activity_horizontal_margin"
76
android:paddingRight="@dimen/activity_horizontal_margin"
8-
android:paddingTop="@dimen/activity_vertical_margin" >
7+
android:paddingTop="@dimen/activity_vertical_margin">
98

109
<TextView
1110
android:id="@+id/serviceStatus"

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
77
88
-->
9-
<style name="AppBaseTheme" parent="android:Theme"></style>
9+
<style name="AppBaseTheme" parent="android:Theme" />
1010

1111
<!-- Application theme. -->
1212
<style name="AppTheme" parent="AppBaseTheme">

0 commit comments

Comments
 (0)