Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into convert-activities-to-appcompat | Ryan Hansberry | 2015-09-22 | 11 | -80/+178 |
|\ | |||||
| * | Disable tests until new "add host" activity has been completed. | Kyle Horimoto | 2015-09-18 | 1 | -4/+4 |
| | | |||||
| * | Spaces -> tabs. | Kyle Horimoto | 2015-09-18 | 1 | -3/+3 |
| | | |||||
| * | Cleanup. | Kyle Horimoto | 2015-09-18 | 1 | -5/+2 |
| | | |||||
| * | Add FAB to host list. | Kyle Horimoto | 2015-09-18 | 10 | -78/+179 |
| | | |||||
* | | Convert PubkeyListActivity, PortFowardListActivity, and HostListActivity to ↵ | Ryan Hansberry | 2015-09-22 | 5 | -668/+646 |
| | | | | | | | | AppCompat, using AppCompatListActivity superclass | ||||
* | | Convert SettingsActivity and HostEditorActivity to AppCompat. | Ryan Hansberry | 2015-09-21 | 3 | -4/+136 |
| | | |||||
* | | Convert ColorsActivity to AppCompat Activity | Ryan Hansberry | 2015-09-21 | 1 | -2/+2 |
| | | |||||
* | | Convert HelpActivity to AppCompatActivity. | Ryan Hansberry | 2015-09-21 | 1 | -2/+2 |
| | | |||||
* | | Convert HelpTopicActivity and EulaActivity to AppCompatActivity. | Ryan Hansberry | 2015-09-21 | 3 | -5/+5 |
| | | |||||
* | | Convert PubkeyListActivity to AppCompat | Ryan Hansberry | 2015-09-18 | 3 | -222/+321 |
|/ | |||||
* | Merge pull request #220 from kruton/dependency-variables | Kenny Root | 2015-09-18 | 1 | -9/+15 |
|\ | | | | | Use variables to set the dependency versions | ||||
| * | Use variables to set the dependency versions | Kenny Root | 2015-09-18 | 1 | -9/+15 |
| | | |||||
* | | Use action bar open action in tests instead of menu key | Kenny Root | 2015-09-18 | 1 | -1/+2 |
| | | |||||
* | | Make test matches a bit more descriptive | Kenny Root | 2015-09-18 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #218 from khorimoto/fix-tests | Kenny Root | 2015-09-18 | 4 | -63/+93 |
|\ | | | | | Fix StartupTest tests to work with RecyclerView. | ||||
| * | Fix StartupTest tests to work with RecyclerView. | Kyle Horimoto | 2015-09-17 | 4 | -63/+93 |
| | | |||||
* | | Merge pull request #205 from rhansby/use-switches-not-checkboxes | Kenny Root | 2015-09-18 | 7 | -28/+420 |
|\ \ | | | | | | | Changed Settings options to use switches instead of checkboxes. | ||||
| * | | Moved SwitchCompatPreference to util package for consistency with other ↵ | Ryan Hansberry | 2015-09-17 | 3 | -18/+20 |
| | | | | | | | | | | | | custom Preferences. | ||||
| * | | Merge branch 'master' into use-switches-not-checkboxes | Ryan Hansberry | 2015-09-17 | 7 | -189/+218 |
| |\| | |||||
| * | | Make APIv14 and above use SwitchPreference, and below use custom ↵ | Ryan Hansberry | 2015-09-17 | 4 | -45/+333 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SwitchCompatPreference. Created API-v14-and-above preferences.xml and host_prefs.xml files (under xml-v14/) in order to do so. This unfortunately for the most part duplicates preferences.xml and host_prefs.xml. This method is an effective workaround for the visual glitch encountered earlier, as recorded here: https://github.com/connectbot/connectbot/pull/205#issuecomment-140547689 | ||||
| * | | Added SwitchCompat switches to Host Preferences. | Ryan Hansberry | 2015-09-16 | 1 | -0/+4 |
| | | | |||||
| * | | Switched to using SwitchCompat instead of PreferenceSwitch in order to ↵ | Ryan Hansberry | 2015-09-15 | 4 | -13/+111 |
| | | | | | | | | | | | | | | | | | | support pre-APIv14. Big thanks to: https://plus.sandbox.google.com/+ChristianGollner/posts/badausxo1J6 | ||||
| * | | Changed Settings options to use switches instead of checkboxes. | Ryan Hansberry | 2015-09-15 | 1 | -13/+13 |
| | | | | | | | | | | | | Fixes #169. | ||||
* | | | Switch all pubkey icon references to new icons. | Ryan Hansberry | 2015-09-17 | 1 | -3/+3 |
| | | | |||||
* | | | Replaced old pubkey lock/unlock icons with new Material Design icons. | Ryan Hansberry | 2015-09-17 | 13 | -3/+2 |
| |/ |/| | | | | | This fixes #207. | ||||
* | | Use AppCompatActivity instead of Activity. | Kyle Horimoto | 2015-09-17 | 2 | -28/+4 |
| | | |||||
* | | Revert "Extend AppCompatActivity instead of Activity." | Kenny Root | 2015-09-17 | 1 | -2/+2 |
| | | | | | | | | | | | | This partially reverts commit fc419491da8693446a98abf9461c00ecf21daa4b. Fixes problem with merge of #206 | ||||
* | | Merge pull request #209 from kruton/sshlib-update | Kenny Root | 2015-09-17 | 1 | -1/+1 |
|\ \ | | | | | | | Update to version of sshlib that uses a smaller SOCKS library | ||||
| * | | Update to version of sshlib that uses a smaller SOCKS library | Kenny Root | 2015-09-16 | 1 | -1/+1 |
| |/ | |||||
* | | Extend AppCompatActivity instead of Activity. | Kyle Horimoto | 2015-09-16 | 1 | -3/+2 |
| | | |||||
* | | Removed unnecessary imports. | Kyle Horimoto | 2015-09-16 | 1 | -3/+0 |
| | | |||||
* | | Clean up code. | Kyle Horimoto | 2015-09-15 | 1 | -15/+21 |
| | | |||||
* | | Adjusted style to support pre-v11 devices. | Kyle Horimoto | 2015-09-15 | 3 | -1/+8 |
| | | |||||
* | | Convert to using RecyclerView. | Kyle Horimoto | 2015-09-14 | 4 | -157/+201 |
|/ | |||||
* | Kill shell process after exiting local transport | Kenny Root | 2015-09-14 | 1 | -15/+22 |
| | | | | Fixes #200 | ||||
* | Add a bit more debugging for saving a known host | Kenny Root | 2015-09-14 | 1 | -4/+6 |
| | |||||
* | Remove hostkey and hostkeyalgo from HostBean | Kenny Root | 2015-09-14 | 1 | -22/+0 |
| | | | | | | These are never touched directly via HostBean, so remove them from the HostBean. This fixes #199, but a change in sshlib around KnownHosts might be a bit better. | ||||
* | Wrap saving a known host in a transaction | Kenny Root | 2015-09-14 | 1 | -3/+9 |
| | |||||
* | Merge pull request #195 from kruton/database-refactor | Kenny Root | 2015-09-11 | 18 | -438/+479 |
|\ | | | | | Database refactor, part 1 | ||||
| * | Fix merge error in PubkeyListActivity | Kenny Root | 2015-09-11 | 1 | -5/+0 |
| | | |||||
| * | Remove unused imports | Kenny Root | 2015-09-11 | 2 | -3/+0 |
| | | |||||
| * | Merge branch 'master' into database-refactor | Kenny Root | 2015-09-11 | 9 | -62/+132 |
| |\ | |||||
| * | | Rename the "red" host test entry to be more unique | Kenny Root | 2015-09-11 | 1 | -3/+3 |
| | | | |||||
| * | | Try to add workaround for Espresso test race | Kenny Root | 2015-09-11 | 1 | -1/+41 |
| | | | | | | | | | | | | | | | | | | The keyboard was not dismissing before the next espresso action ran, so it would send the input event to the wrong window and cause a security exception. | ||||
| * | | Switch TerminalBridge over to ColorStorage and HostStorage | Kenny Root | 2015-09-11 | 6 | -11/+15 |
| | | | |||||
| * | | Call saveHost instead of specialized updateFontSize | Kenny Root | 2015-09-11 | 2 | -27/+8 |
| | | | |||||
| * | | Switch ColorActivity to ColorStorage interface | Kenny Root | 2015-09-11 | 1 | -1/+2 |
| | | | |||||
| * | | Add interfaces for HostStorage and ColorStorage | Kenny Root | 2015-09-11 | 3 | -1/+123 |
| | | | | | | | | | | | | An attempt to help with testing. | ||||
| * | | Change colors list to primitive array | Kenny Root | 2015-09-11 | 3 | -12/+12 |
| | | |