From 9bceebd68a89046a2a6ad9730c5d9761996ef21c Mon Sep 17 00:00:00 2001 From: Ryan Hansberry Date: Tue, 20 Oct 2015 14:55:07 -0700 Subject: Update from Support Library 23.0.1 to 23.1.0. This also fixes background issues with FABs for pre Android 4.0 devices. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 1526ab7..84b3bd6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply from: '../config/translations.gradle' apply from: '../config/jacoco.gradle' ext { - supportLibraryVersion = '23.0.1' + supportLibraryVersion = '23.1.0' testRunnerVersion = '0.3' espressoVersion = '2.2' } -- cgit v1.2.3 From 2bda23f8f7c519ca97dca8a5df20cfa6a318d3b6 Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Tue, 20 Oct 2015 11:02:38 -0700 Subject: Scroll to the previously selected view asynchronously. This avoids a race condition in ViewPager. See #301. Note that this still looks a bit janky because the pager noticably scrolls away and back to the right view. A bug has been filed with the support library team to look into a better solution. Also update the support library version. --- app/src/main/java/org/connectbot/ConsoleActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 3aebd41..389ddcc 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -170,10 +170,15 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne // create views for all bridges on this service adapter.notifyDataSetChanged(); - int requestedIndex = bound.getBridges().indexOf(requestedBridge); + final int requestedIndex = bound.getBridges().indexOf(requestedBridge); if (requestedIndex != -1) { - setDisplayedTerminal(requestedIndex); + pager.post(new Runnable() { + @Override + public void run() { + setDisplayedTerminal(requestedIndex); + } + }); } } -- cgit v1.2.3 From aa24bfcc6d12c9bd03e50281d91613d50fc8c3c0 Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Tue, 20 Oct 2015 15:25:37 -0700 Subject: Save the last selected Uri in onSaveInstanceState. --- app/src/main/java/org/connectbot/ConsoleActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 389ddcc..0bb7858 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -183,9 +183,9 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } public void onServiceDisconnected(ComponentName className) { + bound = null; adapter.notifyDataSetChanged(); updateEmptyVisible(); - bound = null; } }; @@ -1040,8 +1040,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne // Maintain selected host if connected. if (adapter.getCurrentTerminalView() != null && !adapter.getCurrentTerminalView().bridge.isDisconnected()) { - Uri uri = adapter.getCurrentTerminalView().bridge.host.getUri(); - savedInstanceState.putString(STATE_SELECTED_URI, uri.toString()); + requested = adapter.getCurrentTerminalView().bridge.host.getUri(); + savedInstanceState.putString(STATE_SELECTED_URI, requested.toString()); } super.onSaveInstanceState(savedInstanceState); -- cgit v1.2.3