Make sFactory members private and prevent call to the setter in non test mode #985

maxme · 2014-02-26T18:50:55Z

No description provided.

…y-private fix #985 make sFactory private in factories

86805a0 Add 'libs/utils/' from commit '94d1dbb0f5220525759de83c60cba3e95ce95eff' cfc3ff0 use title/content params in the editor 9f26eb3 remove useless test in example 83ff559 fix appcompat and support-v4 dependencies 714eeb1 move new editor logic to a fragment 4a2f1ba back to 21.1.1 tools 279f2ee fix appcompat dependency d3985f0 new travis config ee42dda fix build for example project 66fb19b rename package name to org.wordpress.android b61040c rename package name to org.wordpress.android 4edc93f add signing to publish artifact 94d1dbb Merge branch 'release/3.7' into develop 8ff9413 fix AppLogViewerActivity when a log is message is null 7c208db Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 9eb7273 new BlogUtils.getHostNameFromAccountMap function a80859d Theme live preview no longer changes the activity title 6186933 Photo viewer now uses low quality for the lo-res image 2eb9839 Simplified comments bfa7ecb Switched to quality enum which defaults to medium a2ce056 Added default quality param to photon 5a48a06 html encode log entries in AppLog.toHtml() c8a4d89 fix #103: retain menu drawer scroll position after switching activities c1e0778 Merge branch 'develop' into issue/985-make-sfactory-private fe1d125 fix build files for android studio 1.0 f7a2d48 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 72fe2b7 update support lib version for travis 0b03b71 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 0f5751d Merge branch 'develop' into release/3.4 b68f755 remove unused code (refresh button) cb8321b fix #985: maks sFactory private - force injection in test module faae1d3 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java a0982d1 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 3a0c45e Removed unsuccessful fix for #1982. b967d59 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 92d4e15 Merge branch 'develop' into feature/material-appcompat 7c8d5ab Merge branch 'release/3.4' into develop 1e499a6 Merge branch 'hotfix/3.3.1' into release/3.4 7a4a364 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 5451df7 update subtrees to use build tools 21.1.1 4024637 rename PullToRefresh to SwipeToRefresh 0d8d414 remove unused viewClass in PTR constructor 2424201 fix circle spinner color style d392885 Return a copy of the JSONObject in getDiffableValue(). 106affa replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 3108a36 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting db25827 Merge branch 'develop' into issue/1958-round-avatars 2801610 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 6ac0248 Merge branch 'hotfix/3.3.1' into release/3.4 eb70e6f upgrade to android-gradle 0.14.0 9bc4ba6 Rounds all WPNetworkImageViews with `AVATAR` type. c2fd6c7 Initial commit adding mentions to notification comments 0a3da42 Added image spans directly instead of using Html.fromHtml(). 5b22440 Merge branch 'release/3.2' into develop 1a2a73f fix debug/release build propagation to sub projects d9eac2e Merge branch 'release/3.2' into develop 380ece6 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign c38f131 Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet 4e92eaa Merge branch 'hotfix/3.1.2' into release/3.2 cbc7b24 fix #1821: remove DisplayUtis.isTablet() method 343771a Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null c44a87a Merge branch 'release/3.2' into feature/notifications-redesign 97c557c Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 1cacaf2 Merge branch 'hotfix/3.1.1' into release/3.2 568782f Merge branch 'hotfix/3.1.1' into develop 96fd180 remove isTablet() check 870944d Merge branch 'release/3.2' into feature/notifications-redesign 3390393 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" 03bbac0 Merge branch 'develop' into feature/notifications-redesign 8ec2915 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 1623d65 fix lint error in utils e273dd3 Merge branch 'develop' into feature/notifications-redesign 4bfc641 Removed aggressive `JSONUtil` logging f7f4556 update support-v13 library to version 19.1.0 fafcf67 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 1868cc5 disable refresh on the attacher 082c13f use the PTR library version 0.9.7 f21f5d3 set network refresh mode as default d262f8d remove unused code 9e592fd add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled f85a003 move NetworkUtils to WPUtils subtree d19c080 Updated comment cabb8a7 TextView content is reset to itself to force it to correctly resize using cached image 48e4ed2 More cleanup 2426243 Cleanup WPImageGetter based on code analysis c955d26 Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel 3bc1080 Merge branch 'release/3.1' into develop f75a9e7 increment version number caa9db0 fix #1762: show blog url in the share blog spinner if the blog title is an empty string e1eecbf remove ProfilingUtils.getVersionName calls 075b989 remove unused method from ProfilingUtils b48cbda move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 44bb61e Rewrote the AppLog viewer to use a ListView+adapter 59f0bfa Merge branch 'develop' into issue/1690-track-last-seen-screen 9300d28 remove unused util file ActivityUtils b15cf64 Bump libs/utils version number. 0d89a80 generic way to track last seen activity - requires GET_TASKS permission 391276c Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. c8dc1e8 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. aa5b665 init utils readme 76df52f import libs/utis 449639d set defaultPublishConfig to debug - in case we had source dependencies to this module 5b1f8f1 remove gradle wrapper cd72102 Bump version number 90f9f22 Merge pull request #1 from wordpress-mobile/issue/move-ptr-to-utils c6b0ff9 showToast methods now return a Toast object 3e93210 Move pull to refresh to Utils b302b44 Move ToastUtils to Utils a0e973c document getPrimaryEmail method d68fb87 add getCircularBitmap and getRoundedEdgeBitmap from the main project merge in 80014b7 d2a76e2 avoid build failure when gradle.properties file is missing 5d683f6 use maven plugin to deploy maven artifact 70a91cb bump version number to 1.0.1 575579d gitignore tools/deploy-mvn-artifact.conf 50f2c80 maven deploying script cf85e19 ignore .idea and local.properties 7c6d4f4 add WPImageGetter and fix HtmlUtils b4baff8 remove crashlytics reference from Utils 32e98a9 merge from WordPress-Android@1a74364d0 79b7014 gitignore all build/ directories c9e6b52 Restores query separator period in `JSONUtils`. fddb5a0 Ignoring iml files 4263343 Initial commit of utils classes. 0228ac4 Fix package id name 826c265 Move java source to correct directory a528b8e Initial Project Structure git-subtree-dir: libs/editor git-subtree-split: 86805a0

4520f51 build.gradle fix to push the pom/aar to maven central c977755 update gradle wrapper to version 2.2 e0d1927 add central maven config 94d1dbb Merge branch 'release/3.7' into develop 8ff9413 fix AppLogViewerActivity when a log is message is null 7c208db Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 9eb7273 new BlogUtils.getHostNameFromAccountMap function a80859d Theme live preview no longer changes the activity title 6186933 Photo viewer now uses low quality for the lo-res image 2eb9839 Simplified comments bfa7ecb Switched to quality enum which defaults to medium a2ce056 Added default quality param to photon 5a48a06 html encode log entries in AppLog.toHtml() c8a4d89 fix #103: retain menu drawer scroll position after switching activities c1e0778 Merge branch 'develop' into issue/985-make-sfactory-private fe1d125 fix build files for android studio 1.0 f7a2d48 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 72fe2b7 update support lib version for travis 0b03b71 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 0f5751d Merge branch 'develop' into release/3.4 b68f755 remove unused code (refresh button) cb8321b fix #985: maks sFactory private - force injection in test module faae1d3 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java a0982d1 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 3a0c45e Removed unsuccessful fix for #1982. b967d59 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 92d4e15 Merge branch 'develop' into feature/material-appcompat 7c8d5ab Merge branch 'release/3.4' into develop 1e499a6 Merge branch 'hotfix/3.3.1' into release/3.4 7a4a364 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 5451df7 update subtrees to use build tools 21.1.1 4024637 rename PullToRefresh to SwipeToRefresh 0d8d414 remove unused viewClass in PTR constructor 2424201 fix circle spinner color style d392885 Return a copy of the JSONObject in getDiffableValue(). 106affa replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 3108a36 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting db25827 Merge branch 'develop' into issue/1958-round-avatars 2801610 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 6ac0248 Merge branch 'hotfix/3.3.1' into release/3.4 eb70e6f upgrade to android-gradle 0.14.0 9bc4ba6 Rounds all WPNetworkImageViews with `AVATAR` type. c2fd6c7 Initial commit adding mentions to notification comments 0a3da42 Added image spans directly instead of using Html.fromHtml(). git-subtree-dir: libs/utils git-subtree-split: 4520f51

@nbradbury

c2484a2 bump version to 1.10.0 2f7330c gradle wrapper now uses gradle v2.11 755e012 new MediaUtils function: getImageWidthSettingFromString 9a1e358 Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 961a76c Squashed 'libs/editor/' changes from fa030e4..10ae495 4d4a62d Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 5da21ed Squashed 'libs/editor/' changes from 31b66df..fa030e4 89dc10d Clarify comments and parameter names 924cafd fix #4114: remove the URL scheme if it's not http or https during URL sanitization ce16255 Merge branch 'develop' into feature/gravatar-upload-okhttp 3b37573 Squashed 'libs/editor/' changes from 0b74389..31b66df 4542685 Squashed 'libs/editor/' changes from 8818dd1..0b74389 9907504 Squashed 'libs/editor/' changes from 17887d3..8818dd1 62c0633 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 ac1a4af Squashed 'libs/editor/' changes from abfcce5..17887d3 d421635 Adds permission utils for calling via fragments be4aac0 Squashed 'libs/editor/' changes from 72933eb..abfcce5 57027fd Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop c0f0848 Squashed 'libs/editor/' changes from 7be0b57..72933eb 52910dd Squashed 'libs/editor/' changes from 41a1010..7be0b57 d2f7ed4 Squashed 'libs/editor/' changes from 0f6fba8..41a1010 31b7405 Updating to gradle 2.0 556b07f Updating to rc3 c5b98a8 Squashed 'libs/editor/' changes from a35d654..0f6fba8 dba14e7 Merge pull request #3919 from wordpress-mobile/issue/update-build-tools ca0ddf7 Merge branch 'release/5.2' into release/5.3 439ac00 Updating the rest of the modules to buildToolsVersion 23.0.3 0ce206f Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 4c9324c Squashed 'libs/editor/' changes from f1f6d10..a35d654 290f00a update to android-gradle-2.0.0-rc1 23312dd upgrade to gradle plugin 2.0.0-beta7 c6efe0a Squashed 'libs/editor/' changes from bed2a4e..f1f6d10 9b0b5fa Squashed 'libs/editor/' changes from eb8d070..bed2a4e 2f8ebef update to com.android.tools.build:gradle:2.0.0-beta7 7b3b47e Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 2689888 Comment getQuantityString() 6551031 use String.format(getString(format), ...) instead of buggy getString(format, ...) b2ac4fe replace plurals with a utility method cf7abc9 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 8db246f Squashed 'libs/editor/' changes from 2b066be..eb8d070 c34f307 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop a299686 Squashed 'libs/editor/' changes from 57802bf..2b066be 259c0cc Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9cd77b6 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop a03a146 Squashed 'libs/editor/' changes from 7f3b589..57802bf bcba708 Mark the util WPEditText as deprecated 0f6791c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 487d833 Updated gradle to 2.0.0-beta6 e6a2785 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9ca8561 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 108ed89 Squashed 'libs/editor/' changes from 50ddd25..7f3b589 d624527 Merge branch 'develop' into feature/visual-editor 346be68 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 714085f Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor 87b5e7c Squashed 'libs/editor/' changes from 4832795..50ddd25 6335e6e Merge branch 'develop' into feature/visual-editor ad79aef Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager 63391ec Merge remote-tracking branch 'origin/develop' into feature/account-settings cb1661f Upgrade gradle plugin to 2.0.0-beta5 68c6f4c Squashed 'libs/editor/' changes from 69aaa8a..4832795 46aabfc Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes a667632 Merge remote-tracking branch 'origin/develop' into feature/account-settings 3194ade Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List aa8d9d5 Fix media isVideo/isValidImage/... utils method ebef08f Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 097b51b Squashed 'libs/editor/' changes from d99856b..69aaa8a fc52906 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop c0668eb Merge remote-tracking branch 'origin/develop' into feature/account-settings da10360 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 1e0ce6c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List b927220 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 7b89b47 update to android gradle plugin beta4 abd8b59 Merge remote-tracking branch 'origin/develop' into feature/account-settings cdc50b8 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 4feb531 Reverts a previous unnecessary change that's accidentally committed for StringUtils 2bf5d02 update to android gradle plugin 2.0.0-beta-2 - Instant Run f7bbc16 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment 5d798e5 Use lowercase locale array to make sure language is pre-selected 4a9c2a3 Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 5ce9100 Merge remote-tracking branch 'origin/develop' into feature/account-settings ab0599a Download available plans for a site. Refactoring!! 0c37b48 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item e16984b Download global plans from wpcom and parse them. Store the response in AppPrefs for now. b6449a5 Primary site added to Account Settings (wip) ac00bae Adding SETTINGS log tag and logging unknown language code error c0c935f Squashed 'libs/editor/' changes from 6647346..d99856b 26983b7 Merge develop into site-settings-review faf8169 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop a0920e0 Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 2a47170 Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. 3dc20d0 kill StringUtils.getHost function 0851eb3 s/getDomainFromUri/getHost/ 0bca2ec 4.9-rc-2 / 228 version bump fa39ced fix #3521: use the simplest UnderlineSpan subclass 8b485b6 Merge branch 'develop' into feature/site-settings-review f413bfd Allow photon to resize GIFs 4d1d85e Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop 4a4c685 Merge branch 'develop' into feature/site-settings-review 5de9f05 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 2467f23 Squashed 'libs/editor/' changes from ce4343d..6647346 8baae1f fix #3372:Resource Leak in SqlUtils.java 3fbefee Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop adcda50 Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop ef4143b Moved the check for video to within ImageUtils 41a29ce Merge branch 'develop' into feature/site-settings-review ec04675 suppress lint on missing permission 8eb155d Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 0b0e451 Add log line that could help us in case of errors in the JSON parsing with queryJSON. f214bff Merge branch 'develop' into feature/site-settings-review 83eb9d1 Better solution: Fix the url within PhotonUtils. Hattip @nbradbury 47d1e59 Revert "Fixes issue where private blog images wouldn't load." d632cb7 Revert "Killing whitespace." a60cce7 Killing whitespace. cc3dd96 Fixes issue where private blog images wouldn't load. b5937d6 Merge branch 'release/4.7' into feature/site-settings-review bc7772a Moved permission check and request to PermissionUtils 21634cb Checking media permission when attempting to add media to post e0721c8 Merge branch 'release/4.6' into issue/3115-runtime-permissions c3ad1f2 first step for runtime location request f376b01 Merge branch 'develop' into feature/site-settings-review bb91e9a Merge branch 'release/4.6' into develop bb4cb66 Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release ba3a532 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 7b6a9d4 Squashed 'libs/editor/' changes from 244a513..ce4343d 13bb8af test queryJSON calls with null params 181cebb Check null query string 68f5328 check null source in JSONUtils.queryJSON() 66d56be Merge branch 'develop' into feature/site-settings-review a9e602f update ProfilingUtils usage 9eeabd4 Merge branch 'develop' into feature/site-settings-review 2aaf29d Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 55037d2 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. b534e1d URL Utils test fix bb2d893 Merge branch 'develop' into feature/site-settings-review 47cc553 generic approach to add parameters to a URL dc193f5 new UrlUtils method: appendPreviewURLParameter 7bf9eb9 Updating build tools to 23.0.1 619e359 Merge branch 'develop' into feature/site-settings-review 58440ae set targetSdkVersion to 23 and clean up lib dependencies 5b825d3 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 6ad7e5c fix lint errors b7d5983 update to gradle plugin 1.3.1 and gradle 2.6 dd3729c upgrade to gradle 2.5 and gradle plugin 1.3.0 7d3506f Merge branch 'develop' into feature/update-to-gradle-2.4 cfe353e Merge branch 'develop' into feature/update-to-gradle-2.4 33111c4 Squashed 'libs/editor/' changes from e0a8651..244a513 f9336b1 Squashed 'libs/editor/' changes from a59304d..e0a8651 05d9908 Updating ActionBar title. Save button is now Undo. 5f30f53 Squashed 'libs/editor/' changes from 6c35434..a59304d 56693c5 Squashed 'libs/editor/' changes from 4125f05..6c35434 fcf0b6f Merge branch 'hotfix/4.1.1' into release/4.2 a576ec7 Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update 0105cee Updating EditTextUtils.getText method instead of creating new one. 3f98bb1 limit text to 524288 characters which is always < 2Mb with UTF-8 734f781 Merge branch 'hotfix/4.1.1' into release/4.2 bf3cd76 fix #2855: delete big comments and truncate new inserted comments df5f634 Squashed 'libs/editor/' changes from 77cb2fb..4125f05 661dc4f Coding Styles ac27e0f Make sure the context passed to checkConnection is not null 9eaf958 Squashed 'libs/editor/' changes from aec6410..77cb2fb fc2bc73 Updated support library and build tools 3ff99e3 update to gradle android plugin 1.2.3 4109f72 update support lib to 22 bb09a7b update to android-gradle plugin 1.1.3 and build tools 22.0.1 2f98d8a Introduce our version of MarkView 2aa392e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 4434b0f Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop 8658bd7 Fixed notifications fragment for self-hosted 40e798b Merge pull request #140 from wordpress-mobile/issue/18-format-bar-tablet 0bcd888 Merge branch 'release/4.0' into develop 4ace866 Removing potential race condition with WP image loading threads. 8786fed Returning to the post editor won't crash if Activity was destroyed. 2fe6c3f Merge branch 'develop' into issue/18-format-bar-tablet 8a1bf41 Merge pull request #138 from wordpress-mobile/issue/124-separate-files 559b7d8 Style updates. 9b89d36 Added support for strikethrough tag in EditorFragment efcde28 Added editor layout for tablets (sw600dp) 5e59531 Added selector for strikethrough button 3bf29a2 Added bigger HTML button drawables for tablet format bar 9239f92 Removed a lot of inline JS/CSS from the main editor html file. 64b83d3 Merge pull request #136 from wordpress-mobile/issue/132-formatbar-keyboard-old-api 2d7c9c4 Moved some WebView config code from EditorFragment to EditorWebViewAbstract c5882ba Merge remote-tracking branch 'remotes/origin/develop' into issue/132-formatbar-keyboard-old-api 566b8e6 Add more audio formats 0699bb6 Suppressed NewApi lint check for EditorWebView.execJavaScriptFromString c15b38c Handle audio files in media browser 8d5b424 Added compatibility WebView for API<19 with custom method for executing JS 4478cf3 Merge pull request #133 from wordpress-mobile/issue/10-format-bar-phone ba3c137 Pulled the EditorWebView layout element into a separate file b4a21f4 Modified EditorWebView to use WebView.evaluateJavascript on API>=19 ef8b078 Added EditorWebViewAbstract and replaced EditorWebView usage in EditorFragment 50524b9 Moved the format bar's left margin inside the scrollview 0d2a713 Shrank HTML button and tightened its margins 06c212a Merge branch 'release/4.0' into develop 056645f Merge branch 'hotfix/3.9.1' into release/4.0 c2d5a5e Catching other unknown URL exception. d08c926 Making sure Cursor is closed if exception gets thrown. ba751a2 Catching unknown URL exceptions. baa00c8 Removed unnecessary HTML button code f30f7be Merge branch 'release/4.0' into develop 1b6118d Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 f144a88 Linked up format bar buttons to ZSSEditor methods 570ae57 Added unit test for Utils.buildMapFromKeyValuePairs bbba60a Added partial support for the callback-selection-changed JS callback bb8c537 Added format bar buttons and dividers to editor layout f1d2319 javadocs efe7e97 If string is empty return empty string instead of null 6e340ac Renamed format button highlighted underline dimens 315bb50 Relabeled legacy editor color assets 14c3938 Added new format bar icons and selectors 8303e45 Renamed legacy editor button selectors and images 6195fe0 Merge pull request #129 from wordpress-mobile/issue/23-extract-callback-handler 228a563 Qualified Utils static imports in UtilsTest 418d4b3 Some EditorFragment cleanup db3bd70 Added units tests for Utils 53821d7 Added units tests for JsCallbackHandler 862e533 Added some callback placeholders to JsCallbackReceiver with logging b746221 Renamed callback classes for clarity bedf027 Merge branch 'develop' into issue/23-extract-callback-handler eaa2f17 Merge pull request #21 from wordpress-mobile/feature/test-framework 5346958 Added a lint rule ignoring the 'InvalidPackage' check for Robolectric 83c3108 Added notes and logging for some currently unused JS callbacks 4c2f2d1 Downgrading plugin, tests aren't working with the new tools. 17ec76c Updating robolectric-gradle-plugin and the Android gradle build plugin. 201f7e7 Merge branch 'develop' into feature/test-framework abcf3e3 Moved some utility methods from EditorFragment to Utils 7f336ea Added a WebView sublcass, EditorWebView, and switched the editor to use that b7be242 Added handling for the "callback-selection-style" JS callback e9c6401 Updated onDomLoaded() to enable multiline support for the content field f1f933b Moved JsCallbackHandler to its own file 5da8d79 Added example format bar with bold button fc5f50d Merge pull request #22 from wordpress-mobile/feature/14-main-editor 3666662 Cleaned up EditorFragment 9645409 Changed project license from MIT to GPLv2 cfa2fe4 Fixed issue with JavaScript not loading on API<19 32591e0 Switched WebChromeClient onConsoleMessage to use debug log messages instead of error 10b5506 Updated to use build tools 21.1.2 54d20a7 Added title to editor example content 124981c Added travis build status to README 200efb8 Adding Robolectric test framework and JaCoCo code coverage reports. 124d3a9 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity c47d51e javadocs 152983e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity ef0e582 README cleanup d16a6d5 Set default activity for example application 23fd043 Updated README with build instructions for Windows (fixes assets symlink) 87c8911 Added @SuppressLint for web debugging a5e31e8 Changed WordPress-Utils-Android dependency to maven artifact 7631e96 If string is empty return empty string instead of null d8522a9 Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer b626b4c 1.5.0 version bump d2cfae7 Merge branch 'develop' into feature/modularize-editor 88f29c5 JS to Java callback proof of concept d2aa4f3 Updated ZSSRichTextEditor to latest version ced12ea Auto-load an example HTML file in editor dd66e62 Updated common editor files and imported editor HTML file from iOS fd92adf Added support for `WPWebViewClient` to pass the token for image requests. 6a05144 Merge branch 'hotfix/3.8.1' into release/3.9 efa02b7 fix gallery placeholder icon 1d171d8 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation a6b5ecf Tapping a media gallery span opens gallery editor. 912f81a Adding missing override annotation. 58c9ae7 Using isVideo to determine if a file is a video. 1721d30 enable gallery handling 3ca1d97 remove unused code 9c806b5 first step at introducing the new media picker 28ca417 Merge branch 'develop' into feature/modularize-editor cec9c82 fix #2328: sort blogs with an empty title by their hostname c431408 Merge branch '1628-mediapicker' into feature/modularize-editor 94e0f77 rename and update editor colors 1b3b384 Merge branch 'develop' into feature/modularize-editor 1398d41 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor c0c684a comment CustomSwipeRefreshLayout.onTouchEvent 757b720 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException c9a7b99 Merge branch 'develop' into feature/modularize-editor 682b62b Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 6083a1a Merge branch 'develop' into feature/modularize-editor 9f900a9 fix typo in a comment a9e6e49 delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 63dbb16 styling update eeb819b Merge branch 'release/3.7' into develop 92791b4 Merge branch 'develop' into feature/modularize-editor f6ef4ce fix local draft style saving by introducing an awful "getSpannedContent()" method :( c3d9720 fix #2336: check for null text entry, replace them with a string 8f9d5e4 EditLinkActivity is now independent from the EditPostActivity 1d7067e add local draft / remote post example d33a9be make the legacy editor works in the example project 6f0d297 LegacyEditorFragment now lives in the editor subproject 2b5c737 split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 777635b split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 56d9289 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 0c60b07 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 11e6f7f use setFeaturedImageSupported instead of using WordPress.getCurrentBlog().isFeaturedImageCapable() fb3a66d appendMediaFile now able to load local media 59c4bc4 Merge branch 'develop' into feature/modularize-editor fe48809 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview 068e0df reenable appendMedia in LegacyEditorFragment 4f21616 All gravatar requests now default to 404. d847975 split methods to be usable on MediaFile instead of WPImageSpan 8978cb1 move WPEditImageSpan bitmap loading to the constructor ef8a893 Added DEFAULT_BLAVATAR constant 956d44c WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter 4f27696 Moved fixAvatar routine to GravatarUtils 9955a71 Added DefaultImage enum to GravatarUtils 2eba000 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 8141509 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 839f755 first step to remove getContentEditText/getTitleEditText aacdb40 Squashed 'libs/editor/' changes from 571b0b7..aec6410 fecaf30 Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor aec6410 remove libs/utils dependency (use the artifact instead) 5cac05f add getters for Title/Content 406a9d4 move activities from editor/libs to editor/example 4b80ec9 rename EditorFragmentInterface to EditorFragmentAbstract 4b1beca use EditorFragmentInterface and call initContentEditor 30ce072 Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds 9cce529 remove extraneous static field 26fc5f7 new EditorFragmentInterface d328cf6 Merge branch 'develop' into feature/modularize-editor 0bf5a63 move WPEditText to WordPressUtils and reorganize WordPressUtils ac92a69 move WPEditText to WordPressUtils and reorganize WordPressUtils c11bb96 fix WordPressEditor example build 9fc7eee First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 20a9dd9 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 8b3bf17 rename editor/analytics projects in build files e12800b rename editor/editor to editor/WordPressEditor and analytics/analytics to analytics/WordPressAnalytics to avoid confusion in Android Studio f4ba322 Blavatar defaults to 404 9d58f07 Added blavatars to ManageBlogsActivity 6a4e8c7 use utils artifact instead of sub project e451f1f move resources from main project to editor 4917b74 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 77a78c9 Squashed 'libs/editor/' changes from 86805a0..571b0b7 571b0b7 add license file 48a14b0 add assets link 9dcfa23 Add 'libs/editor-common/' from commit '9d488d2a1c610380aa9446f8c9fea50d15354a84' 9d488d2 initial commit cdcc2a8 Initial commit 3b085ce Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop d9f758e Merge branch 'release/3.7' into develop c24cf7f comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there fa05a48 Add strip=all to all Photon requests 1b5d1fd add dependency on WordPressUtils and use AppLog instead of Log add8d90 Squashed 'libs/editor/' changes from fc65662..86805a0 5df2a9b Squashed 'libs/editor/' changes from fc65662..86805a0 86805a0 Add 'libs/utils/' from commit '94d1dbb0f5220525759de83c60cba3e95ce95eff' cfc3ff0 use title/content params in the editor 9f26eb3 remove useless test in example 83ff559 fix appcompat and support-v4 dependencies 714eeb1 move new editor logic to a fragment 4a2f1ba back to 21.1.1 tools 279f2ee fix appcompat dependency d3985f0 new travis config ee42dda fix build for example project 66fb19b rename package name to org.wordpress.android b61040c rename package name to org.wordpress.android 4edc93f add signing to publish artifact fc65662 first commit 22fc5ea fix #2293: remove leading double slash in URLs returned by wporg servers 21a72fe Merge branch 'release/3.7' into develop 5fc20b0 fix AppLogViewerActivity when a log is message is null 519a49d Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title fe5748a new BlogUtils.getHostNameFromAccountMap function 6086bf3 Theme live preview no longer changes the activity title f5425b4 Photo viewer now uses low quality for the lo-res image 2765036 Simplified comments e8555a5 Switched to quality enum which defaults to medium 455855b Added default quality param to photon f0fa639 html encode log entries in AppLog.toHtml() a844a15 fix #103: retain menu drawer scroll position after switching activities 5a72a14 Merge branch 'develop' into issue/985-make-sfactory-private 847dc52 fix build files for android studio 1.0 3b3a115 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 855bf77 update support lib version for travis 04c0532 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 6e2fc97 Merge branch 'develop' into release/3.4 c8ae9b8 remove unused code (refresh button) 47b079d fix #985: maks sFactory private - force injection in test module e6eb6dc Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 411df80 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 16e27f7 Removed unsuccessful fix for #1982. 57dc2d6 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity cc8d417 Merge branch 'develop' into feature/material-appcompat 7078615 Merge branch 'release/3.4' into develop 376d5d8 Merge branch 'hotfix/3.3.1' into release/3.4 2131975 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 5c7d9c1 update subtrees to use build tools 21.1.1 2eaaf77 rename PullToRefresh to SwipeToRefresh 8191caf remove unused viewClass in PTR constructor cc60d09 fix circle spinner color style 5a2533c Return a copy of the JSONObject in getDiffableValue(). 2bff0f2 replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 039d47e Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting a3ef9c1 Merge branch 'develop' into issue/1958-round-avatars ebdc699 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting c03a923 Merge branch 'hotfix/3.3.1' into release/3.4 e71569b upgrade to android-gradle 0.14.0 a8aa7e5 Rounds all WPNetworkImageViews with `AVATAR` type. 6e90b83 Initial commit adding mentions to notification comments d4ff1cf Added image spans directly instead of using Html.fromHtml(). afc5a86 Merge branch 'release/3.2' into develop 8b95174 fix debug/release build propagation to sub projects 1b079d0 Merge branch 'release/3.2' into develop e481b13 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign dcc33ea Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet f438748 Merge branch 'hotfix/3.1.2' into release/3.2 a061eb3 fix #1821: remove DisplayUtis.isTablet() method 70242e2 Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null 012532e Merge branch 'release/3.2' into feature/notifications-redesign 7339f98 Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 70fd076 Merge branch 'release/3.2' into develop 907b86c Merge branch 'hotfix/3.1.1' into release/3.2 22532e4 Merge branch 'hotfix/3.1.1' into develop f2d990a remove isTablet() check c54c2be Merge branch 'release/3.2' into feature/notifications-redesign dde165c Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" de7cb04 Merge branch 'develop' into feature/notifications-redesign 60a3cf7 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 36ce907 fix lint error in utils b7c1140 Merge branch 'develop' into feature/notifications-redesign 2e0d872 Removed aggressive `JSONUtil` logging e5ee549 update support-v13 library to version 19.1.0 c71fdf7 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 2167d48 disable refresh on the attacher 811be6a use the PTR library version 0.9.7 b59d7a8 set network refresh mode as default 3294c34 remove unused code 4344929 add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled 5a6e5cf move NetworkUtils to WPUtils subtree 0277c58 Updated comment 719a637 TextView content is reset to itself to force it to correctly resize using cached image c8b1eaa More cleanup 8e366fa Cleanup WPImageGetter based on code analysis f0229fc Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel 8b37df5 Merge branch 'release/3.1' into develop 92677c2 Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 ca27479 fix #1762: show blog url in the share blog spinner if the blog title is an empty string b2d1806 remove ProfilingUtils.getVersionName calls 2b0241f remove unused method from ProfilingUtils f464cdb move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 643365e Merge branch 'develop' into feature/notifications-redesign 10253e0 Rewrote the AppLog viewer to use a ListView+adapter 631fbe9 Merge branch 'develop' into issue/1690-track-last-seen-screen 525e3c3 remove unused util file ActivityUtils efdb85c Merge branch 'develop' into issue/1684-stuck-notifications 8b2a504 Bump libs/utils version number. bbbe7d8 Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size adbedc9 generic way to track last seen activity - requires GET_TASKS permission 8deae86 Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. a38b30c Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. 41078f6 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update 2346771 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. f00f6b5 Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 02f662f init utils readme 4d7191e import libs/utis b42ec5a fix #1681: null check 900e14c Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column 32266a5 Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: c2484a2

@maxme

e2fca68 Merge pull request #6 from wordpress-mobile/feature/publish-to-bintray ff55402 Merge pull request #9 from wordpress-mobile/issue/default-value-types 54e9c48 Converting type of default value for float/double map getters 62c3515 Merge pull request #7 from wordpress-mobile/issue/add-new-maputils-methods 2892e26 New MapUtils.getMapDouble/getMapFloat methods c2f2939 fix minor JavaDocs issue that was breaking the build 2573319 Use bintray plugin to publish the maven artifact 0c54828 Update the README with bintray infos 65eff6d remove unused gradle config 8b2c1d1 Update gradle wrapper acc6a07 bump version to 1.11.0 8c24405 Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage 3deb502 changed Locale.getDefault() occurrences for the slightly enhanced LanguageUtils.getCurrentDeviceLanguage() 4643408 moved LanguageUtils to Utils. + split getDeviceLanguage into Code (for string) and Locale for reuse as suggested in code review by @maxme 788b981 Merge branch 'release/5.5' into develop 40f8845 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5 49ac398 Squashed 'libs/editor/' changes from b012dc8..a2a6a7c 77a5220 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5 1cf141b Squashed 'libs/editor/' changes from c5f3e9c..b012dc8 d862a72 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5 65eec31 Squashed 'libs/editor/' changes from 5ee37c8..c5f3e9c 3de1e7f Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5 2fc5d53 Squashed 'libs/editor/' changes from b207f3f..5ee37c8 5a93f9e update gradle wrapper to 2.14 612eb5d Merge branch 'release/5.5' into develop 0942d02 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5 19320ef Squashed 'libs/editor/' changes from 68d15ed..b207f3f 9accdee Updating gradle plugin to 2.1.2 aea69b5 Merge branch 'hotfix/5.4.1' into release/5.5 0e7e33b Squashed 'libs/editor/' changes from 2c183ac..68d15ed 564fe01 Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1 38919d3 Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size e8a087f Squashed 'libs/editor/' changes from 10ae495..2c183ac d196e58 Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1 70fbe99 new MediaUtils function: getImageWidthSettingFromString 1ff8fe9 Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 be0d5e7 Merge branch 'release/5.4' into develop eac2ab2 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 41c54a9 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync 1c2428f Merge branch 'release/5.4' into develop 83b8a3b Merge remote-tracking branch 'origin/develop' into feature/people-management-sync e9f2263 Clarify comments and parameter names b75040c fix #4114: remove the URL scheme if it's not http or https during URL sanitization f5cf254 Updating to support library 23.4.0 09d627d Merge branch 'develop' into issue/3791-support-library-23.2 83b2a08 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 4b19685 Merge branch 'develop' into feature/gravatar-upload-okhttp f686595 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync a064704 Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop 6bd0eaf Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 f636a7d Adds permission utils for calling via fragments 55969ba Merge remote-tracking branch 'origin/develop' into feature/people-management-sync dbb3be7 Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop a06b5d7 Merge branch 'develop' into issue/3791-support-library-23.2 56aabff Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 7d37c22 Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update d4387b4 Updating to gradle 2.0 282d7b8 Updating support library to 23.3.0 ae9db13 Updating to gradle 2.0 6adaaa7 Merge branch 'develop' into issue/3791-support-library-23.2 061f32b Updating to rc3 2f39af5 Updating build.gradle to latest rc3 55d7dd9 Merge branch 'develop' into issue/3791-support-library-23.2 b63d875 Merge pull request #3919 from wordpress-mobile/issue/update-build-tools dc2c5f8 Merge branch 'feature/people-management-sync' into feature/people-management-network-and-data-layer ee21584 Merge branch 'release/5.2' into release/5.3 44f5192 Updating the rest of the modules to buildToolsVersion 23.0.3 f5ade45 Updating the rest of the modules to buildToolsVersion 23.0.3 c969743 Merge branch 'develop' into issue/3791-support-library-23.2 8772a5c Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 50153d8 Added People to AppLog 9e8f3ce update to android-gradle-2.0.0-rc1 549a3cd upgrade to gradle plugin 2.0.0-beta7 422a249 Merge branch 'develop' into issue/3791-support-library-23.2 52b7374 update to com.android.tools.build:gradle:2.0.0-beta7 2954409 Updating support library to 23.2.1 018afc3 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop d9c3df6 Comment getQuantityString() 3d0451b use String.format(getString(format), ...) instead of buggy getString(format, ...) 711d189 replace plurals with a utility method b319ace Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 521be50 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 348956c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master c3e7e81 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 79220be Mark the util WPEditText as deprecated 88508bb Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master d2d5ae1 Updated gradle to 2.0.0-beta6 767a589 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 299607b Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 23ef582 Merge branch 'develop' into feature/visual-editor 013443b Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9abb331 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor 9f8be1a Merge branch 'develop' into feature/visual-editor 221b07e Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager 6fde017 Merge remote-tracking branch 'origin/develop' into feature/account-settings d54772e Upgrade gradle plugin to 2.0.0-beta5 066e9be Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes b7c87e7 Merge remote-tracking branch 'origin/develop' into feature/account-settings 19ea3e0 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 69166a4 Fix media isVideo/isValidImage/... utils method 8ea88b8 Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 62db2a7 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop 1b7d78d Merge remote-tracking branch 'origin/develop' into feature/account-settings 06fb0e9 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 77532e5 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 653aa3c Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 68eef86 update to android gradle plugin beta4 5ac9ad7 Merge remote-tracking branch 'origin/develop' into feature/account-settings 99b9392 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 914189d Reverts a previous unnecessary change that's accidentally committed for StringUtils 5523639 update to android gradle plugin 2.0.0-beta-2 - Instant Run d941ec1 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment 0918ae5 Use lowercase locale array to make sure language is pre-selected 8ef893e Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 0c349cd Merge remote-tracking branch 'origin/develop' into feature/account-settings fd15e5c Download available plans for a site. Refactoring!! 0aa7017 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item fc57d17 Download global plans from wpcom and parse them. Store the response in AppPrefs for now. 6640c35 Primary site added to Account Settings (wip) 8c86c32 Adding SETTINGS log tag and logging unknown language code error 3cb8b41 Merge develop into site-settings-review db57341 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop 135651f Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 74fdb6d Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. a0d2721 kill StringUtils.getHost function fe0e9f8 s/getDomainFromUri/getHost/ dbb7f17 4.9-rc-2 / 228 version bump 2f368f6 fix #3521: use the simplest UnderlineSpan subclass d79015f Merge branch 'develop' into feature/site-settings-review 3b883d3 Allow photon to resize GIFs 07ed5f7 Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop b1e3e12 Merge branch 'develop' into feature/site-settings-review d14e1f4 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib fbbc04b fix #3372:Resource Leak in SqlUtils.java e0b7719 Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop 4d56e0c Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop 4932d4c Moved the check for video to within ImageUtils ff66d05 Merge branch 'develop' into feature/site-settings-review c7e27cf suppress lint on missing permission ab2de89 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 7cc55d6 Add log line that could help us in case of errors in the JSON parsing with queryJSON. 05f21a9 Merge branch 'develop' into feature/site-settings-review 311a009 Better solution: Fix the url within PhotonUtils. Hattip @nbradbury 964a877 Revert "Fixes issue where private blog images wouldn't load." e5a7279 Revert "Killing whitespace." 803bf3a Killing whitespace. 9c93172 Fixes issue where private blog images wouldn't load. 57ee5fa Merge branch 'release/4.7' into feature/site-settings-review 84139a9 Moved permission check and request to PermissionUtils 972344d Checking media permission when attempting to add media to post c367ec6 Merge branch 'release/4.6' into issue/3115-runtime-permissions 0a80b8b first step for runtime location request 15aeb9c Merge branch 'develop' into feature/site-settings-review 82f2229 Merge branch 'release/4.6' into develop 5f1a47c Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release 07511b7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 8f65aa2 test queryJSON calls with null params a9b52ce Check null query string 1735ccb check null source in JSONUtils.queryJSON() 38c680b Merge branch 'develop' into feature/site-settings-review 696c325 update ProfilingUtils usage 83d1764 Merge branch 'develop' into feature/site-settings-review f53bd94 Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 9b31cb9 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. fd8a557 URL Utils test fix 93bef09 Merge branch 'develop' into feature/site-settings-review 0531009 generic approach to add parameters to a URL 167f96d new UrlUtils method: appendPreviewURLParameter 577e025 Updating build tools to 23.0.1 c80f391 Merge branch 'develop' into feature/site-settings-review 67ff0ed set targetSdkVersion to 23 and clean up lib dependencies 11f42bd migrate from mavenCentral to jcenter (which is now the default for Android Studio) e930aaf fix lint errors 345d619 update to gradle plugin 1.3.1 and gradle 2.6 33ee85b upgrade to gradle 2.5 and gradle plugin 1.3.0 cf84479 Merge branch 'develop' into feature/update-to-gradle-2.4 031be0d Merge branch 'develop' into feature/update-to-gradle-2.4 7ab175f Updating ActionBar title. Save button is now Undo. ef87489 Merge branch 'hotfix/4.1.1' into release/4.2 6c9ad36 Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update 067ee28 Updating EditTextUtils.getText method instead of creating new one. 46b092b limit text to 524288 characters which is always < 2Mb with UTF-8 cd371d6 Merge branch 'hotfix/4.1.1' into release/4.2 4f48de6 fix #2855: delete big comments and truncate new inserted comments 753f63d Coding Styles 652e7ac Make sure the context passed to checkConnection is not null 6c6e7ec Updated support library and build tools f0d7560 update to gradle android plugin 1.2.3 ea21634 update support lib to 22 af8d40f update to android-gradle plugin 1.1.3 and build tools 22.0.1 8a2b015 Introduce our version of MarkView 8699590 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 355bc2f Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop e5f3d80 Fixed notifications fragment for self-hosted 57c7130 Merge branch 'release/4.0' into develop 9f204b8 Removing potential race condition with WP image loading threads. 9ceea72 Returning to the post editor won't crash if Activity was destroyed. 706c116 Add more audio formats 5d17c56 Handle audio files in media browser 938b72e Merge branch 'release/4.0' into develop a402676 Merge branch 'hotfix/3.9.1' into release/4.0 a2216e5 Catching other unknown URL exception. 44baece Making sure Cursor is closed if exception gets thrown. 7bfd5cc Catching unknown URL exceptions. bcbcd93 Merge branch 'release/4.0' into develop eff4251 Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 528d090 javadocs c2a0733 If string is empty return empty string instead of null bc02585 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 45d2cff javadocs be31cb0 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 8a06188 If string is empty return empty string instead of null 505f893 Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer 1d64906 1.5.0 version bump 3e8fbe8 Merge branch 'develop' into feature/modularize-editor 4d61abb Added support for `WPWebViewClient` to pass the token for image requests. 1e5ffa6 Merge branch 'hotfix/3.8.1' into release/3.9 a7dd249 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation 6927c94 Merge branch 'develop' into feature/modularize-editor 2143ed3 fix #2328: sort blogs with an empty title by their hostname 6a67bb1 Merge branch '1628-mediapicker' into feature/modularize-editor 2902804 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor 025f85e comment CustomSwipeRefreshLayout.onTouchEvent a2ba9b1 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException 41558d8 Merge branch 'develop' into feature/modularize-editor 819ced5 Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 196a4c8 Merge branch 'develop' into feature/modularize-editor 2df6e21 fix typo in a comment 4815396 delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 3c8e177 styling update b934d26 Merge branch 'release/3.7' into develop 04599e1 Merge branch 'develop' into feature/modularize-editor 7d2abd5 fix #2336: check for null text entry, replace them with a string d5de3a0 split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 374a7c3 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 8dbc12f Merge branch 'develop' into feature/modularize-editor 6491fa8 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview a243a5f All gravatar requests now default to 404. 7bb6cc0 Added DEFAULT_BLAVATAR constant 2c8ff0b WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter 042bdd3 Moved fixAvatar routine to GravatarUtils bf9834a Added DefaultImage enum to GravatarUtils 6214a8c move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 1907c9d Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor 95e0f25 Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds 590b9a7 remove extraneous static field 00c64b5 Merge branch 'develop' into feature/modularize-editor 3c894b2 move WPEditText to WordPressUtils and reorganize WordPressUtils ed26387 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) 5771cb1 Blavatar defaults to 404 9b2dc33 Added blavatars to ManageBlogsActivity 3aee599 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 61f137a Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 7f93953 Merge branch 'release/3.7' into develop de4dac8 comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there 8157cf6 Add strip=all to all Photon requests a5a978b Squashed 'libs/editor/' changes from fc65662..86805a0 0a7fd16 fix #2293: remove leading double slash in URLs returned by wporg servers e822225 Merge branch 'release/3.7' into develop 3125851 fix AppLogViewerActivity when a log is message is null b183edf Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 784eb01 new BlogUtils.getHostNameFromAccountMap function 54e9907 Theme live preview no longer changes the activity title 8fa7a7a Photo viewer now uses low quality for the lo-res image d3af87b Simplified comments 85f7ad4 Switched to quality enum which defaults to medium 67f12de Added default quality param to photon 236c584 html encode log entries in AppLog.toHtml() 907b0c8 fix #103: retain menu drawer scroll position after switching activities 3fb040c Merge branch 'develop' into issue/985-make-sfactory-private f4c700b fix build files for android studio 1.0 1ad0a91 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 29ddf31 update support lib version for travis 2624b92 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 4938e39 Merge branch 'develop' into release/3.4 7384a6d remove unused code (refresh button) fe44802 fix #985: maks sFactory private - force injection in test module 7775c4c Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 2faebf8 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 fedfe7c Removed unsuccessful fix for #1982. ab24be9 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 39b9f14 Merge branch 'develop' into feature/material-appcompat 79574e2 Merge branch 'release/3.4' into develop d914cfa Merge branch 'hotfix/3.3.1' into release/3.4 cecccd7 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 726b20f update subtrees to use build tools 21.1.1 05b8119 rename PullToRefresh to SwipeToRefresh e47800d remove unused viewClass in PTR constructor 1c6ac63 fix circle spinner color style 7967ee3 Return a copy of the JSONObject in getDiffableValue(). 79bcb2d replace Chris Banes' PullToRefresh by the native SwipeToRefresh view c426b17 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting f25c211 Merge branch 'develop' into issue/1958-round-avatars 72e850f Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting f834861 Merge branch 'hotfix/3.3.1' into release/3.4 a3b5efa upgrade to android-gradle 0.14.0 bb00f79 Rounds all WPNetworkImageViews with `AVATAR` type. 7d20666 Initial commit adding mentions to notification comments ea79cfe Added image spans directly instead of using Html.fromHtml(). c269171 Merge branch 'release/3.2' into develop 0901c11 fix debug/release build propagation to sub projects 72894a7 Merge branch 'release/3.2' into develop 222bdf2 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign f8b8ca5 Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet f4d6b03 Merge branch 'hotfix/3.1.2' into release/3.2 b8616e9 fix #1821: remove DisplayUtis.isTablet() method df8ce2e Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null 708d85e Merge branch 'release/3.2' into feature/notifications-redesign d4c210d Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 0960d4d Merge branch 'release/3.2' into develop 00855de Merge branch 'hotfix/3.1.1' into release/3.2 c2f5ca7 Merge branch 'hotfix/3.1.1' into develop c7db4da remove isTablet() check 64a087a Merge branch 'release/3.2' into feature/notifications-redesign 75978d4 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" 1fb5196 Merge branch 'develop' into feature/notifications-redesign f475df1 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance fef4219 fix lint error in utils 86c16bc Merge branch 'develop' into feature/notifications-redesign fa9e2ac Removed aggressive `JSONUtil` logging 2807d59 update support-v13 library to version 19.1.0 c6667a4 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images ebdfcdc disable refresh on the attacher 899ec31 use the PTR library version 0.9.7 011b64f set network refresh mode as default b349295 remove unused code cce1b59 add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled 4f788e7 move NetworkUtils to WPUtils subtree dbaf452 Updated comment e38d62a TextView content is reset to itself to force it to correctly resize using cached image 9da1cdc More cleanup a3efebd Cleanup WPImageGetter based on code analysis 29d8ef6 Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel f5b74aa Merge branch 'release/3.1' into develop 121f95d Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 ddc94da fix #1762: show blog url in the share blog spinner if the blog title is an empty string 68b1735 remove ProfilingUtils.getVersionName calls 92656a0 remove unused method from ProfilingUtils b9ad8f8 move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods ef7d002 Merge branch 'develop' into feature/notifications-redesign b28a856 Rewrote the AppLog viewer to use a ListView+adapter 6ae62a6 Merge branch 'develop' into issue/1690-track-last-seen-screen 7b7f0d2 remove unused util file ActivityUtils d1b9bef Merge branch 'develop' into issue/1684-stuck-notifications 3e3d431 Bump libs/utils version number. fafc0c0 Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size 9dcd95a generic way to track last seen activity - requires GET_TASKS permission 914a978 Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. 19d4c24 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. 4c94d23 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update e12ff64 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. d74bc38 Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 35732c4 init utils readme d63c188 import libs/utis 6dcf01d fix #1681: null check 6c2a946 Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column 063b50c Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: e2fca68

@maxme

5503849 Merge pull request #4627 from andrew659/develop 6fcfadb use SqlUtils.closeCursor() to close db cursors f3200df Move common code into methods. da0bda0 Remove extra whitespace. 4391682 Print additional info in the log stream when `android_models.properties` is missing or in the wrong form. Also added a reference to the current version used in wp-android. 023ee88 Do not hardcode "WordPress Android" in the header of the log. 8c0fe91 Merge pull request #4678 from wordpress-mobile/issue/update-gradle-2.2.2 18bb900 Merge pull request #4672 from wordpress-mobile/feature/reader-full-post-refresh-master afe1389 Updated to gradle v2.2.2 b105bf5 Add a few safety checks to prevent NRE + refactoring c8d6850 Replace Vectors with ArrayLists 4419c47 Add "ago" to timespan 3f16cda Update to Android Gradle Plugin 2.2.1 a528b64 Close the database cursor in MediaUtils 8e436bd Updating support library to 24.2.1 2340438 Updating gradle version to 2.2 for Android Studio 2.2 1cdfc80 Merge branch 'release/5.8' into release/5.9 85b4304 Merge commit '63de2e5270d210cbb5c24d02f4727302c806b20c' into issue/update-to-wputils-1.14 cf6f240 Merge commit 'a2e3dcec42f1bfa020de253008d3a13966437742' into develop 5030939 Merge commit '220cac4d1bc9ce6397d7d68f6d493bd307622cac' into issue/fix-imagesettings-alignment-issue 220cac4 Squashed 'libs/editor/' changes from 7932116..087a5b2 83de3e8 update travis config and bump build tools to 24.0.2 97f8f70 Merge commit '8730fb59ec9d075e9d009c56d0c7465a96daaf33' into release/5.8 8730fb5 Squashed 'libs/editor/' changes from eb069ba..7932116 f9b60fb Update com.android.tools.build:gradle to 2.1.3 90b8345 Updating the support library for all projects 2e0cb0d Targetting version 24 5f3e079 Updating to build tools 24.0.1 b760474 Modified `getRoundedEdgeBitmap()` to allow for no border a6eb47a Merge branch 'release/5.6' into develop 8c64473 Squashed 'libs/editor/' changes from 7dcc1a9..eb069ba 78d2840 Merge commit '8c64473541f2199f74480f309d2821c8018c79a1' into sync-editor-1.3 9712927 Merge branch 'release/5.6' into develop 247e944 Merge branch 'hotfix/5.5.1' into release/5.6 e9d10d4 Updated legacy editor to place captions the same way as the web editor and visual editor (before the [/caption] closing tag) afb0de7 Squashed 'libs/editor/' changes from 260a0d5..7dcc1a9 5d688bd Merge commit 'afb0de7a32b95bd121066088dc795f8a6e98909c' into hotfix/5.5.1 3278019 Remove URL fragment when photon-izing an image URL ced2637 Squashed 'libs/editor/' changes from a92ad9d..260a0d5 76db6ed Merge commit 'ced263752a32fb381556cee59b6a2031f5b4f380' into hotfix/5.5.1 71bd8cf Merge branch 'release/5.5' into develop d0d8dd4 Squashed 'libs/editor/' changes from a2a6a7c..a92ad9d d9bd889 Merge commit 'd0d8dd46c2b8223d66ec3e80578788d1b6cd8b85' into release/5.5 38a413e Merge pull request #4239 from wordpress-mobile/issue/3924-method-count 5d5881f Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage b0fc653 changed Locale.getDefault() occurrences for the slightly enhanced LanguageUtils.getCurrentDeviceLanguage() 3aa9746 moved LanguageUtils to Utils. + split getDeviceLanguage into Code (for string) and Locale for reuse as suggested in code review by @maxme e8bc7cb Merge branch 'develop' into issue/3924-method-count 405772b Merge branch 'release/5.5' into develop 771c065 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5 87ade41 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5 73cdb59 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5 9db27cb Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5 79a0669 update compileSdkVersion and buildToolsVersion in every subtrees c549691 update gradle wrapper to 2.14 5f8b37b Merge branch 'release/5.5' into develop e0ffd09 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5 3086a32 Updating gradle plugin to 2.1.2 f7cda1e Merge branch 'hotfix/5.4.1' into release/5.5 9b3840f Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1 704f8db Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size 0a145fb Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1 2dbc2de new MediaUtils function: getImageWidthSettingFromString 380157e Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1 8da6671 Merge branch 'release/5.4' into develop 457afa7 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4 081a336 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync 6cf2b92 Merge branch 'release/5.4' into develop 196d4db Merge remote-tracking branch 'origin/develop' into feature/people-management-sync bbc3cdb Clarify comments and parameter names 750ef77 fix #4114: remove the URL scheme if it's not http or https during URL sanitization d1cbe1f Updating to support library 23.4.0 30c98a2 Merge branch 'develop' into issue/3791-support-library-23.2 4fad089 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 81c3fe1 Merge branch 'develop' into feature/gravatar-upload-okhttp cfb9b6e Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 0c22fb1 Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop 1074c65 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 c0cfd6e Adds permission utils for calling via fragments c0459ed Merge remote-tracking branch 'origin/develop' into feature/people-management-sync 54bafee Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop 140b53d Merge branch 'develop' into issue/3791-support-library-23.2 9a92f90 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync af9844c Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update 084c5aa Updating to gradle 2.0 2e62958 Updating support library to 23.3.0 a75ef12 Updating to gradle 2.0 34efe57 Merge branch 'develop' into issue/3791-support-library-23.2 003b573 Updating to rc3 8b8e2a3 Updating build.gradle to latest rc3 cfe3161 Merge branch 'develop' into issue/3791-support-library-23.2 4260b4c Merge pull request #3919 from wordpress-mobile/issue/update-build-tools 31aac03 Merge branch 'feature/people-management-sync' into feature/people-management-network-and-data-layer 231a3d3 Merge branch 'release/5.2' into release/5.3 ee13047 Updating the rest of the modules to buildToolsVersion 23.0.3 1e5c5b4 Updating the rest of the modules to buildToolsVersion 23.0.3 c674a05 Merge branch 'develop' into issue/3791-support-library-23.2 5fdae18 Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop 806da2e Added People to AppLog f1fb2d3 update to android-gradle-2.0.0-rc1 5cc12c5 upgrade to gradle plugin 2.0.0-beta7 3a24940 Merge branch 'develop' into issue/3791-support-library-23.2 0a90538 update to com.android.tools.build:gradle:2.0.0-beta7 0acc238 Updating support library to 23.2.1 39c5bab Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 2384a34 Comment getQuantityString() a11f2f1 use String.format(getString(format), ...) instead of buggy getString(format, ...) 86e6f3d replace plurals with a utility method 17cd3f6 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master e191d70 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 6abfe1f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 5bcdcc7 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 1851efb Mark the util WPEditText as deprecated 4871c5f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 4fc64d3 Updated gradle to 2.0.0-beta6 aa8cdac Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 9cc32d5 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor e072fc5 Merge branch 'develop' into feature/visual-editor b39105c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master 87d1cd7 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor e70aee7 Merge branch 'develop' into feature/visual-editor e67e887 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager f925e0d Merge remote-tracking branch 'origin/develop' into feature/account-settings 493a28a Upgrade gradle plugin to 2.0.0-beta5 96cb4ab Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes e0191f1 Merge remote-tracking branch 'origin/develop' into feature/account-settings 3441e62 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 73e3d28 Fix media isVideo/isValidImage/... utils method 3ed94cf Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 856eb76 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop 24008e3 Merge remote-tracking branch 'origin/develop' into feature/account-settings edcbd68 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans f5b119a Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List 8d98820 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 3b9f0ff update to android gradle plugin beta4 ab9dae2 Merge remote-tracking branch 'origin/develop' into feature/account-settings a4144bb Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans 141c92d Reverts a previous unnecessary change that's accidentally committed for StringUtils 68a7d4c update to android gradle plugin 2.0.0-beta-2 - Instant Run a5357b9 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment c8adccf Use lowercase locale array to make sure language is pre-selected 82a2168 Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it. 64985ea Merge remote-tracking branch 'origin/develop' into feature/account-settings c18d478 Download available plans for a site. Refactoring!! c3a1854 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item 34ddb82 Download global plans from wpcom and parse them. Store the response in AppPrefs for now. d08bbe8 Primary site added to Account Settings (wip) 2ee06c3 Adding SETTINGS log tag and logging unknown language code error 9729cfb Merge develop into site-settings-review 4139806 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop 44d2e6f Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop 0cdc639 Add utility methods to check if a URL is wpcom. Add utility methods that check if it's safe to add the Authentication token to the request. 5055b8a kill StringUtils.getHost function a5efa15 s/getDomainFromUri/getHost/ e395732 4.9-rc-2 / 228 version bump 283f344 fix #3521: use the simplest UnderlineSpan subclass dd8da34 Merge branch 'develop' into feature/site-settings-review e9c777b Allow photon to resize GIFs 2fa7d20 Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop 650e224 Merge branch 'develop' into feature/site-settings-review 0504208 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 48a2e5a fix #3372:Resource Leak in SqlUtils.java e61338d Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop 23824e3 Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop 7d33be7 Moved the check for video to within ImageUtils ad9ee4e Merge branch 'develop' into feature/site-settings-review 880519d suppress lint on missing permission 6726085 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects a5b2379 Add log line that could help us in case of errors in the JSON parsing with queryJSON. 1b1e118 Merge branch 'develop' into feature/site-settings-review 20a169b Better solution: Fix the url within PhotonUtils. Hattip @nbradbury c8fbb97 Revert "Fixes issue where private blog images wouldn't load." d2c5a3f Revert "Killing whitespace." 5d93dc9 Killing whitespace. 269ecdf Fixes issue where private blog images wouldn't load. def84af Merge branch 'release/4.7' into feature/site-settings-review 0939a67 Moved permission check and request to PermissionUtils 6f9c027 Checking media permission when attempting to add media to post 5f585df Merge branch 'release/4.6' into issue/3115-runtime-permissions b68bfa2 first step for runtime location request be9d2c6 Merge branch 'develop' into feature/site-settings-review a760b91 Merge branch 'release/4.6' into develop fecab61 Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release 270aae7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 15d4aa8 test queryJSON calls with null params 7ddc84c Check null query string 5f84fbe check null source in JSONUtils.queryJSON() fe4b7a6 Merge branch 'develop' into feature/site-settings-review e3636ab update ProfilingUtils usage 0d87149 Merge branch 'develop' into feature/site-settings-review 10c93c3 Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string. 6094d83 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host. 2417bae URL Utils test fix 8d781ba Merge branch 'develop' into feature/site-settings-review 62ce487 generic approach to add parameters to a URL e43fde4 new UrlUtils method: appendPreviewURLParameter 4584693 Updating build tools to 23.0.1 c4e8007 Merge branch 'develop' into feature/site-settings-review 6e4d198 set targetSdkVersion to 23 and clean up lib dependencies 2b95b43 migrate from mavenCentral to jcenter (which is now the default for Android Studio) f185b2e fix lint errors 77a2df2 update to gradle plugin 1.3.1 and gradle 2.6 815a510 upgrade to gradle 2.5 and gradle plugin 1.3.0 b45bc52 Merge branch 'develop' into feature/update-to-gradle-2.4 1aac66a Merge branch 'develop' into feature/update-to-gradle-2.4 7b427ef Updating ActionBar title. Save button is now Undo. 889623c Merge branch 'hotfix/4.1.1' into release/4.2 3930cca Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update ae06412 Updating EditTextUtils.getText method instead of creating new one. b4e09e5 limit text to 524288 characters which is always < 2Mb with UTF-8 adb6d46 Merge branch 'hotfix/4.1.1' into release/4.2 7e034f1 fix #2855: delete big comments and truncate new inserted comments da7a178 Coding Styles 291d107 Make sure the context passed to checkConnection is not null 9431ed1 Updated support library and build tools 3a23b4a update to gradle android plugin 1.2.3 28f0863 update support lib to 22 58c0fff update to android-gradle plugin 1.1.3 and build tools 22.0.1 ab1f64f Introduce our version of MarkView 8a01665 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted 519dbb6 Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop c83436d Fixed notifications fragment for self-hosted a30fad3 Merge branch 'release/4.0' into develop 926195e Removing potential race condition with WP image loading threads. 3617ff0 Returning to the post editor won't crash if Activity was destroyed. e5eb8c7 Add more audio formats a70f524 Handle audio files in media browser 260faf4 Merge branch 'release/4.0' into develop a91cbd6 Merge branch 'hotfix/3.9.1' into release/4.0 16e01b6 Catching other unknown URL exception. d70578c Making sure Cursor is closed if exception gets thrown. 21508f3 Catching unknown URL exceptions. 41e732c Merge branch 'release/4.0' into develop 9915efb Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0 8821cb2 javadocs 1254283 If string is empty return empty string instead of null a8081b7 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 04a450e javadocs 17cda45 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity 0d83504 If string is empty return empty string instead of null fa1c9ce Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer 896b7bd 1.5.0 version bump 565f756 Merge branch 'develop' into feature/modularize-editor 7c7a06f Added support for `WPWebViewClient` to pass the token for image requests. 7a76fe8 Merge branch 'hotfix/3.8.1' into release/3.9 35393b3 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation 1837271 Merge branch 'develop' into feature/modularize-editor 112282c fix #2328: sort blogs with an empty title by their hostname 349e94c Merge branch '1628-mediapicker' into feature/modularize-editor 531b986 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor ee83fe3 comment CustomSwipeRefreshLayout.onTouchEvent 3d69956 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException 2b40042 Merge branch 'develop' into feature/modularize-editor d370d2b Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state 80d824c Merge branch 'develop' into feature/modularize-editor f0c78fd fix typo in a comment 8fcc28f delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712 dca8e8b styling update b4f9350 Merge branch 'release/3.7' into develop e43ec21 Merge branch 'develop' into feature/modularize-editor 09ce398 fix #2336: check for null text entry, replace them with a string 0a59ffd split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils cb0468a move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils d9c1111 Merge branch 'develop' into feature/modularize-editor 2b07717 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview d7f6b10 All gravatar requests now default to 404. fa54198 Added DEFAULT_BLAVATAR constant b67cc7b WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter f6876ae Moved fixAvatar routine to GravatarUtils d7ae1ab Added DefaultImage enum to GravatarUtils 55a65b2 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 0a14aa6 Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor 02381ef Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds dea1fbf remove extraneous static field 73dbd93 Merge branch 'develop' into feature/modularize-editor 416c772 move WPEditText to WordPressUtils and reorganize WordPressUtils 559f9b2 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib) dbd179a Blavatar defaults to 404 ec89c80 Added blavatars to ManageBlogsActivity f017173 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor 75d5f26 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop 38c7a76 Merge branch 'release/3.7' into develop d61a71f comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there 52e54c8 Add strip=all to all Photon requests 5416f97 Squashed 'libs/editor/' changes from fc65662..86805a0 29beaed fix #2293: remove leading double slash in URLs returned by wporg servers 27a8d78 Merge branch 'release/3.7' into develop 7c3ec06 fix AppLogViewerActivity when a log is message is null 4c02650 Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 706a65f new BlogUtils.getHostNameFromAccountMap function e873ea3 Theme live preview no longer changes the activity title 185582c Photo viewer now uses low quality for the lo-res image 6023822 Simplified comments 0a19498 Switched to quality enum which defaults to medium 5ae1b87 Added default quality param to photon 728a121 html encode log entries in AppLog.toHtml() cb9fefb fix #103: retain menu drawer scroll position after switching activities 502a9e4 Merge branch 'develop' into issue/985-make-sfactory-private 2818082 fix build files for android studio 1.0 96f3962 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private f916a34 update support lib version for travis 195bd96 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat b28e296 Merge branch 'develop' into release/3.4 743ce48 remove unused code (refresh button) a9e4c30 fix #985: maks sFactory private - force injection in test module 906b3e8 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java 4ceb0c3 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 a9a490b Removed unsuccessful fix for #1982. 957c1b2 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 93a23da Merge branch 'develop' into feature/material-appcompat 3f731d6 Merge branch 'release/3.4' into develop aaccb70 Merge branch 'hotfix/3.3.1' into release/3.4 6a22580 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat e470cfb update subtrees to use build tools 21.1.1 dfd77e4 rename PullToRefresh to SwipeToRefresh dffe39a remove unused viewClass in PTR constructor 0bb12ed fix circle spinner color style 13e613e Return a copy of the JSONObject in getDiffableValue(). 52d5ec2 replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 3d9cb0f Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 9d2d48b Merge branch 'develop' into issue/1958-round-avatars bd0a083 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 077c819 Merge branch 'hotfix/3.3.1' into release/3.4 ded9e7c upgrade to android-gradle 0.14.0 fa47b61 Rounds all WPNetworkImageViews with `AVATAR` type. 89d31b5 Initial commit adding mentions to notification comments f2ed1d3 Added image spans directly instead of using Html.fromHtml(). e154814 Merge branch 'release/3.2' into develop aeabeae fix debug/release build propagation to sub projects 93935be Merge branch 'release/3.2' into develop b3f359a Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign 24208fa Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet c7476fc Merge branch 'hotfix/3.1.2' into release/3.2 07bf633 fix #1821: remove DisplayUtis.isTablet() method 0ebd130 Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null fdf89f9 Merge branch 'release/3.2' into feature/notifications-redesign 5fca796 Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 470f5c8 Merge branch 'release/3.2' into develop e3795fe Merge branch 'hotfix/3.1.1' into release/3.2 e514f75 Merge branch 'hotfix/3.1.1' into develop 35a51e3 remove isTablet() check fd177a4 Merge branch 'release/3.2' into feature/notifications-redesign cb63da7 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" ac65c2f Merge branch 'develop' into feature/notifications-redesign c9232b1 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 485abe4 fix lint error in utils 5026c92 Merge branch 'develop' into feature/notifications-redesign eff81c0 Removed aggressive `JSONUtil` logging 0868a89 update support-v13 library to version 19.1.0 5a1e321 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 91cd079 disable refresh on the attacher ad64df3 use the PTR library version 0.9.7 7266712 set network refresh mode as default ac4915a remove unused code 893ec6f add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled f45e000 move NetworkUtils to WPUtils subtree c050f8e Updated comment 9b96cd2 TextView content is reset to itself to force it to correctly resize using cached image b1ceab2 More cleanup 9a34a96 Cleanup WPImageGetter based on code analysis bba036d Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel efd0501 Merge branch 'release/3.1' into develop 4982d56 Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1 688fb0c fix #1762: show blog url in the share blog spinner if the blog title is an empty string cdbab65 remove ProfilingUtils.getVersionName calls e831bcc remove unused method from ProfilingUtils b5ffc30 move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 9f6d5ce Merge branch 'develop' into feature/notifications-redesign af63e40 Rewrote the AppLog viewer to use a ListView+adapter a2f1d4a Merge branch 'develop' into issue/1690-track-last-seen-screen 94f7111 remove unused util file ActivityUtils ebde141 Merge branch 'develop' into issue/1684-stuck-notifications 2969fde Bump libs/utils version number. 366cf9a Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size d07c557 generic way to track last seen activity - requires GET_TASKS permission 0c31abc Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. 5db4a73 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. f45eed5 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update c3f80f3 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user. 588649b Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash 259a603 fix #1681: null check 78b8325 Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column b18f6ce Merge branch 'Develop' into 'notifications-redesign' git-subtree-dir: libs/utils git-subtree-split: 5503849

86805a0 Add 'libs/utils/' from commit '94d1dbb0f5220525759de83c60cba3e95ce95eff' cfc3ff0 use title/content params in the editor 9f26eb3 remove useless test in example 83ff559 fix appcompat and support-v4 dependencies 714eeb1 move new editor logic to a fragment 4a2f1ba back to 21.1.1 tools 279f2ee fix appcompat dependency d3985f0 new travis config ee42dda fix build for example project 66fb19b rename package name to org.wordpress.android b61040c rename package name to org.wordpress.android 4edc93f add signing to publish artifact 94d1dbb Merge branch 'release/3.7' into develop 8ff9413 fix AppLogViewerActivity when a log is message is null 7c208db Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title 9eb7273 new BlogUtils.getHostNameFromAccountMap function a80859d Theme live preview no longer changes the activity title 6186933 Photo viewer now uses low quality for the lo-res image 2eb9839 Simplified comments bfa7ecb Switched to quality enum which defaults to medium a2ce056 Added default quality param to photon 5a48a06 html encode log entries in AppLog.toHtml() c8a4d89 fix #103: retain menu drawer scroll position after switching activities c1e0778 Merge branch 'develop' into issue/985-make-sfactory-private fe1d125 fix build files for android studio 1.0 f7a2d48 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private 72fe2b7 update support lib version for travis 0b03b71 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 0f5751d Merge branch 'develop' into release/3.4 b68f755 remove unused code (refresh button) cb8321b fix #985: maks sFactory private - force injection in test module faae1d3 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: WordPress/src/main/java/org/wordpress/android/models/Note.java a0982d1 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2 3a0c45e Removed unsuccessful fix for #1982. b967d59 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity 92d4e15 Merge branch 'develop' into feature/material-appcompat 7c8d5ab Merge branch 'release/3.4' into develop 1e499a6 Merge branch 'hotfix/3.3.1' into release/3.4 7a4a364 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat 5451df7 update subtrees to use build tools 21.1.1 4024637 rename PullToRefresh to SwipeToRefresh 0d8d414 remove unused viewClass in PTR constructor 2424201 fix circle spinner color style d392885 Return a copy of the JSONObject in getDiffableValue(). 106affa replace Chris Banes' PullToRefresh by the native SwipeToRefresh view 3108a36 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting db25827 Merge branch 'develop' into issue/1958-round-avatars 2801610 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting 6ac0248 Merge branch 'hotfix/3.3.1' into release/3.4 eb70e6f upgrade to android-gradle 0.14.0 9bc4ba6 Rounds all WPNetworkImageViews with `AVATAR` type. c2fd6c7 Initial commit adding mentions to notification comments 0a3da42 Added image spans directly instead of using Html.fromHtml(). 5b22440 Merge branch 'release/3.2' into develop 1a2a73f fix debug/release build propagation to sub projects d9eac2e Merge branch 'release/3.2' into develop 380ece6 Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign c38f131 Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet 4e92eaa Merge branch 'hotfix/3.1.2' into release/3.2 cbc7b24 fix #1821: remove DisplayUtis.isTablet() method 343771a Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null c44a87a Merge branch 'release/3.2' into feature/notifications-redesign 97c557c Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"" 1cacaf2 Merge branch 'hotfix/3.1.1' into release/3.2 568782f Merge branch 'hotfix/3.1.1' into develop 96fd180 remove isTablet() check 870944d Merge branch 'release/3.2' into feature/notifications-redesign 3390393 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments" 03bbac0 Merge branch 'develop' into feature/notifications-redesign 8ec2915 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance 1623d65 fix lint error in utils e273dd3 Merge branch 'develop' into feature/notifications-redesign 4bfc641 Removed aggressive `JSONUtil` logging f7f4556 update support-v13 library to version 19.1.0 fafcf67 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images 1868cc5 disable refresh on the attacher 082c13f use the PTR library version 0.9.7 f21f5d3 set network refresh mode as default d262f8d remove unused code 9e592fd add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled f85a003 move NetworkUtils to WPUtils subtree d19c080 Updated comment cabb8a7 TextView content is reset to itself to force it to correctly resize using cached image 48e4ed2 More cleanup 2426243 Cleanup WPImageGetter based on code analysis c955d26 Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel 3bc1080 Merge branch 'release/3.1' into develop f75a9e7 increment version number caa9db0 fix #1762: show blog url in the share blog spinner if the blog title is an empty string e1eecbf remove ProfilingUtils.getVersionName calls 075b989 remove unused method from ProfilingUtils b48cbda move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods 44bb61e Rewrote the AppLog viewer to use a ListView+adapter 59f0bfa Merge branch 'develop' into issue/1690-track-last-seen-screen 9300d28 remove unused util file ActivityUtils b15cf64 Bump libs/utils version number. 0d89a80 generic way to track last seen activity - requires GET_TASKS permission 391276c Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private. c8dc1e8 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis. aa5b665 init utils readme 76df52f import libs/utis 449639d set defaultPublishConfig to debug - in case we had source dependencies to this module 5b1f8f1 remove gradle wrapper cd72102 Bump version number 90f9f22 Merge pull request #1 from wordpress-mobile/issue/move-ptr-to-utils c6b0ff9 showToast methods now return a Toast object 3e93210 Move pull to refresh to Utils b302b44 Move ToastUtils to Utils a0e973c document getPrimaryEmail method d68fb87 add getCircularBitmap and getRoundedEdgeBitmap from the main project merge in 80014b7 d2a76e2 avoid build failure when gradle.properties file is missing 5d683f6 use maven plugin to deploy maven artifact 70a91cb bump version number to 1.0.1 575579d gitignore tools/deploy-mvn-artifact.conf 50f2c80 maven deploying script cf85e19 ignore .idea and local.properties 7c6d4f4 add WPImageGetter and fix HtmlUtils b4baff8 remove crashlytics reference from Utils 32e98a9 merge from WordPress-Android@1a74364d0 79b7014 gitignore all build/ directories c9e6b52 Restores query separator period in `JSONUtils`. fddb5a0 Ignoring iml files 4263343 Initial commit of utils classes. 0228ac4 Fix package id name 826c265 Move java source to correct directory a528b8e Initial Project Structure git-subtree-dir: libs/editor git-subtree-split: 86805a0

maxme added the enhancement label Feb 26, 2014

maxme mentioned this issue Feb 26, 2014

Unit & Functional Testing #777

Merged

maxme added the core label Jun 17, 2014

maxme added a commit that referenced this issue Nov 20, 2014

fix #985: maks sFactory private - force injection in test module

c01f6d6

maxme mentioned this issue Nov 20, 2014

fix #985 make sFactory private in factories #2006

Merged

maxme self-assigned this Nov 20, 2014

maxme modified the milestones: 3.5, 3.6 Nov 20, 2014

nbradbury closed this as completed in #2006 Dec 16, 2014

nbradbury added a commit that referenced this issue Dec 16, 2014

Merge pull request #2006 from wordpress-mobile/issue/985-make-sfactor…

9abb0ad

…y-private fix #985 make sFactory private in factories

maxme added a commit that referenced this issue May 1, 2015

fix #985: maks sFactory private - force injection in test module

cb8321b

oguzkocer pushed a commit that referenced this issue May 23, 2017

fix #985: maks sFactory private - force injection in test module

47b079d

oguzkocer pushed a commit that referenced this issue May 23, 2017

fix #985: maks sFactory private - force injection in test module

fe44802

oguzkocer pushed a commit that referenced this issue May 23, 2017

fix #985: maks sFactory private - force injection in test module

a9e4c30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make sFactory members private and prevent call to the setter in non test mode #985

Make sFactory members private and prevent call to the setter in non test mode #985

maxme commented Feb 26, 2014