[4.11.3] Update build.gradle, signing and changelog.

* [API/Librus] Remove LibrusApiTeacherFreeDayTypes

* [API/Librus] Fix LibrusApiTeacherFreeDay

* [API/Librus] LibrusApiTeacherFreeDay: Clean up values of unused variables

* [API/Librus] LibrusApiTeacherFreeDay: Remove unnecessary variables

* [API/Librus] LibrusApiTeacherFreeDay: Assign null to 'name' object

.github/workflows/build-nightly-apk.yml

@@ -54,9 +54,8 @@ jobs:
       - name: Setup JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: '11'
-          cache: 'gradle'
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
       - name: Clean build artifacts
@@ -65,7 +64,9 @@ jobs:
           rm -rf app/build/outputs/apk/*
           rm -rf app/build/outputs/bundle/*
       - name: Assemble official release with Gradle
-        run: ./gradlew assembleOfficialRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleOfficialRelease
   sign:
     name: Sign APK
     runs-on: self-hosted

.github/workflows/build-release-aab-play.yml

@@ -46,9 +46,8 @@ jobs:
       - name: Setup JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: '11'
-          cache: 'gradle'
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
       - name: Clean build artifacts
@@ -57,7 +56,9 @@ jobs:
           rm -rf app/build/outputs/apk/*
           rm -rf app/build/outputs/bundle/*
       - name: Bundle play release with Gradle
-        run: ./gradlew bundlePlayRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: bundlePlayRelease
   sign:
     name: Sign App Bundle
     runs-on: self-hosted

.github/workflows/build-release-apk.yml

@@ -46,9 +46,8 @@ jobs:
       - name: Setup JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: '11'
-          cache: 'gradle'
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
       - name: Clean build artifacts
@@ -57,7 +56,9 @@ jobs:
           rm -rf app/build/outputs/apk/*
           rm -rf app/build/outputs/bundle/*
       - name: Assemble official release with Gradle
-        run: ./gradlew assembleOfficialRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleOfficialRelease
   sign:
     name: Sign APK
     runs-on: self-hosted

.idea/codeStyles/Project.xml

@@ -1,6 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/copyright/Antoni.xml

@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright (c) Antoni Czaplicki &amp;#36;{today.year}-&amp;#36;{today.month}-&amp;#36;{today.day}. " />
+    <option name="myName" value="Antoni" />
+  </copyright>
+</component>

app/build.gradle

@@ -31,10 +31,17 @@ android {
                 cppFlags "-std=c++11"
             }
         }
+
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
     }
 
     buildTypes {
         debug {
+            getIsDefault().set(true)
             minifyEnabled = false
             manifestPlaceholders = [
                     buildTimestamp: 0
@@ -49,15 +56,27 @@ android {
     }
     flavorDimensions "platform"
     productFlavors {
-        main {
-            versionName gitInfo.versionHuman
+        unofficial {
+            getIsDefault().set(true)
+            versionName "${release.versionName}-${gitInfo.versionSuffix}"
         }
         official {}
         play {}
     }
     variantFilter { variant ->
         def flavors = variant.flavors*.name
-        setIgnore(variant.buildType.name == "debug" && !flavors.contains("main"))
+        setIgnore(variant.buildType.name == "debug" && !flavors.contains("unofficial") || flavors.contains("main"))
+    }
+    sourceSets {
+        unofficial {
+            java.srcDirs = ["src/main/java", "src/play-not/java"]
+        }
+        official {
+            java.srcDirs = ["src/main/java", "src/play-not/java"]
+        }
+        play {
+            java.srcDirs = ["src/main/java", "src/play/java"]
+        }
     }
 
     defaultConfig {
@@ -126,7 +145,7 @@ dependencies {
     // Android Jetpack
     implementation "androidx.appcompat:appcompat:1.3.1"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.1"
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
@@ -137,12 +156,12 @@ dependencies {
 
     // Google design libs
     implementation "com.google.android.material:material:1.4.0"
-    implementation "com.google.android:flexbox:2.0.1"
+    implementation "com.google.android.flexbox:flexbox:3.0.0"
 
     // Play Services/Firebase
     implementation "com.google.android.gms:play-services-wearable:17.1.0"
-    implementation "com.google.firebase:firebase-core:19.0.1"
-    implementation "com.google.firebase:firebase-crashlytics:18.2.1"
+    implementation "com.google.firebase:firebase-core:19.0.2"
+    implementation "com.google.firebase:firebase-crashlytics:18.2.3"
     implementation("com.google.firebase:firebase-messaging") { version { strictly "20.1.3" } }
 
     // OkHttp, Retrofit, Gson, Jsoup
@@ -150,21 +169,22 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation "org.jsoup:jsoup:1.13.1"
+    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'org.jsoup:jsoup:1.14.3'
     implementation "pl.droidsonroids:jspoon:1.3.2"
     implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
 
     // Szkolny.eu libraries/forks
     implementation "eu.szkolny:android-snowfall:1ca9ea2da3"
-    implementation "eu.szkolny:agendacalendarview:ac0f3dcf42"
+    implementation "eu.szkolny:agendacalendarview:1.0.4"
     implementation "eu.szkolny:cafebar:5bf0c618de"
     implementation "eu.szkolny.fslogin:lib:2.0.0"
     implementation "eu.szkolny:material-about-library:1d5ebaf47c"
     implementation "eu.szkolny:mhttp:af4b62e6e9"
     implementation "eu.szkolny:nachos:0e5dfcaceb"
     implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
-    implementation "eu.szkolny:ssl-provider:1.0.0"
+    officialImplementation "eu.szkolny:ssl-provider:1.0.0"
+    unofficialImplementation "eu.szkolny:ssl-provider:1.0.0"
     implementation "pl.szczodrzynski:navlib:0.8.0"
     implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
     implementation "pl.szczodrzynski:recyclertablayout:700f980584"
@@ -172,33 +192,34 @@ dependencies {
     kapt "eu.szkolny.selective-dao:codegen:27f8f3f194"
 
     // Iconics & related
-    implementation "com.mikepenz:iconics-core:5.3.0-b01"
-    implementation "com.mikepenz:iconics-views:5.3.0-b01"
+    implementation "com.mikepenz:iconics-core:5.3.2"
+    implementation "com.mikepenz:iconics-views:5.3.2"
     implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
-    implementation "eu.szkolny:szkolny-font:1.3"
+    implementation "eu.szkolny:szkolny-font:77e33acc2a"
 
     // Other dependencies
     implementation "cat.ereza:customactivityoncrash:2.3.0"
-    implementation "com.applandeo:material-calendar-view:1.5.0"
+    implementation "com.android.volley:volley:1.2.1"
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
-    implementation "com.github.bassaer:chatmessageview:2.0.1"
-    implementation "com.github.CanHub:Android-Image-Cropper:2.2.2"
-    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
-    implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31"
-    implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
-    implementation "com.hypertrack:hyperlog:0.0.10"
+    implementation "com.github.Applandeo:Material-Calendar-View:15de569cbc" // https://github.com/Applandeo/Material-Calendar-View
+    implementation "com.github.CanHub:Android-Image-Cropper:2.2.2" // https://github.com/CanHub/Android-Image-Cropper
+    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1" // https://github.com/ChuckerTeam/chucker
+    implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2" // https://github.com/antonKozyriatskyi/CircularProgressIndicator
+    implementation "com.github.bassaer:chatmessageview:2.0.1" // https://github.com/bassaer/ChatMessageView
+    implementation "com.github.hypertrack:hyperlog-android:0.0.10" // https://github.com/hypertrack/hyperlog-android
+    implementation "com.github.smuyyh:JsonViewer:V1.0.6" // https://github.com/smuyyh/JsonViewer
+    implementation "com.github.underwindfall.PowerPermission:powerpermission-coroutines:1.4.0" // https://github.com/underwindfall/PowerPermission
+    implementation "com.github.underwindfall.PowerPermission:powerpermission:1.4.0" // https://github.com/underwindfall/PowerPermission
+    implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31" // https://github.com/wulkanowy/uonet-request-signer
     implementation "com.jaredrummler:colorpicker:1.1.0"
-    implementation "com.qifan.powerpermission:powerpermission-coroutines:1.3.0"
-    implementation "com.qifan.powerpermission:powerpermission:1.3.0"
-    implementation "com.yuyh.json:jsonviewer:1.0.6"
     implementation "io.coil-kt:coil:1.1.1"
     implementation "me.dm7.barcodescanner:zxing:1.9.8"
     implementation "me.grantland:autofittextview:0.2.1"
     implementation "me.leolin:ShortcutBadger:1.1.22@aar"
     implementation "org.greenrobot:eventbus:3.2.0"
+    implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
     implementation("pl.droidsonroids.gif:android-gif-drawable") { version { strictly "1.2.15" } }
 
     // Debug-only dependencies
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
+    debugImplementation "com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6"
 }

app/git-info.gradle

@@ -97,18 +97,17 @@ private def buildGitInfo() {
     def tag = getLastTag(repo, git, head)
     def tagName = tag[1]
     def tagRevCount = tag[2]
-    def versionName = tagName.replace("v", "")
 
     def result = [
-            hash        : head.objectId.name,
-            branch      : repo.branch,
-            dirty       : dirty,
-            remotes     : remotes,
-            unstaged    : status.uncommittedChanges.join("; "),
-            tag         : tagName,
-            revCount    : tagRevCount,
-            version     : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""),
-            versionHuman: """$versionName-${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "")
+            hash            : head.objectId.name,
+            branch          : repo.branch,
+            dirty           : dirty,
+            remotes         : remotes,
+            unstaged        : status.uncommittedChanges.join("; "),
+            tag             : tagName,
+            revCount        : tagRevCount,
+            version         : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""),
+            versionSuffix   : """${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "")
     ]
     return result
 }

app/proguard-rules.pro

@@ -25,7 +25,8 @@
 -keep class pl.szczodrzynski.edziennik.data.db.entity.Event { *; }
 -keep class pl.szczodrzynski.edziennik.data.db.full.EventFull { *; }
 -keep class pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage { *; }
--keep class pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel { *; }
+-keep class pl.szczodrzynski.edziennik.data.db.entity.Note { *; }
+-keep class pl.szczodrzynski.edziennik.ui.home.HomeCardModel { *; }
 -keepclassmembers class pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig { public *; }
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
@@ -67,7 +68,7 @@
 
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.login.LoginInfo$Platform { *; }
 
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }

app/src/main/AndroidManifest.xml

@@ -121,32 +121,32 @@
               / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
              /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
         -->
-        <activity android:name=".ui.modules.base.CrashActivity"
+        <activity android:name=".ui.base.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
             android:theme="@style/DeadTheme" />
-        <activity android:name=".ui.modules.intro.ChangelogIntroActivity"
+        <activity android:name=".ui.intro.ChangelogIntroActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/Theme.Intro" />
-        <activity android:name=".ui.modules.login.LoginActivity"
+        <activity android:name=".ui.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.modules.home.CounterActivity"
+        <activity android:name=".ui.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
-        <activity android:name=".ui.modules.feedback.FeedbackActivity"
+        <activity android:name=".ui.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
+        <activity android:name=".ui.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme" />
         <activity android:name="com.canhub.cropper.CropImageActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/Base.Theme.AppCompat" />
-        <activity android:name=".ui.modules.base.BuildInvalidActivity" />
-        <activity android:name=".ui.modules.settings.contributors.ContributorsActivity" />
+        <activity android:name=".ui.base.BuildInvalidActivity" />
+        <activity android:name=".ui.settings.contributors.ContributorsActivity" />
 
         <!--  _____               _
              |  __ \             (_)

app/src/main/assets/pl-changelog.html

@@ -1,15 +1,8 @@
-<h3>Wersja 4.9, 2021-09-11</h3>
+<h3>Wersja 4.11.3, 2022-02-21</h3>
 <ul>
-    <li>Vulcan: naprawiono brakujące lekcje w planie. @Antoni-Czaplicki</li>
-    <li>Vulcan: naprawiono wysyłanie wiadomości. @Antoni-Czaplicki</li>
-    <li>Vulcan: naprawiono brak frekwencji.</li>
-    <li>Naprawiono eksportowanie planu lekcji oraz pobieranie załączników. @doteq</li>
-    <li>Mobidziennik: naprawiono możliwość pobierania przyszłego planu lekcji.</li>
-    <li>Mobidziennik: poprawiono brak nowych linii w wysłanej wiadomości.</li>
-    <li>Dodano ekran "Twórcy aplikacji" w Ustawieniach. @Pengwius</li>
-    <li>Zmieniono domyślne tło nagłówka menu. 😋</li>
+    <li>Naprawiono odświeżanie planu lekcji po pobraniu wybranego tygodnia.</li>
 </ul>
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>
-<i>&copy; [Kuba Szczodrzyński](@kuba2k2), [Kacper Ziubryniewicz](@kapi2289) 2021</i>
+<i>&copy; [Kuba Szczodrzyński](@kuba2k2), [Kacper Ziubryniewicz](@kapi2289) 2022</i>

app/src/main/cpp/szkolny-signing.cpp

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x36, 0x60, 0xb0, 0x4b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x90, 0xe9, 0x2f, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

app/src/main/java/pl/szczodrzynski/edziennik/App.kt

@@ -26,8 +26,6 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.google.gson.Gson
 import com.hypertrack.hyperlog.HyperLog
 import com.mikepenz.iconics.Iconics
-import eu.szkolny.sslprovider.SSLProvider
-import eu.szkolny.sslprovider.enableSupportedTls
 import im.wangchao.mhttp.MHttp
 import kotlinx.coroutines.*
 import me.leolin.shortcutbadger.ShortcutBadger
@@ -35,17 +33,21 @@ import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.config.Config
 import pl.szczodrzynski.edziennik.data.api.events.ProfileListEmptyEvent
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.ext.DAY
+import pl.szczodrzynski.edziennik.ext.MS
+import pl.szczodrzynski.edziennik.ext.setLanguage
+import pl.szczodrzynski.edziennik.network.SSLProviderInstaller
 import pl.szczodrzynski.edziennik.network.cookie.DumbCookieJar
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
+import pl.szczodrzynski.edziennik.ui.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.managers.*
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
@@ -63,6 +65,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         var devMode = false
     }
 
+    val api by lazy { SzkolnyApi(this) }
     val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
     val userActionManager by lazy { UserActionManager(this) }
     val gradesManager by lazy { GradesManager(this) }
@@ -71,6 +74,10 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     val permissionManager by lazy { PermissionManager(this) }
     val attendanceManager by lazy { AttendanceManager(this) }
     val buildManager by lazy { BuildManager(this) }
+    val availabilityManager by lazy { AvailabilityManager(this) }
+    val textStylingManager by lazy { TextStylingManager(this) }
+    val messageManager by lazy { MessageManager(this) }
+    val noteManager by lazy { NoteManager(this) }
 
     val db
         get() = App.db
@@ -110,7 +117,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             .connectTimeout(15, TimeUnit.SECONDS)
             .writeTimeout(10, TimeUnit.SECONDS)
             .readTimeout(30, TimeUnit.SECONDS)
-            .enableSupportedTls(enableCleartext = true)
+
+        SSLProviderInstaller.enableSupportedTls(builder, enableCleartext = true)
 
         if (devMode) {
             HyperLog.initialize(this)
@@ -174,8 +182,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         App.config = Config(App.db)
         App.profile = Profile(0, 0, 0, "")
         debugMode = BuildConfig.DEBUG
-        devMode = config.debugMode || debugMode
-        enableChucker = config.enableChucker || devMode
+        devMode = config.devMode ?: debugMode
+        enableChucker = config.enableChucker ?: devMode
 
         if (!profileLoadById(config.lastProfileId)) {
             db.profileDao().firstId?.let { profileLoadById(it) }
@@ -194,18 +202,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             withContext(Dispatchers.Default) {
                 config.migrate(this@App)
 
-                SSLProvider.install(
-                    applicationContext,
-                    downloadIfNeeded = true,
-                    supportTls13 = false,
-                    onFinish = {
-                        buildHttp()
-                    },
-                    onError = {
-                        Timber.e("Failed to install SSLProvider: $it")
-                        it.printStackTrace()
-                    }
-                )
+                SSLProviderInstaller.install(applicationContext, this@App::buildHttp)
 
                 if (config.devModePassword != null)
                     checkDevModePassword()

app/src/main/java/pl/szczodrzynski/edziennik/Binding.kt

@@ -4,8 +4,11 @@
 package pl.szczodrzynski.edziennik
 
 import android.graphics.Paint
+import android.view.View
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.databinding.BindingAdapter
+import pl.szczodrzynski.edziennik.ext.dp
 
 object Binding {
     @JvmStatic
@@ -17,4 +20,64 @@ object Binding {
             textView.paintFlags = textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
         }
     }
+
+    @JvmStatic
+    @BindingAdapter("android:isVisible")
+    fun isVisible(view: View, isVisible: Boolean) {
+        view.isVisible = isVisible
+    }
+
+    private fun resizeDrawable(textView: TextView, index: Int, size: Int) {
+        val drawables = textView.compoundDrawables
+        drawables[index]?.setBounds(0, 0, size, size)
+        textView.setCompoundDrawables(drawables[0], drawables[1], drawables[2], drawables[3])
+    }
+
+    @JvmStatic
+    @BindingAdapter("android:drawableLeftAutoSize")
+    fun drawableLeftAutoSize(textView: TextView, enable: Boolean) = resizeDrawable(
+        textView,
+        index = 0,
+        size = textView.textSize.toInt(),
+    )
+
+    @JvmStatic
+    @BindingAdapter("android:drawableRightAutoSize")
+    fun drawableRightAutoSize(textView: TextView, enable: Boolean) = resizeDrawable(
+        textView,
+        index = 2,
+        size = textView.textSize.toInt(),
+    )
+
+    @JvmStatic
+    @BindingAdapter("android:drawableLeftSize")
+    fun drawableLeftSize(textView: TextView, sizeDp: Int) = resizeDrawable(
+        textView,
+        index = 0,
+        size = sizeDp.dp,
+    )
+
+    @JvmStatic
+    @BindingAdapter("android:drawableTopSize")
+    fun drawableTopSize(textView: TextView, sizeDp: Int) = resizeDrawable(
+        textView,
+        index = 1,
+        size = sizeDp.dp,
+    )
+
+    @JvmStatic
+    @BindingAdapter("android:drawableRightSize")
+    fun drawableRightSize(textView: TextView, sizeDp: Int) = resizeDrawable(
+        textView,
+        index = 2,
+        size = sizeDp.dp,
+    )
+
+    @JvmStatic
+    @BindingAdapter("android:drawableBottomSize")
+    fun drawableBottomSize(textView: TextView, sizeDp: Int) = resizeDrawable(
+        textView,
+        index = 3,
+        size = sizeDp.dp,
+    )
 }

app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt

@@ -11,7 +11,7 @@ import android.provider.OpenableColumns
 import com.canhub.cropper.CropImage
 import com.canhub.cropper.CropImageView
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
 import java.io.File
 import java.io.FileOutputStream
 

app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt

@@ -12,10 +12,7 @@ import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.config.db.ConfigEntry
-import pl.szczodrzynski.edziennik.config.utils.ConfigMigration
-import pl.szczodrzynski.edziennik.config.utils.get
-import pl.szczodrzynski.edziennik.config.utils.set
-import pl.szczodrzynski.edziennik.config.utils.toHashMap
+import pl.szczodrzynski.edziennik.config.utils.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import kotlin.coroutines.CoroutineContext
@@ -75,15 +72,15 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false }
         set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value }
 
-    private var mDebugMode: Boolean? = null
-    var debugMode: Boolean
-        get() { mDebugMode = mDebugMode ?: values.get("debugMode", false); return mDebugMode ?: false }
-        set(value) { set("debugMode", value); mDebugMode = value }
+    private var mDevMode: Boolean? = null
+    var devMode: Boolean?
+        get() { mDevMode = mDevMode ?: values.getBooleanOrNull("debugMode"); return mDevMode }
+        set(value) { set("debugMode", value?.toString()); mDevMode = value }
 
     private var mEnableChucker: Boolean? = null
-    var enableChucker: Boolean
-        get() { mEnableChucker = mEnableChucker ?: values.get("enableChucker", false); return mEnableChucker ?: false }
-        set(value) { set("enableChucker", value); mEnableChucker = value }
+    var enableChucker: Boolean?
+        get() { mEnableChucker = mEnableChucker ?: values.getBooleanOrNull("enableChucker"); return mEnableChucker }
+        set(value) { set("enableChucker", value?.toString()); mEnableChucker = value }
 
     private var mDevModePassword: String? = null
     var devModePassword: String?
@@ -125,6 +122,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mApiInvalidCert = mApiInvalidCert ?: values["apiInvalidCert"]; return mApiInvalidCert }
         set(value) { set("apiInvalidCert", value); mApiInvalidCert = value }
 
+    private var mApiAvailabilityCheck: Boolean? = null
+    var apiAvailabilityCheck: Boolean
+        get() { mApiAvailabilityCheck = mApiAvailabilityCheck ?: values.get("apiAvailabilityCheck", true); return mApiAvailabilityCheck ?: true }
+        set(value) { set("apiAvailabilityCheck", value); mApiAvailabilityCheck = value }
+
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {

app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt

@@ -18,7 +18,7 @@ import kotlin.coroutines.CoroutineContext
 
 class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEntry>) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 2
+        const val DATA_VERSION = 3
     }
 
     private val job = Job()

app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigSync.kt

@@ -4,12 +4,12 @@
 
 package pl.szczodrzynski.edziennik.config
 
-import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
 
 class ProfileConfigSync(private val config: ProfileConfig) {
     private var mNotificationFilter: List<Int>? = null
     var notificationFilter: List<Int>
-        get() { mNotificationFilter = mNotificationFilter ?: config.values.get("notificationFilter", listOf()); return mNotificationFilter ?: listOf() }
+        get() { mNotificationFilter = mNotificationFilter ?: config.values.getIntList("notificationFilter", listOf()); return mNotificationFilter ?: listOf() }
         set(value) { config.set("notificationFilter", value); mNotificationFilter = value }
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt

@@ -7,7 +7,7 @@ package pl.szczodrzynski.edziennik.config
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel
+import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
 
 class ProfileConfigUI(private val config: ProfileConfig) {
     private var mAgendaViewType: Int? = null

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt

@@ -59,6 +59,9 @@ fun HashMap<String, String?>.get(key: String, default: String?): String? {
 fun HashMap<String, String?>.get(key: String, default: Boolean): Boolean {
     return this[key]?.toBoolean() ?: default
 }
+fun HashMap<String, String?>.getBooleanOrNull(key: String): Boolean? {
+    return this[key]?.toBooleanStrictOrNull()
+}
 fun HashMap<String, String?>.get(key: String, default: Int): Int {
     return this[key]?.toIntOrNull() ?: default
 }

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigGsonUtils.kt

@@ -5,13 +5,14 @@ package pl.szczodrzynski.edziennik.config.utils
 
 import com.google.gson.Gson
 import com.google.gson.JsonParser
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel
+import pl.szczodrzynski.edziennik.ext.getInt
+import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class ConfigGsonUtils {
+    @Suppress("UNCHECKED_CAST")
     fun <T> deserializeList(gson: Gson, str: String?, classOfT: Class<T>): List<T> {
-        val json = JsonParser().parse(str)
+        val json = JsonParser.parseString(str)
         val list: MutableList<T> = mutableListOf()
         if (!json.isJsonArray)
             return list
@@ -41,4 +42,4 @@ class ConfigGsonUtils {
 
         return list
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt

@@ -7,9 +7,9 @@ package pl.szczodrzynski.edziennik.config.utils
 import android.content.Context
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
-import pl.szczodrzynski.edziennik.HOUR
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.config.Config
+import pl.szczodrzynski.edziennik.ext.HOUR
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.ORDER_BY_DATE_DESC
 import pl.szczodrzynski.edziennik.utils.models.Time
 import kotlin.math.abs
@@ -42,7 +42,7 @@ class ConfigMigration(app: App, config: Config) {
                     MainActivity.DRAWER_ITEM_SETTINGS
             )
             sync.enabled = true
-            sync.interval = 1*HOUR.toInt()
+            sync.interval = 1* HOUR.toInt()
             sync.notifyAboutUpdates = true
             sync.onlyWifi = false
             sync.quietHoursEnabled = false
@@ -67,7 +67,7 @@ class ConfigMigration(app: App, config: Config) {
         if (dataVersion < 3) {
             update = null
             privacyPolicyAccepted = false
-            debugMode = false
+            devMode = null
             devModePassword = null
             appInstalledTime = 0L
             appRateSnackbarTime = 0L

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt

@@ -7,6 +7,8 @@ package pl.szczodrzynski.edziennik.config.utils
 import pl.szczodrzynski.edziennik.config.ProfileConfig
 import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES
 
@@ -33,5 +35,15 @@ class ProfileConfigMigration(config: ProfileConfig) {
 
             dataVersion = 2
         }
+
+        if (dataVersion < 3) {
+            if (ui.homeCards.isNotEmpty()) {
+                ui.homeCards = ui.homeCards.toMutableList().also {
+                    it.add(HomeCardModel(config.profileId, HomeCard.CARD_NOTES))
+                }
+            }
+
+            dataVersion = 3
+        }
     }}
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt

@@ -22,7 +22,7 @@ import pl.szczodrzynski.edziennik.data.api.task.ErrorReportTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.toApiError
+import pl.szczodrzynski.edziennik.ext.toApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
 import kotlin.math.roundToInt

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt

@@ -109,6 +109,7 @@ const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all"
 const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule"
 const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes"
 const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook"
+const val VULCAN_HEBE_ENDPOINT_TEACHERS = "api/mobile/teacher"
 const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam"
 const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
 const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary"

app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt

@@ -11,8 +11,8 @@ import android.content.Context
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_MIN
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.Bundle
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.ext.Bundle
 import pl.szczodrzynski.edziennik.receivers.SzkolnyReceiver
 import kotlin.math.roundToInt
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt

@@ -16,6 +16,10 @@ object Regexes {
         """[^0-9]""".toRegex()
     }
 
+    val HTML_BR by lazy {
+        """<br\s?/?>""".toRegex()
+    }
+
 
 
     val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
@@ -50,15 +54,16 @@ object Regexes {
         """events: (.+),$""".toRegex(RegexOption.MULTILINE)
     }
 
+    val MOBIDZIENNIK_WEB_ATTACHMENT by lazy {
+        """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik(_rozwiazania)?=([0-9]+)".+?>(.+?)(?: <small.+?\(([0-9.]+)\s(M|K|G|)B\)</small>)?</a>""".toRegex()
+    }
+
     val MOBIDZIENNIK_MESSAGE_READ_DATE by lazy {
         """czas przeczytania:.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_MESSAGE_SENT_READ_DATE by lazy {
         """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_MESSAGE_ATTACHMENT by lazy {
-        """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)"(?:.+?<small.+?\(([0-9.]+)\s(M|K|G|)B\))*""".toRegex(DOT_MATCHES_ALL)
-    }
     val MOBIDZIENNIK_MESSAGE_SENT_READ_BY by lazy {
         """([0-9]+)/([0-9]+)""".toRegex()
     }
@@ -100,22 +105,26 @@ object Regexes {
         """<strong>(.+?)</strong>\s*<small>\s*\((.+?),\s*(.+?)\)""".toRegex(DOT_MATCHES_ALL)
     }
 
-    val MOBIDZIENNIK_HOMEWORK_ROW by lazy {
+    val MOBIDZIENNIK_MOBILE_HOMEWORK_ROW by lazy {
         """class="rowRolling">(.+?</div>\s*</td>)""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_HOMEWORK_ITEM by lazy {
+    val MOBIDZIENNIK_MOBILE_HOMEWORK_ITEM by lazy {
         """<p><b>(.+?):</b>\s*(.+?)\s*</p>""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_HOMEWORK_BODY by lazy {
+    val MOBIDZIENNIK_MOBILE_HOMEWORK_BODY by lazy {
         """Treść:</b>(.+?)<p><b>""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_HOMEWORK_ID by lazy {
-        """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
+    val MOBIDZIENNIK_MOBILE_HOMEWORK_ID by lazy {
+        """name="id_zadania" value="([0-9]+)"""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
+    val MOBIDZIENNIK_MOBILE_HOMEWORK_ATTACHMENT by lazy {
         """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
 
+    val MOBIDZIENNIK_WEB_HOMEWORK_ADDED_DATE by lazy {
+        """Wpisał\(a\):</td>\s+<th>\s+(.+?), (.+?), ([0-9]{1,2}) (.+?) ([0-9]{4}), godzina ([0-9:]+)""".toRegex()
+    }
+
 
     val MOBIDZIENNIK_TIMETABLE_TOP by lazy {
         """<div class="plansc_top">.+?</div></div>""".toRegex(DOT_MATCHES_ALL)
@@ -128,6 +137,11 @@ object Regexes {
     }
 
 
+    val MOBIDZIENNIK_EVENT_CONTENT by lazy {
+        """<h1>(.+?) <small>\(wpisał\(a\) (.+?) w dniu ([0-9-]{10})\).+?<strong>(.+?)</strong><br""".toRegex(DOT_MATCHES_ALL)
+    }
+
+
 
     val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
         """<input type="hidden".+?name="([A-z0-9_]+)?".+?value="([A-z0-9_+-/=]+)?".+?>""".toRegex(DOT_MATCHES_ALL)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt

@@ -18,7 +18,6 @@ import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
@@ -27,6 +26,7 @@ import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
@@ -90,35 +90,21 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
                 return
             }
 
-            profile.registerName?.also { registerName ->
-                var status = app.config.sync.registerAvailability[registerName]
-                if (status == null || status.nextCheckAt < currentTimeUnix()) {
-                    val api = SzkolnyApi(app)
-                    api.runCatching({
-                        val availability = getRegisterAvailability()
-                        app.config.sync.registerAvailability = availability
-                        status = availability[registerName]
-                    }, onError = {
-                        val apiError = it.toApiError(TAG)
-                        if (apiError.errorCode == ERROR_API_INVALID_SIGNATURE) {
-                            return@also
-                        }
-                        taskCallback.onError(apiError)
-                        return
-                    })
-                }
-
-                if (status?.available != true
-                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+            val error = app.availabilityManager.check(profile)
+            when (error?.type) {
+                Type.NOT_AVAILABLE -> {
                     if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
-                        EventBus.getDefault().postSticky(
-                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
-                        )
+                        EventBus.getDefault().postSticky(RegisterAvailabilityEvent())
                     }
                     cancel()
                     taskCallback.onCompleted()
                     return
                 }
+                Type.API_ERROR -> {
+                    taskCallback.onError(error.apiError!!)
+                    return
+                }
+                else -> return@let
             }
         }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt

@@ -6,9 +6,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik
 
 import android.content.Intent
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.Intent
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.ext.Intent
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt

@@ -4,10 +4,13 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
 
-import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
 import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.data.db.entity.EventType
+import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.ext.*
 
 /**
  * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ANNOUNCEMENT_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS
@@ -13,7 +12,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.Edudzienni
 import pl.szczodrzynski.edziennik.data.db.entity.Announcement
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
@@ -40,7 +40,7 @@ class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
                     val teacherName = announcementElement.child(1).text()
                     val teacher = data.getTeacherByFirstLast(teacherName)
 
-                    val dateString = announcementElement.getElementsByClass("datetime").first().text()
+                    val dateString = announcementElement.getElementsByClass("datetime").first()?.text()
                     val startDate = Date.fromY_m_d(dateString)
                     val addedDate = Date.fromIsoHm(dateString)
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_ENTRIES
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPE
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPES
@@ -14,8 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.Edudzienni
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.util.*
 
@@ -44,7 +44,7 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                 return@map Triple(
                         symbol,
                         name,
-                        when (name.toLowerCase(Locale.ROOT)) {
+                        when (name.lowercase()) {
                             "obecność" -> Attendance.TYPE_PRESENT
                             "nieobecność" -> Attendance.TYPE_ABSENT
                             "spóźnienie" -> Attendance.TYPE_BELATED

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EVENTS
@@ -14,7 +13,8 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class EdudziennikWebEvents(override val data: DataEdudziennik,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_TYPE_ID
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EXAM_ID
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
@@ -16,7 +15,8 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class EdudziennikWebExams(override val data: DataEdudziennik,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt

@@ -10,7 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.get
 
 class EdudziennikWebGetAnnouncement(override val data: DataEdudziennik,
                                     private val announcement: AnnouncementFull,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt

@@ -1,14 +1,14 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
-import android.text.Html
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 
 class EdudziennikWebGetHomework(
         override val data: DataEdudziennik,
@@ -26,9 +26,11 @@ class EdudziennikWebGetHomework(
             webGet(TAG, "Homework/$id") { text ->
                 val description = Regexes.EDUDZIENNIK_HOMEWORK_DESCRIPTION.find(text)?.get(1)?.trim()
 
-                if (description != null) event.topic = Html.fromHtml(description).toString()
+                if (description != null)
+                    event.topic = BetterHtml.fromHtml(context = null, description).toString()
 
                 event.homeworkBody = ""
+                event.isDownloaded = true
                 event.attachmentNames = null
 
                 data.eventList += event

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt

@@ -6,8 +6,6 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import android.graphics.Color
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.colorFromCssName
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES
@@ -22,7 +20,9 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.colorFromCssName
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -67,13 +67,13 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
 
                 val gradeValues = if (grades.isNotEmpty()) {
                     subjects.select(".avg-$subjectId .grade-tip > p").first()
-                            .text().split('+').map {
+                            ?.text()?.split('+')?.map {
                                 val split = it.split('*')
                                 val value = split[1].trim().toFloatOrNull()
                                 val weight = value?.let { split[0].trim().toFloatOrNull() } ?: 0f
 
                                 Pair(value ?: 0f, weight)
-                            }
+                            } ?: emptyList()
                 } else emptyList()
 
                 grades.forEachIndexed { index, gradeElement ->

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_HOMEWORK_ID
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
@@ -15,7 +14,8 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class EdudziennikWebHomework(override val data: DataEdudziennik,
@@ -32,7 +32,7 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
 
             if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") {
                 doc.getElementsByTag("tr").forEach { homeworkElement ->
-                    val dateElement = homeworkElement.getElementsByClass("date").first().child(0)
+                    val dateElement = homeworkElement.getElementsByClass("date").first()?.child(0) ?: return@forEach
                     val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach
                     val id = idStr.crc32()
                     val date = Date.fromY_m_d(dateElement.text())
@@ -49,7 +49,7 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                     val teacherName = homeworkElement.child(2).text()
                     val teacher = data.getTeacherByFirstLast(teacherName)
 
-                    val topic = homeworkElement.child(4).text()?.trim()
+                    val topic = homeworkElement.child(4).text().trim()
 
                     val eventObject = Event(
                             profileId = profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES
@@ -13,7 +12,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.Edudzienni
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class EdudziennikWebNotes(override val data: DataEdudziennik,
@@ -29,7 +29,7 @@ class EdudziennikWebNotes(override val data: DataEdudziennik,
             val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
 
             doc.getElementsByTag("tr").forEach { noteElement ->
-                val dateElement = noteElement.getElementsByClass("date").first().child(0)
+                val dateElement = noteElement.getElementsByClass("date").first()?.child(0) ?: return@forEach
                 val addedDate = Date.fromY_m_d(dateElement.text()).inMillis
 
                 val id = EDUDZIENNIK_NOTE_ID.find(dateElement.attr("href"))?.get(0)?.crc32()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt

@@ -4,8 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
-import pl.szczodrzynski.edziennik.MONTH
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
 import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECTS_START
@@ -14,8 +12,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZI
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Team
-import pl.szczodrzynski.edziennik.firstLettersName
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.MONTH
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.firstLettersName
+import pl.szczodrzynski.edziennik.ext.get
 
 class EdudziennikWebStart(override val data: DataEdudziennik,
                           override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt

@@ -4,12 +4,12 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
-import pl.szczodrzynski.edziennik.MONTH
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHERS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TEACHERS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
-import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.ext.MONTH
+import pl.szczodrzynski.edziennik.ext.get
 
 class EdudziennikWebTeachers(override val data: DataEdudziennik,
                              override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.crc32
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
 import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
@@ -16,9 +15,10 @@ import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.ext.crc32
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.getString
+import pl.szczodrzynski.edziennik.ext.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@@ -57,7 +57,7 @@ class EdudziennikWebTimetable(override val data: DataEdudziennik,
 
             val table = doc.select("#Schedule tbody").first()
 
-            if (!table.text().contains("Brak planu lekcji.")) {
+            if (table?.text()?.contains("Brak planu lekcji.") == false) {
                 table.children().forEach { row ->
                     val rowElements = row.children()
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt

@@ -13,10 +13,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.Edudzienni
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getShortName
-import pl.szczodrzynski.edziennik.set
+import pl.szczodrzynski.edziennik.ext.fixName
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.getShortName
+import pl.szczodrzynski.edziennik.ext.set
 
 class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
     companion object {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt

@@ -10,8 +10,8 @@ import im.wangchao.mhttp.callback.TextCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getUnixDate
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.getUnixDate
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit) {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus
 
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_API
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_MESSAGES
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_PORTAL
@@ -13,7 +12,8 @@ import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_SYNERGIA
 import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.currentTimeUnix
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
 
 class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import pl.szczodrzynski.edziennik.startCoroutineTimer
+import pl.szczodrzynski.edziennik.ext.startCoroutineTimer
 import kotlin.coroutines.CoroutineContext
 
 class LibrusRecaptchaHelper(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt

@@ -11,7 +11,7 @@ import im.wangchao.mhttp.callback.JsonCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.ext.getString
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.*
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt

@@ -182,10 +182,6 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings)
                 LibrusApiPtMeetings(data, lastSync, onSuccess)
             }
-            ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types)
-                LibrusApiTeacherFreeDayTypes(data, lastSync, onSuccess)
-            }
             ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days)
                 LibrusApiTeacherFreeDays(data, lastSync, onSuccess)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt

@@ -7,7 +7,7 @@ import im.wangchao.mhttp.callback.JsonCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.ext.getString
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Announcement
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiAnnouncements(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiAttendanceTypes(override val data: DataLibrus,
                                override val lastSync: Long?,
@@ -58,7 +59,7 @@ class LibrusApiAttendanceTypes(override val data: DataLibrus,
                 ))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 2*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 2* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiAttendances(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiBehaviourGradeCategories(override val data: DataLibrus,
                                         override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiBehaviourGradeComments(override val data: DataLibrus,
                                       override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.text.DecimalFormat
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt

@@ -4,14 +4,14 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Team
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.ext.DAY
+import pl.szczodrzynski.edziennik.ext.getJsonObject
+import pl.szczodrzynski.edziennik.ext.getLong
+import pl.szczodrzynski.edziennik.ext.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiClasses(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSROOMS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Classroom
+import pl.szczodrzynski.edziennik.ext.*
 import java.util.*
 
 class LibrusApiClassrooms(override val data: DataLibrus,
@@ -25,8 +26,8 @@ class LibrusApiClassrooms(override val data: DataLibrus,
 
             classrooms?.forEach { classroom ->
                 val id = classroom.getLong("Id") ?: return@forEach
-                val name = classroom.getString("Name")?.toLowerCase(Locale.getDefault()) ?: ""
-                val symbol = classroom.getString("Symbol")?.toLowerCase(Locale.getDefault()) ?: ""
+                val name = classroom.getString("Name")?.lowercase() ?: ""
+                val symbol = classroom.getString("Symbol")?.lowercase() ?: ""
                 val nameShort = name.fixWhiteSpaces().split(" ").onEach { it[0] }.joinToString()
                 val symbolParts = symbol.fixWhiteSpaces().split(" ")
 
@@ -40,7 +41,7 @@ class LibrusApiClassrooms(override val data: DataLibrus,
                 data.classrooms.put(id, Classroom(profileId, id, friendlyName))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSROOMS, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSROOMS, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_CLASSROOMS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiDescriptiveGradeCategories(override val data: DataLibrus,
                                           override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt

@@ -15,6 +15,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_TEXT
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiDescriptiveGrades(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.EventType
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiEventTypes(override val data: DataLibrus,
                           override val lastSync: Long?,
@@ -30,7 +31,7 @@ class LibrusApiEventTypes(override val data: DataLibrus,
                 data.eventTypes.put(id, EventType(profileId, id, name, color))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_EVENT_TYPES, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_EVENT_TYPES, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_EVENT_TYPES)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiGradeCategories(override val data: DataLibrus,
                                override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiGradeComments(override val data: DataLibrus,
                              override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt

@@ -16,6 +16,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPO
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiHomework(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LESSONS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.LibrusLesson
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiLessons(override val data: DataLibrus,
                        override val lastSync: Long?,
@@ -39,7 +40,7 @@ class LibrusApiLessons(override val data: DataLibrus,
                 data.librusLessons.put(id, librusLesson)
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_LESSONS, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_LESSONS, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_LESSONS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt

@@ -4,12 +4,12 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -22,7 +22,7 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
     }
 
     init {
-        var nextSync = System.currentTimeMillis() + 2*DAY*1000
+        var nextSync = System.currentTimeMillis() + 2* DAY *1000
 
         apiGet(TAG, "LuckyNumbers") { json ->
             if (json.isJsonNull) {
@@ -41,7 +41,7 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
                     if (luckyNumberDate >= Date.getToday())
                         nextSync = luckyNumberDate.combineWith(Time(15, 0, 0))
                     else
-                        nextSync = System.currentTimeMillis() + 6*HOUR*1000
+                        nextSync = System.currentTimeMillis() + 6* HOUR *1000
 
                     data.luckyNumberList.add(luckyNumberObject)
                     data.metadataList.add(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt

@@ -4,10 +4,10 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ME
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiMe(override val data: DataLibrus,
                   override val lastSync: Long?,
@@ -34,7 +34,7 @@ class LibrusApiMe(override val data: DataLibrus,
             data.profile?.studentNameLong =
                     buildFullName(user?.getString("FirstName"), user?.getString("LastName"))
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_ME, 2*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_ME, 2* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_ME)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.NoticeType
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiNoticeTypes(override val data: DataLibrus,
                            override val lastSync: Long?,
@@ -29,7 +30,7 @@ class LibrusApiNoticeTypes(override val data: DataLibrus,
                 data.noticeTypes.put(id, NoticeType(profileId, id, name))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICE_TYPES, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICE_TYPES, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_NOTICE_TYPES)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiNotices(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiPointGradeCategories(override val data: DataLibrus,
                                     override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_AVG
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiPointGrades(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -64,7 +65,7 @@ class LibrusApiPtMeetings(override val data: DataLibrus,
 
             data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_PT_MEETING))
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_PT_MEETINGS, 12*HOUR)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_PT_MEETINGS, 12* HOUR)
             onSuccess(ENDPOINT_LIBRUS_API_PT_MEETINGS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPushConfig.kt

@@ -4,13 +4,13 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.JsonObject
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PUSH_CONFIG
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.ext.JsonObject
+import pl.szczodrzynski.edziennik.ext.getInt
+import pl.szczodrzynski.edziennik.ext.getJsonObject
 
 class LibrusApiPushConfig(override val data: DataLibrus,
                           override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SCHOOLS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.util.*
 
@@ -29,7 +30,7 @@ class LibrusApiSchools(override val data: DataLibrus,
             // create the school's short name using first letters of each long name's word
             // append the town name and save to student data
             val schoolNameShort = schoolNameLong?.firstLettersName
-            val schoolTown = school?.getString("Town")?.toLowerCase(Locale.getDefault())
+            val schoolTown = school?.getString("Town")?.lowercase()
             data.schoolName = schoolId.toString() + schoolNameShort + "_" + schoolTown
 
             school?.getJsonArray("LessonsRange")?.let { ranges ->

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SUBJECTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Subject
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiSubjects(override val data: DataLibrus,
                         override val lastSync: Long?,
@@ -32,7 +33,7 @@ class LibrusApiSubjects(override val data: DataLibrus,
 
             data.subjectList.put(1, Subject(profileId, 1, "Zachowanie", "zach"))
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_SUBJECTS, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_SUBJECTS, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_SUBJECTS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES
-import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsenceType
-
-class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus,
-                                   override val lastSync: Long?,
-                                   val onSuccess: (endpointId: Int) -> Unit
-) : LibrusApi(data, lastSync) {
-    companion object {
-        const val TAG = "LibrusApiTeacherFreeDayTypes"
-    }
-
-    init {
-        apiGet(TAG, "TeacherFreeDays/Types") { json ->
-            val teacherAbsenceTypes = json.getJsonArray("Types")?.asJsonObjectList()
-
-            teacherAbsenceTypes?.forEach { teacherAbsenceType ->
-                val id = teacherAbsenceType.getLong("Id") ?: return@forEach
-                val name = teacherAbsenceType.getString("Name") ?: return@forEach
-
-                val teacherAbsenceTypeObject = TeacherAbsenceType(
-                        profileId,
-                        id,
-                        name
-                )
-
-                data.teacherAbsenceTypes.put(id, teacherAbsenceTypeObject)
-            }
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES, 7 * DAY)
-            onSuccess(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES)
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -35,8 +36,6 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                 val id = teacherAbsence.getLong("Id") ?: return@forEach
                 val teacherId = teacherAbsence.getJsonObject("Teacher")?.getLong("Id")
                         ?: return@forEach
-                val type = teacherAbsence.getJsonObject("Type").getLong("Id") ?: return@forEach
-                val name = data.teacherAbsenceTypes.singleOrNull { it.id == type }?.name
                 val dateFrom = Date.fromY_m_d(teacherAbsence.getString("DateFrom"))
                 val dateTo = Date.fromY_m_d(teacherAbsence.getString("DateTo"))
                 val timeFrom = teacherAbsence.getString("TimeFrom")?.let { Time.fromH_m_s(it) }
@@ -45,8 +44,8 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                 val teacherAbsenceObject = TeacherAbsence(
                         profileId = profileId,
                         id = id,
-                        type = type,
-                        name = name,
+                        type = -1L,
+                        name = null,
                         dateFrom = dateFrom,
                         dateTo = dateTo,
                         timeFrom = timeFrom,
@@ -64,7 +63,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                 ))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS, 6*HOUR, DRAWER_ITEM_AGENDA)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS, 6* HOUR, DRAWER_ITEM_AGENDA)
             onSuccess(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiTextGradeCategories(override val data: DataLibrus,
                                    override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIV
 import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusApiTextGrades(override val data: DataLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt

@@ -8,6 +8,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_UNITS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiUnits(override val data: DataLibrus,
                      override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_USERS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiUsers(override val data: DataLibrus,
                      override val lastSync: Long?,
@@ -37,7 +38,7 @@ class LibrusApiUsers(override val data: DataLibrus,
                 data.teacherList.put(id, teacher)
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_USERS)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt

@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusApiVirtualClasses(override val data: DataLibrus,
                               override val lastSync: Long?,
@@ -31,7 +32,7 @@ class LibrusApiVirtualClasses(override val data: DataLibrus,
                 data.teamList.put(id, Team(profileId, id, name, 2, code, teacherId))
             }
 
-            data.setSyncNext(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES, 4*DAY)
+            data.setSyncNext(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES, 4* DAY)
             onSuccess(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES)
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
 
-import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.data.api.ERROR_NOT_IMPLEMENTED
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
@@ -13,8 +12,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.db.entity.*
 import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.ext.DAY
+import pl.szczodrzynski.edziennik.ext.fixName
+import pl.szczodrzynski.edziennik.ext.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -109,7 +109,7 @@ class LibrusMessagesGetList(override val data: DataLibrus,
                             id
                     )
 
-                    element.select("isAnyFileAttached")?.text()?.let {
+                    element.select("isAnyFileAttached").text()?.let {
                         if (it == "1")
                             messageObject.hasAttachments = true
                     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt

@@ -15,10 +15,10 @@ import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.notEmptyOrNull
-import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.ext.fixName
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.notEmptyOrNull
+import pl.szczodrzynski.edziennik.ext.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.nio.charset.Charset
 
@@ -35,7 +35,7 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
                 "messageId" to messageObject.id,
                 "archive" to 0
         )) { doc ->
-            val message = doc.select("response GetMessage data").first()
+            val message = doc.select("response GetMessage data").first() ?: return@messagesGet
 
             val body = Base64.decode(message.select("Message").text(), Base64.DEFAULT)
                     .toString(Charset.defaultCharset())
@@ -108,7 +108,7 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
                             readDate = readDate
                     )
 
-                    messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong ?: ""
+                    messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong
 
                     messageRecipientList.add(messageRecipientObject)
                 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt

@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusMessagesGetRecipientList(override val data: DataLibrus,
                                      val onSuccess: () -> Unit
@@ -28,9 +29,9 @@ class LibrusMessagesGetRecipientList(override val data: DataLibrus,
         messagesGet(TAG, "Receivers/action/GetTypes", parameters = mapOf(
             "includeClass" to 1
         )) { doc ->
-            doc.select("response GetTypes data list ArrayItem")?.forEach {
-                val id = it.getElementsByTag("id")?.firstOrNull()?.ownText() ?: return@forEach
-                val name = it.getElementsByTag("name")?.firstOrNull()?.ownText() ?: return@forEach
+            doc.select("response GetTypes data list ArrayItem").forEach {
+                val id = it.getElementsByTag("id").firstOrNull()?.ownText() ?: return@forEach
+                val name = it.getElementsByTag("name").firstOrNull()?.ownText() ?: return@forEach
                 listTypes += id to name
             }
 
@@ -55,7 +56,7 @@ class LibrusMessagesGetRecipientList(override val data: DataLibrus,
             if (dataEl is JsonObject) {
                 val listEl = dataEl.get("ArrayItem")
                 if (listEl is JsonArray) {
-                    listEl.asJsonObjectList()?.forEach { item ->
+                    listEl.asJsonObjectList().forEach { item ->
                         processElement(item, type.first, type.second)
                     }
                 }
@@ -71,7 +72,7 @@ class LibrusMessagesGetRecipientList(override val data: DataLibrus,
     private fun processElement(element: JsonObject, typeId: String, typeName: String, listName: String? = null) {
         val listEl = element.getJsonObject("list")?.get("ArrayItem")
         if (listEl is JsonArray) {
-            listEl.asJsonObjectList()?.let { list ->
+            listEl.asJsonObjectList().let { list ->
                 val label = element.getString("label") ?: ""
                 list.forEach { item ->
                     processElement(item, typeId, typeName, label)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt

@@ -5,16 +5,15 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
 
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.base64Encode
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.ext.base64Encode
+import pl.szczodrzynski.edziennik.ext.getJsonObject
+import pl.szczodrzynski.edziennik.ext.getLong
+import pl.szczodrzynski.edziennik.ext.getString
 
 class LibrusMessagesSendMessage(override val data: DataLibrus,
                                 val recipients: List<Teacher>,
@@ -42,14 +41,14 @@ class LibrusMessagesSendMessage(override val data: DataLibrus,
             val id = response.getLong("data")
 
             if (response.getString("status") != "ok" || id == null) {
-                val message = response.getString("message")
+                // val message = response.getString("message")
                 // TODO error
                 return@messagesGetJson
             }
 
             LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = null) {
-                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.id == id }
-                val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
+                val message = data.messageList.firstOrNull { it.isSent && it.id == id }
+                // val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
                 val event = MessageSentEvent(data.profileId, message, message?.addedDate)
 
                 EventBus.getDefault().postSticky(event)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusSandboxDownloadAttachment.kt

@@ -7,8 +7,8 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.getString
 import pl.szczodrzynski.edziennik.utils.Utils
 import java.io.File
 import kotlin.coroutines.CoroutineContext

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetHomework.kt

@@ -1,12 +1,12 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
 
-import android.text.Html
 import org.greenrobot.eventbus.EventBus
 import org.jsoup.Jsoup
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
 import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 
 class LibrusSynergiaGetHomework(override val data: DataLibrus,
                                 val event: EventFull,
@@ -23,7 +23,11 @@ class LibrusSynergiaGetHomework(override val data: DataLibrus,
             val table = doc.select("table.decorated tbody > tr")
 
             event.topic = table[1].select("td")[1].text()
-            event.homeworkBody = Html.fromHtml(table[5].select("td")[1].html()).toString()
+            event.homeworkBody = BetterHtml.fromHtml(
+                context = null,
+                html = table[5].select("td")[1].html(),
+            ).toString()
+            event.isDownloaded = true
 
             event.attachmentIds = mutableListOf()
             event.attachmentNames = mutableListOf()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessage.kt

@@ -10,10 +10,10 @@ import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.singleOrNull
-import pl.szczodrzynski.edziennik.swapFirstLastName
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.ext.singleOrNull
+import pl.szczodrzynski.edziennik.ext.swapFirstLastName
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusSynergiaGetMessage(override val data: DataLibrus,
@@ -87,7 +87,7 @@ class LibrusSynergiaGetMessage(override val data: DataLibrus,
                             })
                         }
 
-                        val readDateText = readElement.select(".left").text()
+                        val readDateText = readElement?.select(".left")?.text()
                         val readDate = when (readDateText.isNotNullNorEmpty()) {
                             true -> Date.fromIso(readDateText)
                             else -> 0
@@ -108,7 +108,7 @@ class LibrusSynergiaGetMessage(override val data: DataLibrus,
 
                     Message.TYPE_SENT -> {
 
-                        readElement.select("tr").forEachIndexed { i, receiver ->
+                        readElement?.select("tr")?.forEachIndexed { i, receiver ->
                             if (i == 0) return@forEachIndexed // Skip the header
 
                             val receiverFullName = receiver.child(0).text()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessages.kt

@@ -7,6 +7,7 @@ import pl.szczodrzynski.edziennik.data.api.Regexes
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
 import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -36,19 +37,19 @@ class LibrusSynergiaGetMessages(override val data: DataLibrus,
 
                 fun getRecipientId(name: String): Long = data.teacherList.singleOrNull {
                     it.fullNameLastFirst == name
-                }?.id ?: {
+                }?.id ?: run {
                     val teacherObject = Teacher(
-                            profileId,
-                            -1 * Utils.crc16(name.swapFirstLastName().toByteArray()).toLong(),
-                            name.splitName()?.second!!,
-                            name.splitName()?.first!!
+                        profileId,
+                        -1 * Utils.crc16(name.swapFirstLastName().toByteArray()).toLong(),
+                        name.splitName()?.second!!,
+                        name.splitName()?.first!!
                     )
                     data.teacherList.put(teacherObject.id, teacherObject)
                     teacherObject.id
-                }.invoke()
+                }
 
                 doc.select(".decorated.stretch tbody > tr").forEach { messageElement ->
-                    val url = messageElement.select("a").first().attr("href")
+                    val url = messageElement.select("a").first()?.attr("href") ?: return@forEach
                     val id = Regexes.LIBRUS_MESSAGE_ID.find(url)?.get(1)?.toLong() ?: return@forEach
                     val subject = messageElement.child(3).text()
                     val sentDate = Date.fromIso(messageElement.child(4).text())

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.HOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
 import pl.szczodrzynski.edziennik.data.api.POST
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
@@ -14,8 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.ext.HOUR
+import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.singleOrNull
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LibrusSynergiaHomework(override val data: DataLibrus,
@@ -42,7 +42,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
             doc.select("table.myHomeworkTable > tbody").firstOrNull()?.also { homeworkTable ->
                 val homeworkElements = homeworkTable.children()
 
-                homeworkElements.forEachIndexed { i, el ->
+                homeworkElements.forEach { el ->
                     val elements = el.children()
 
                     val subjectName = elements[0].text().trim()
@@ -56,7 +56,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                     val eventDate = Date.fromY_m_d(elements[6].text().trim())
                     val id = "/podglad/([0-9]+)'".toRegex().find(
                             elements[9].select("input").attr("onclick")
-                    )?.get(1)?.toLong() ?: return@forEachIndexed
+                    )?.get(1)?.toLong() ?: return@forEach
 
                     val lessons = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
                     val startTime = lessons.firstOrNull { it.subjectId == subjectId }?.startTime
@@ -79,6 +79,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                             teamId = data.teamClass?.id ?: -1,
                             addedDate = addedDate.inMillis
                     )
+                    eventObject.isDownloaded = false
 
                     data.eventList.add(eventObject)
                     data.metadataList.add(Metadata(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt

@@ -5,10 +5,10 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia
 
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.MONTH
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_INFO
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia
+import pl.szczodrzynski.edziennik.ext.MONTH
 
 class LibrusSynergiaInfo(override val data: DataLibrus,
                          override val lastSync: Long?,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPor
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.ext.*
 
 class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
     companion object {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginApi.kt

@@ -12,9 +12,9 @@ import im.wangchao.mhttp.callback.JsonCallbackHandler
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.ext.getInt
+import pl.szczodrzynski.edziennik.ext.getString
+import pl.szczodrzynski.edziennik.ext.getUnixDate
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.*
 
@@ -63,7 +63,7 @@ class LibrusLoginApi {
     }
 
     private fun copyFromLoginStore() {
-        data.loginStore.data?.apply {
+        data.loginStore.data.apply {
             if (has("accountLogin")) {
                 data.apiLogin = getString("accountLogin")
                 remove("accountLogin")

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt

@@ -12,7 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.LibrusRecaptchaHelper
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.ext.getUnixDate
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.io.StringWriter
 import javax.xml.parsers.DocumentBuilderFactory

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.net.HttpURLConnection.*
 import java.util.*
@@ -83,7 +84,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                         } else {
                             val csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(text)
                             if (csrfMatcher.find()) {
-                                login(csrfMatcher.group(1))
+                                login(csrfMatcher.group(1) ?: "")
                             } else {
                                 data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING)
                                         .withResponse(response)