diff options
author | Kenny Root <kenny@the-b.org> | 2015-08-20 23:56:32 -0700 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-08-20 23:56:32 -0700 |
commit | 15b850b4dd4d9468673b9f06d1cf6f94ec129649 (patch) | |
tree | d06e437e8fa5ecdcfa7015ba28be4983068798b1 | |
parent | 70269042771e196e111786aedcb942fd6f724ea8 (diff) | |
parent | e20b24b8adc21ada5af02101cfdb12160f4d3c85 (diff) | |
download | connectbot-15b850b4dd4d9468673b9f06d1cf6f94ec129649.tar.gz connectbot-15b850b4dd4d9468673b9f06d1cf6f94ec129649.tar.bz2 connectbot-15b850b4dd4d9468673b9f06d1cf6f94ec129649.zip |
Merge pull request #143 from kruton/cleanup
Cleanup various lint errors
-rw-r--r-- | app/build.gradle | 2 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java | 2 | ||||
-rw-r--r-- | app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java | 4 | ||||
-rw-r--r-- | app/src/main/java/org/connectbot/util/HostDatabase.java | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/act_colors.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/act_eula.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/dia_keyboard_shortcuts.xml | 3 |
8 files changed, 7 insertions, 15 deletions
diff --git a/app/build.gradle b/app/build.gradle index 67e6c01..d451fd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { compile "com.android.support:support-v4:22.2.1" compile "com.android.support:appcompat-v7:22.2.1" - compile "com.android.support:design:22.2.0" + compile "com.android.support:design:22.2.1" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b578282..f4a0c34 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:versionCode="375" android:installLocation="auto"> - <uses-sdk android:targetSdkVersion="22" android:minSdkVersion="8" /> + <uses-sdk /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.VIBRATE" /> diff --git a/app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java b/app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java index 74f08bb..a2a5d71 100644 --- a/app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java +++ b/app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java @@ -382,7 +382,7 @@ public abstract class TelnetProtocolHandler { if (b>=128) b=(byte)(b-256); if(debug > 2) { - Byte B = new Byte(b); + Byte B = Byte.valueOf(b); System.err.print("byte: " + B.intValue()+ " "); } switch (neg_state) { diff --git a/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java b/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java index d61ef59..2835d1b 100644 --- a/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java +++ b/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java @@ -53,7 +53,7 @@ public class IBM437 extends Charset { } - private native int nDecode(char[] array, int arrPosition, int remaining, long outAddr, int absolutePos); +// private native int nDecode(char[] array, int arrPosition, int remaining, long outAddr, int absolutePos); protected CoderResult decodeLoop(ByteBuffer bb, CharBuffer cb){ @@ -151,7 +151,7 @@ public class IBM437 extends Charset { super(cs, 1, 1); } - private native void nEncode(long outAddr, int absolutePos, char[] array, int arrPosition, int[] res); +// private native void nEncode(long outAddr, int absolutePos, char[] array, int arrPosition, int[] res); protected CoderResult encodeLoop(CharBuffer cb, ByteBuffer bb){ int bbRemaining = bb.remaining(); diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java index 4756157..d8cdf09 100644 --- a/app/src/main/java/org/connectbot/util/HostDatabase.java +++ b/app/src/main/java/org/connectbot/util/HostDatabase.java @@ -678,7 +678,7 @@ public class HostDatabase extends RobustSQLiteOpenHelper { null, null, null); while (c.moveToNext()) { - colors[c.getInt(0)] = new Integer(c.getInt(1)); + colors[c.getInt(0)] = Integer.valueOf(c.getInt(1)); } c.close(); diff --git a/app/src/main/res/layout/act_colors.xml b/app/src/main/res/layout/act_colors.xml index 5402bfb..9081e05 100644 --- a/app/src/main/res/layout/act_colors.xml +++ b/app/src/main/res/layout/act_colors.xml @@ -33,8 +33,6 @@ android:id="@+id/fg" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" android:layout_weight="1" android:gravity="center" android:minHeight="60dp" @@ -44,10 +42,6 @@ android:id="@+id/bg" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_alignTop="@id/fg" - android:layout_toRightOf="@id/fg" android:layout_weight="1" android:gravity="center" android:minHeight="60dp" diff --git a/app/src/main/res/layout/act_eula.xml b/app/src/main/res/layout/act_eula.xml index 4eee28c..f70188b 100644 --- a/app/src/main/res/layout/act_eula.xml +++ b/app/src/main/res/layout/act_eula.xml @@ -24,7 +24,6 @@ <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_weight="1" > <LinearLayout diff --git a/app/src/main/res/layout/dia_keyboard_shortcuts.xml b/app/src/main/res/layout/dia_keyboard_shortcuts.xml index 96b00a9..b6fb589 100644 --- a/app/src/main/res/layout/dia_keyboard_shortcuts.xml +++ b/app/src/main/res/layout/dia_keyboard_shortcuts.xml @@ -21,8 +21,7 @@ android:layout_height="match_parent"> <ScrollView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1"> + android:layout_height="wrap_content"> <TableLayout android:layout_width="wrap_content" |