From ae89cc6685fed0b02b04312373341f62828911f4 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 20 Aug 2015 23:35:54 -0700 Subject: Bump design library to match others --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3 From b7c63bd3ac96ec43d8681dafd67e30424841b348 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 20 Aug 2015 23:36:19 -0700 Subject: Comment out unused native method --- .../java/org/apache/harmony/niochar/charset/additional/IBM437.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); -- cgit v1.2.3 From 59921d2c2750a27cb7080051f7e96bce05a01038 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 20 Aug 2015 23:36:40 -0700 Subject: Remove unused layout params --- app/src/main/res/layout/act_colors.xml | 6 ------ app/src/main/res/layout/act_eula.xml | 1 - app/src/main/res/layout/dia_keyboard_shortcuts.xml | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) 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 @@ + android:layout_height="wrap_content"> Date: Thu, 20 Aug 2015 23:44:03 -0700 Subject: Remove uses-sdk XML attributes They're always overridden by the gradle script anyway. --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"> - + -- cgit v1.2.3 From e20b24b8adc21ada5af02101cfdb12160f4d3c85 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 20 Aug 2015 23:44:47 -0700 Subject: Use Integer.valueOf(...) to save memory This allows the pooling of Integer instances. --- app/src/main/java/de/mud/telnet/TelnetProtocolHandler.java | 2 +- app/src/main/java/org/connectbot/util/HostDatabase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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(); -- cgit v1.2.3