diff --git a/.gitignore b/.gitignore index 520a863..887b698 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Manually added +*DS_STORE +._* + # Built application files *.apk *.ap_ diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin index ae9d1b7..661ecf2 100644 Binary files a/.gradle/4.4/fileHashes/fileHashes.bin and b/.gradle/4.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock index 376705b..a9b08f9 100644 Binary files a/.gradle/4.4/fileHashes/fileHashes.lock and b/.gradle/4.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin index 37b549e..70d5957 100644 Binary files a/.gradle/4.4/taskHistory/taskHistory.bin and b/.gradle/4.4/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock index e107bba..df812b9 100644 Binary files a/.gradle/4.4/taskHistory/taskHistory.lock and b/.gradle/4.4/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 8e37c8a..90e63ba 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index eedbd29..1afaa91 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 387762b..aaa1dc8 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml deleted file mode 100644 index 9869803..0000000 --- a/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml deleted file mode 100644 index 0493e09..0000000 --- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml deleted file mode 100644 index 29c0049..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml deleted file mode 100644 index 03535e2..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml deleted file mode 100644 index d878341..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml deleted file mode 100644 index 588ef51..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml index b37944a..d69e6ac 100644 --- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml index 1e91b96..5a22914 100644 --- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml deleted file mode 100644 index 11c4107..0000000 --- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0_jar.xml deleted file mode 100644 index 3297c5b..0000000 --- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml index 2517fca..576da83 100644 --- a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml index 1be4cee..3d1b6f8 100644 --- a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml index 6eae18f..32c9358 100644 --- a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml index 7c11e15..fff2885 100644 --- a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml index 9440107..356a447 100644 --- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml index a3979a6..833e129 100644 --- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml index c595f11..1743215 100644 --- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml index 0136f58..84fb5c2 100644 --- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml +++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml index dcda7b7..e50fa44 100644 --- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml +++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4a7d8c0..ff9dfba 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,14 +5,12 @@ + + - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -55,27 +151,9 @@ - allowedAgeOfDate.unit - -1 - GetDataRequirements - getCachedData - getObservableState - lasttime - key - getDataRequirements.tag - putLong - fetchFreshData - open - errorCausedDoneFetching - fetchFreshData\( - DATA_T - GET_DATA_REQUIREMENTS - driver - first - loadDataRequirements.tag - sharedPreferences - lastTimeFetchedFreshData - updateLastTimeFreshDataFetched + Done fetch + try { + fetchfreshData( @@ -84,7 +162,7 @@ +