diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 10 | ||||
| -rw-r--r-- | app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java | 34 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout-large/act_console.xml | 7 |
4 files changed, 47 insertions, 8 deletions
diff --git a/app/build.gradle b/app/build.gradle index e02e5bd..b5f402a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ android { } testApplicationId "org.connectbot.tests" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "org.connectbot.FixJacocoTestRunner" } signingConfigs { @@ -59,9 +59,9 @@ android { } dependencies { - compile "com.android.support:support-v4:23.0.0" - compile "com.android.support:appcompat-v7:23.0.0" - compile "com.android.support:design:23.0.0" + compile "com.android.support:support-v4:23.0.1" + compile "com.android.support:appcompat-v7:23.0.1" + compile "com.android.support:design:23.0.1" androidTestCompile('com.android.support.test:runner:0.3') { exclude module: "support-annotations" @@ -132,4 +132,4 @@ android.applicationVariants.all { variant -> valuesFile.write(content, 'UTF-8') } } -}
\ No newline at end of file +} diff --git a/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java b/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java new file mode 100644 index 0000000..fbadb9b --- /dev/null +++ b/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java @@ -0,0 +1,34 @@ +/* + * This class comes from a StackOverflow post: + * http://stackoverflow.com/questions/30337375/empty-jacoco-report-for-android-espresso/31600193#31600193 + * + * This should be fixed in com.android.test.support:runner:0.4 and this class can be removed. + */ +package org.connectbot; + +import android.os.Bundle; +import android.support.test.runner.AndroidJUnitRunner; +import android.util.Log; + +import java.lang.reflect.Method; + +public class FixJacocoTestRunner extends AndroidJUnitRunner { + + static { + System.setProperty("jacoco-agent.destfile", "/data/data/" + BuildConfig.APPLICATION_ID + "/coverage.ec"); + } + + @Override + public void finish(int resultCode, Bundle results) { + try { + Class rt = Class.forName("org.jacoco.agent.rt.RT"); + Method getAgent = rt.getMethod("getAgent"); + Method dump = getAgent.getReturnType().getMethod("dump", boolean.class); + Object agent = getAgent.invoke(null); + dump.invoke(agent, false); + } catch (Throwable e) { + Log.d("JACOCO", e.getMessage()); + } + super.finish(resultCode, results); + } +} diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index ae5e3a7..95d21d8 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -500,6 +500,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne new ViewPager.SimpleOnPageChangeListener() { @Override public void onPageSelected(int position) { + setTitle(adapter.getPageTitle(position)); onTerminalChanged(); } }); @@ -1250,7 +1251,6 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne return; } bound.defaultBridge = view.bridge; - setTitle(view.bridge.host.getNickname()); } protected void updateEmptyVisible() { @@ -1368,6 +1368,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne */ private void setDisplayedTerminal(int requestedIndex) { pager.setCurrentItem(requestedIndex); + // set activity title + setTitle(adapter.getPageTitle(requestedIndex)); onTerminalChanged(); } diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml index d0ad41b..6e7ab14 100644 --- a/app/src/main/res/layout-large/act_console.xml +++ b/app/src/main/res/layout-large/act_console.xml @@ -21,6 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="#ff000000"> @@ -29,7 +30,8 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/> + android:theme="@style/Theme.AppCompat.Light.DarkActionBar" + tools:ignore="InconsistentLayout"/> <android.support.design.widget.TabLayout android:id="@+id/tabs" @@ -39,7 +41,8 @@ android:textAppearance="?android:attr/textAppearanceMedium" app:tabMode="scrollable" app:tabContentStart="60dp" - app:tabIndicatorColor="@android:color/white"/> + app:tabIndicatorColor="@android:color/white" + tools:ignore="InconsistentLayout"/> <TextView android:id="@android:id/empty" |