aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml4
-rw-r--r--app/build.gradle14
-rw-r--r--app/src/main/java/org/connectbot/transport/SSH.java12
-rw-r--r--app/src/main/res/layout/act_colors.xml2
-rw-r--r--app/src/main/res/layout/act_console.xml3
-rw-r--r--app/src/main/res/layout/act_generatepubkey.xml16
-rw-r--r--app/src/main/res/layout/act_help.xml2
-rw-r--r--app/src/main/res/layout/act_hostlist.xml1
-rw-r--r--app/src/main/res/layout/act_wizard.xml2
-rw-r--r--app/src/main/res/layout/dia_changepassword.xml10
-rw-r--r--app/src/main/res/layout/dia_portforward.xml8
-rw-r--r--app/src/main/res/layout/dia_resize.xml2
-rw-r--r--app/src/main/res/layout/item_portforward.xml3
-rw-r--r--app/src/main/res/layout/item_pubkey.xml2
14 files changed, 54 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml
index a3d9876..cb7a7aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,6 @@ android:
license:
- '.+'
-script: ./gradlew build check test
+script: ./gradlew build check createDebugCoverageReport
+
+after_success: ./gradlew coveralls
diff --git a/app/build.gradle b/app/build.gradle
index 9118576..ca76cf3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,19 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
+apply plugin: 'com.github.kt3k.coveralls'
apply from: '../config/quality.gradle'
apply from: '../config/translations.gradle'
+buildscript {
+ repositories {
+ jcenter()
+ }
+
+ dependencies {
+ classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.+'
+ }
+}
+
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
@@ -50,10 +61,13 @@ android {
debug {
applicationIdSuffix ".debug"
+ testCoverageEnabled true
}
}
}
+coveralls.jacocoReportPath = 'build/reports/coverage/debug/report.xml'
+
dependencies {
testCompile 'junit:junit:4.12'
testCompile('org.robolectric:robolectric:3.0') {
diff --git a/app/src/main/java/org/connectbot/transport/SSH.java b/app/src/main/java/org/connectbot/transport/SSH.java
index 1a7ef91..4bad2f1 100644
--- a/app/src/main/java/org/connectbot/transport/SSH.java
+++ b/app/src/main/java/org/connectbot/transport/SSH.java
@@ -193,15 +193,17 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
// Users have no way to delete keys, so we'll prompt them for now.
result = bridge.promptHelper.requestBooleanPrompt(null, manager.res.getString(R.string.prompt_continue_connecting));
- if (result == null) return false;
- if (result.booleanValue()) {
+ if (result != null && result.booleanValue()) {
// save this key in known database
manager.hostdb.saveKnownHost(hostname, port, serverHostKeyAlgorithm, serverHostKey);
+ return true;
+ } else {
+ return false;
}
- return result.booleanValue();
- default:
- return false;
+ default:
+ bridge.outputLine(manager.res.getString(R.string.terminal_failed, algorithmName, fingerprint));
+ return false;
}
}
diff --git a/app/src/main/res/layout/act_colors.xml b/app/src/main/res/layout/act_colors.xml
index 3bda649..53f492c 100644
--- a/app/src/main/res/layout/act_colors.xml
+++ b/app/src/main/res/layout/act_colors.xml
@@ -33,6 +33,7 @@
android:id="@+id/fg"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:minHeight="60dp"
android:layout_weight="1"
@@ -44,6 +45,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/fg"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/fg"
android:minHeight="60dp"
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index 46dedfb..cd06e50 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -99,6 +99,7 @@
android:paddingRight="40dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/console_prompt"
android:clickable="false"
@@ -132,6 +133,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:src="@+drawable/button_keyboard"
android:contentDescription="@string/image_description_show_keyboard"
@@ -142,6 +144,7 @@
android:paddingRight="15dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:src="@+drawable/button_ctrl"
diff --git a/app/src/main/res/layout/act_generatepubkey.xml b/app/src/main/res/layout/act_generatepubkey.xml
index 171ffd8..f10b80b 100644
--- a/app/src/main/res/layout/act_generatepubkey.xml
+++ b/app/src/main/res/layout/act_generatepubkey.xml
@@ -36,7 +36,7 @@
<TextView
android:text="@string/prompt_nickname"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
@@ -52,7 +52,7 @@
android:text="@string/prompt_type"
android:paddingRight="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="bottom|right"
+ android:gravity="bottom|end"
android:layout_gravity="center_vertical" />
<RadioGroup
@@ -89,7 +89,7 @@
android:text="@string/prompt_bits"
android:paddingRight="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="right|center_vertical" />
+ android:gravity="end|center_vertical" />
<EditText
android:id="@+id/bits"
@@ -110,14 +110,14 @@
<TextView
android:text="@string/prompt_password_can_be_blank"
- android:gravity="left"
+ android:gravity="start"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<TableRow>
<TextView
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -136,17 +136,17 @@
<LinearLayout
android:paddingRight="10dip"
android:orientation="vertical"
- android:gravity="right|center_vertical">
+ android:gravity="end|center_vertical">
<TextView
- android:gravity="right|bottom"
+ android:gravity="end|bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/prompt_password" />
<TextView
- android:gravity="right|top"
+ android:gravity="end|top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/app/src/main/res/layout/act_help.xml b/app/src/main/res/layout/act_help.xml
index 833aefb..adf17f3 100644
--- a/app/src/main/res/layout/act_help.xml
+++ b/app/src/main/res/layout/act_help.xml
@@ -39,7 +39,7 @@
android:text="@string/msg_version"
android:paddingTop="2dip"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:gravity="right"
+ android:gravity="end"
android:paddingRight="2dip"
/>
diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml
index 3d46068..a0214d4 100644
--- a/app/src/main/res/layout/act_hostlist.xml
+++ b/app/src/main/res/layout/act_hostlist.xml
@@ -31,6 +31,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
>
diff --git a/app/src/main/res/layout/act_wizard.xml b/app/src/main/res/layout/act_wizard.xml
index c68a561..97205b9 100644
--- a/app/src/main/res/layout/act_wizard.xml
+++ b/app/src/main/res/layout/act_wizard.xml
@@ -22,7 +22,7 @@
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:gravity="right"
+ android:gravity="end"
>
<ViewFlipper
diff --git a/app/src/main/res/layout/dia_changepassword.xml b/app/src/main/res/layout/dia_changepassword.xml
index 1548b3d..fe5f1dc 100644
--- a/app/src/main/res/layout/dia_changepassword.xml
+++ b/app/src/main/res/layout/dia_changepassword.xml
@@ -29,7 +29,7 @@
<TextView
android:text="@string/prompt_old_password"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
/>
@@ -47,7 +47,7 @@
<TextView
android:text="@string/prompt_password"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
/>
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:gravity="right"
+ android:gravity="end"
>
<TextView
@@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:text="@string/prompt_password"
android:paddingRight="10dip"
- android:gravity="right|bottom"
+ android:gravity="end|bottom"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:text="@string/prompt_again"
android:paddingRight="10dip"
- android:gravity="right|top"
+ android:gravity="end|top"
android:textAppearance="?android:attr/textAppearanceSmall"
/>
</LinearLayout>
diff --git a/app/src/main/res/layout/dia_portforward.xml b/app/src/main/res/layout/dia_portforward.xml
index 9402eef..ed6aa40 100644
--- a/app/src/main/res/layout/dia_portforward.xml
+++ b/app/src/main/res/layout/dia_portforward.xml
@@ -35,7 +35,7 @@
<TextView
android:text="@string/prompt_nickname"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -53,7 +53,7 @@
<TextView
android:text="@string/prompt_type"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -70,7 +70,7 @@
<TextView
android:text="@string/prompt_source_port"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -88,7 +88,7 @@
<TextView
android:text="@string/prompt_destination"
android:paddingRight="10dip"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
diff --git a/app/src/main/res/layout/dia_resize.xml b/app/src/main/res/layout/dia_resize.xml
index 2269bd6..781243d 100644
--- a/app/src/main/res/layout/dia_resize.xml
+++ b/app/src/main/res/layout/dia_resize.xml
@@ -40,7 +40,7 @@
android:text="x"
android:paddingLeft="10dip"
android:paddingRight="10dip"
- android:gravity="right|bottom"
+ android:gravity="end|bottom"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
diff --git a/app/src/main/res/layout/item_portforward.xml b/app/src/main/res/layout/item_portforward.xml
index 4a98f24..105ef58 100644
--- a/app/src/main/res/layout/item_portforward.xml
+++ b/app/src/main/res/layout/item_portforward.xml
@@ -21,7 +21,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:gravity="left|center_vertical"
+ android:gravity="start|center_vertical"
android:layout_width="fill_parent"
android:padding="10dip"
>
@@ -33,6 +33,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Tunnel Nickname"
android:layout_alignParentTop="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
/>
diff --git a/app/src/main/res/layout/item_pubkey.xml b/app/src/main/res/layout/item_pubkey.xml
index 7f4fa5f..34a7330 100644
--- a/app/src/main/res/layout/item_pubkey.xml
+++ b/app/src/main/res/layout/item_pubkey.xml
@@ -30,6 +30,7 @@
android:layout_height="wrap_content"
android:src="@drawable/pubkey"
android:contentDescription="@string/image_description_key_is_locked"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dip"/>
@@ -39,6 +40,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Key Example"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:bufferType="normal" android:layout_width="wrap_content" android:layout_toLeftOf="@android:id/icon1"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 13:43:12 +0000