summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Test Cases for static icons uplaodsbugfix/issue_1284Julian Kast2020-02-261-4/+72
* Added logic to properly handle static icons for uploading list of filesJulian Kast2020-02-261-7/+15
* Merge pull request #1281 from smartdevicelink/bugfix/issue_1279Julian Kast2020-02-251-3/+5
|\
| * Fix #1279bugfix/issue_1279Joey Grover2020-02-201-3/+5
* | Merge pull request #1271 from smartdevicelink/bugfix/notification_removal_delayBilal Alsharifi2020-02-242-3/+26
|\ \
| * | Increment router service versionbugfix/notification_removal_delayJoey Grover2020-02-112-2/+2
| * | Only add timer if notificaiton should be displayedJoey Grover2020-02-111-1/+2
| * | Delete notification channel when possibleJoey Grover2020-02-111-0/+22
| |/
* | Merge pull request #1277 from smartdevicelink/feature/issue_1275Bilal Alsharifi2020-02-212-17/+159
|\ \
| * | Simplify ternary condition in SCMfeature/issue_1275Bilal Alsharifi2020-02-211-3/+4
| * | Update base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.javaBilal Alsharifi2020-02-211-1/+1
| * | Update android/sdl_android/src/androidTest/java/com/smartdevicelink/test/prox...Bilal Alsharifi2020-02-211-1/+1
| * | Update comments in SystemCapabilityManagerTestsBilal Alsharifi2020-02-201-1/+1
| * | Add more unit tests for DISPLAYS capabilityBilal Alsharifi2020-02-201-0/+35
| * | Prevent sending GetSystemCapability for DISPLAYSBilal Alsharifi2020-02-201-2/+3
| * | Update comments in SCMBilal Alsharifi2020-02-201-0/+1
| * | Update comments in SystemCapabilityManagerTestsBilal Alsharifi2020-02-191-1/+1
| * | Update comments in retrieveCapability()Bilal Alsharifi2020-02-191-1/+7
| * | Update formatting in SCMBilal Alsharifi2020-02-191-2/+2
| * | Reformat code in setCapability() methodBilal Alsharifi2020-02-171-3/+3
| * | Fix an issue in SCM unit testsBilal Alsharifi2020-02-171-1/+1
| * | Add more SCM unit testsBilal Alsharifi2020-02-171-0/+88
| * | Notify listeners when fresh copy of capability is receivedBilal Alsharifi2020-02-171-12/+22
| |/
* | Merge pull request #1270 from smartdevicelink/iOS_Alignment/RetryFailedUploadsBilal Alsharifi2020-02-207-88/+573
|\ \ | |/ |/|
| * Removed unused importiOS_Alignment/RetryFailedUploadsJulian Kast2020-02-201-1/+0
| * Simplified logic in onFinishedJulian Kast2020-02-181-13/+7
| * Minor change to logic of onError to be more efficientJulian Kast2020-02-181-6/+7
| * Due to a change in logic that if statement was not necessaryJulian Kast2020-02-181-5/+1
| * Add param errors to JavaDocs for method sendMultipleFileOperationsJulian Kast2020-02-181-0/+1
| * FormattingJulian Kast2020-02-181-1/+1
| * Fixed Name of method and potential NPEJulian Kast2020-02-181-8/+9
| * Fixed spacing for errors HashMap In baseFIleManager : deleteRemoteFilesWithNamesJulian Kast2020-02-181-1/+1
| * Changed failedFileUploadsIndex to a HashMapJulian Kast2020-02-181-2/+2
| * Fixed FIleManager Javadocs for android and JavaSEJulian Kast2020-02-182-5/+5
| * Modified broken test for file upload success.Julian Kast2020-02-141-36/+43
| * Added unit test for deleting files, added comments/fixed formattingJulian Kast2020-02-141-20/+148
| * Fixed ClassCast Exception for deleteFilesJulian Kast2020-02-141-8/+15
| * removed spaceJulian Kast2020-02-131-1/+0
| * Add javadocs and remove extra spaceJulian Kast2020-02-132-2/+5
| * Added javaDocs to FileManagerConfigJulian Kast2020-02-131-1/+33
| * Modified UploadFiles and sendMultipleFileOperations to use new method shouldR...Julian Kast2020-02-131-109/+71
| * Formatting and moving location of declaring FileManagerConfigJulian Kast2020-02-132-5/+11
| * Formatting FileManager in android and JavaSEJulian Kast2020-02-132-3/+13
| * Deleting FileMangerConfig form JavaSEJulian Kast2020-02-131-19/+0
| * Changed Location of FileManagerConfigJulian Kast2020-02-132-19/+28
| * Added FileManagerConfig to Java SEJulian Kast2020-02-103-1/+40
| * Added unit testJulian Kast2020-02-101-3/+168
| * Added retry logic for single filesJulian Kast2020-02-101-2/+29
| * Add Retry logic for list of filesJulian Kast2020-02-101-10/+73
| * Added FileManagerConfigJulian Kast2020-02-104-2/+57
|/