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

This reverts commit 1677be9e6fa30478564df94201ea0f8193d6e5b8.

.gitignore

@@ -81,3 +81,10 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+app/schemas/
+
+signatures/
+
+app/.cxx
+/i18n/

.idea/.name

@@ -0,0 +1 @@
+Szkolny.eu

.idea/jarRepositories.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://kotlin.bintray.com/kotlinx/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://dl.bintray.com/wulkanowy/wulkanowy" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://dl.bintray.com/undervoid/Powerpermission" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://dl.bintray.com/undervoid/PowerPermission" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -6,10 +6,12 @@
     </configurations>
   </component>
   <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="androidx.databinding.BindingAdapter" />
+      <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
@@ -49,7 +51,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

agendacalendarview/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 //apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
 
     android {
         lintOptions {
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        targetSdkVersion setup.targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -43,9 +43,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // Google libraries
-    implementation "androidx.appcompat:appcompat:${androidXAppCompat}"
-    implementation "androidx.recyclerview:recyclerview:${androidXRecyclerView}"
-    implementation "com.google.android.material:material:${googleMaterial}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
+    implementation "com.google.android.material:material:${versions.material}"
 
     // other libraries
     //implementation 'se.emilsjolander:stickylistheaders:2.7.0'

annotation/.gitignore

@@ -0,0 +1 @@
+/build

annotation/build.gradle

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
+
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28.
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class SelectiveDao(
+        val db: KClass<*>
+)

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class UpdateSelective(
+        val primaryKeys: Array<String>,
+        val skippedColumns: Array<String> = []
+)

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'io.fabric'
 
 android {
     signingConfigs {
     }
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
     defaultConfig {
         applicationId 'pl.szczodrzynski.edziennik'
         minSdkVersion setup.minSdk
@@ -15,6 +16,12 @@ android {
         versionCode release.versionCode
         versionName release.versionName
         multiDexEnabled true
+
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11"
+            }
+        }
     }
     buildTypes {
         applicationVariants.all { variant ->
@@ -62,6 +69,12 @@ android {
     packagingOptions {
         exclude 'META-INF/library-core_release.kotlin_module'
     }
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.10.2"
+        }
+    }
 }
 
 /*task finalizeBundleDebug(type: Copy) {
@@ -91,7 +104,7 @@ tasks.whenTaskAdded { task ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    annotationProcessor "androidx.room:room-compiler:${versions.room}"
+    kapt "androidx.room:room-compiler:${versions.room}"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
 
     implementation "android.arch.navigation:navigation-fragment-ktx:${versions.navigationFragment}"
@@ -115,6 +128,7 @@ dependencies {
     implementation "com.mikepenz:iconics-core:${versions.iconics}"
     implementation "com.mikepenz:iconics-views:${versions.iconics}"
     implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar"
+    implementation "com.mikepenz:materialize:1.2.1"
 
     implementation "com.github.kuba2k2:NavLib:${versions.navlib}"
 
@@ -131,7 +145,7 @@ dependencies {
     implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true}
     implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update
     implementation "com.jaredrummler:colorpicker:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.12.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.2"
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
     implementation "com.wdullaer:materialdatetimepicker:4.1.2"
     implementation "com.yuyh.json:jsonviewer:1.0.6"
@@ -153,8 +167,8 @@ dependencies {
     //implementation project(":Navigation")
     implementation project(":szkolny-font")
 
-    debugImplementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
+    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
+    //releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
 
     //implementation 'com.github.wulkanowy:uonet-request-signer:master-SNAPSHOT'
     //implementation 'com.github.kuba2k2.uonet-request-signer:android:master-63f094b14a-1'
@@ -169,7 +183,24 @@ dependencies {
 
     implementation 'com.github.kuba2k2:RecyclerTabLayout:700f980584'
 
-    implementation 'com.linkedin.android.tachyon:tachyon:1.0.2'
+    implementation 'com.github.kuba2k2:Tachyon:551943a6b5'
+
+    implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${versions.retrofit}"
+
+    implementation 'com.github.jetradarmobile:android-snowfall:1.2.0'
+
+    implementation "io.coil-kt:coil:0.9.2"
+
+    implementation 'com.github.kuba2k2:NumberSlidingPicker:2921225f76'
+
+    implementation project(":annotation")
+    kapt project(":codegen")
+
+    implementation 'com.google.android:flexbox:2.0.1'
+
+    implementation 'com.qifan.powerpermission:powerpermission:1.0.0'
+    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.0.0'
 }
 repositories {
     mavenCentral()

app/proguard/app.pro

@@ -22,12 +22,20 @@
 -keep class android.support.v7.widget.** { *; }
 
 -keep class pl.szczodrzynski.edziennik.utils.models.** { *; }
--keep class pl.szczodrzynski.edziennik.data.db.modules.events.Event { *; }
--keep class pl.szczodrzynski.edziennik.data.db.modules.events.EventFull { *; }
--keepclassmembers class pl.szczodrzynski.edziennik.widgets.WidgetConfig { public *; }
--keepnames class pl.szczodrzynski.edziennik.WidgetTimetable
--keepnames class pl.szczodrzynski.edziennik.notifications.WidgetNotifications
--keepnames class pl.szczodrzynski.edziennik.luckynumber.WidgetLuckyNumber
+-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 { *; }
+-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
+-keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
+
+-keepnames class androidx.appcompat.view.menu.MenuBuilder { setHeaderTitleInt(java.lang.CharSequence); }
+-keepclassmembernames class androidx.appcompat.view.menu.StandardMenuPopup { private *; }
+-keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); }
+
+-keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; }
 
 -keep class .R
 -keep class **.R$* {
@@ -39,4 +47,22 @@
 
 -keep class okhttp3.** { *; }
 
--keep class com.google.android.material.tabs.** {*;}
+-keep class com.google.android.material.tabs.** {*;}
+
+# ServiceLoader support
+        -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
+
+-keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }

app/proguard/zxing.pro

@@ -0,0 +1,5 @@
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}

app/sampledata/format-bold/ic_format_bold.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13.5,15.5H10V12.5H13.5A1.5,1.5 0,0 1,15 14A1.5,1.5 0,0 1,13.5 15.5M10,6.5H13A1.5,1.5 0,0 1,14.5 8A1.5,1.5 0,0 1,13 9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z"/>
+</vector>

app/sampledata/format/ic_format_italic.xml

@@ -1,3 +1,7 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -5,5 +9,5 @@
     android:viewportHeight="24">
   <path
       android:fillColor="#FF000000"
-      android:pathData="M9,2c-1.05,0 -2.05,0.16 -3,0.46 4.06,1.27 7,5.06 7,9.54 0,4.48 -2.94,8.27 -7,9.54 0.95,0.3 1.95,0.46 3,0.46 5.52,0 10,-4.48 10,-10S14.52,2 9,2z"/>
+      android:pathData="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z"/>
 </vector>

app/sampledata/format/ic_format_underline.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-12-28.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M5,21H19V19H5V21M12,17A6,6 0,0 0,18 11V3H15.5V11A3.5,3.5 0,0 1,12 14.5A3.5,3.5 0,0 1,8.5 11V3H6V11A6,6 0,0 0,12 17Z"/>
+</vector>

app/sampledata/settings/ic_settings.xml

@@ -0,0 +1,13 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-25.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,8A4,4 0,0 1,16 12A4,4 0,0 1,12 16A4,4 0,0 1,8 12A4,4 0,0 1,12 8M12,10A2,2 0,0 0,10 12A2,2 0,0 0,12 14A2,2 0,0 0,14 12A2,2 0,0 0,12 10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/>
+</vector>

app/src/main/AndroidManifest.xml

@@ -3,6 +3,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="pl.szczodrzynski.edziennik">
 
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+    <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
+    <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -12,15 +26,19 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/SplashTheme"
+        android:theme="@style/AppTheme.Dark"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute">
-        <activity
-            android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
-            android:theme="@android:style/Theme.Dialog"
-            android:excludeFromRecents="true"/>
-        <activity
-            android:name=".MainActivity"
+
+        <!--  __  __       _                      _   _       _ _
+             |  \/  |     (_)           /\       | | (_)     (_) |
+             | \  / | __ _ _ _ __      /  \   ___| |_ ___   ___| |_ _   _
+             | |\/| |/ _` | | '_ \    / /\ \ / __| __| \ \ / / | __| | | |
+             | |  | | (_| | | | | |  / ____ \ (__| |_| |\ V /| | |_| |_| |
+             |_|  |_|\__,_|_|_| |_| /_/    \_\___|\__|_| \_/ |_|\__|\__, |
+                                                                     __/ |
+                                                                    |___/ -->
+        <activity android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
@@ -32,63 +50,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.modules.messages.MessagesComposeActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/messages_compose_title"
-            android:theme="@style/AppTheme.Black" />
-        <activity
-            android:name=".ui.modules.feedback.FeedbackActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.modules.login.LoginActivity"
-            android:configChanges="orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/AppTheme.Light" />
-        <activity
-            android:name=".ui.modules.intro.ChangelogIntroActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Intro" />
-        <!--
-              ______ _          _
-             |  ____(_)        | |
-             | |__   _ _ __ ___| |__   __ _ ___  ___
-             |  __| | | '__/ _ \ '_ \ / _` / __|/ _ \
-             | |    | | | |  __/ |_) | (_| \__ \  __/
-             |_|    |_|_|  \___|_.__/ \__,_|___/\___/
-        -->
-        <activity
-            android:name=".ui.modules.base.CrashActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:process=":error_activity"
-            android:theme="@style/DeadTheme" />
-        <!--
-               _____               _                  _   _       _ _
-              / ____|             | |                | | (_)     (_) |
-             | |     _ __ __ _ ___| |__     __ _  ___| |_ ___   ___| |_ _   _
-             | |    | '__/ _` / __| '_ \   / _` |/ __| __| \ \ / / | __| | | |
-             | |____| | | (_| \__ \ | | | | (_| | (__| |_| |\ V /| | |_| |_| |
-              \_____|_|  \__,_|___/_| |_|  \__,_|\___|\__|_| \_/ |_|\__|\__, |
-                                                                         __/ |
-                                                                        |___/
-        -->
-        <activity
-            android:name=".ui.modules.base.CrashGtfoActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:theme="@style/DeadTheme" />
-        <activity
-            android:name=".widgets.WidgetConfigActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:excludeFromRecents="true"
-            android:noHistory="true"
-            android:theme="@style/AppTheme.NoDisplay">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>
+
         <!--
              __          ___     _            _
              \ \        / (_)   | |          | |
@@ -97,69 +59,37 @@
                 \  /\  /  | | (_| | (_| |  __/ |_ \__ \
                  \/  \/   |_|\__,_|\__, |\___|\__||___/
                                     __/ |
-                                   |_
+                                   |___/
         -->
-        <activity
-            android:name=".widgets.timetable.LessonDetailsActivity"
+        <activity android:name=".ui.widgets.WidgetConfigActivity"
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:theme="@style/AppTheme.NoDisplay" />
-        <activity
-            android:name=".ui.modules.settings.SettingsLicenseActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/Base.Theme.AppCompat" />
-        <activity
-            android:name=".ui.modules.webpush.WebPushConfigActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/AppTheme.Dark" />
-        <activity
-            android:name=".ui.modules.home.CounterActivity"
-            android:theme="@style/AppTheme.Black" />
-        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-        <!--
-              _____                _     _
-             |  __ \              (_)   | |
-             | |__) | __ _____   ___  __| | ___ _ __ ___
-             |  ___/ '__/ _ \ \ / / |/ _` |/ _ \ '__/ __|
-             | |   | | | (_) \ V /| | (_| |  __/ |  \__ \
-             |_|   |_|  \___/ \_/ |_|\__,_|\___|_|  |___/
-        -->
-        <receiver
-            android:name=".WidgetTimetable"
+            android:theme="@style/AppTheme.Dark.NoDisplay">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+        <!-- TIMETABLE -->
+        <receiver android:name=".ui.widgets.timetable.WidgetTimetableProvider"
             android:label="@string/widget_timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_timetable_info" />
         </receiver>
-        <!--
-              ____              _                       _
-             |  _ \            | |                     (_)
-             | |_) | ___   ___ | |_   _ __ ___  ___ ___ ___   _____ _ __
-             |  _ < / _ \ / _ \| __| | '__/ _ \/ __/ _ \ \ \ / / _ \ '__|
-             | |_) | (_) | (_) | |_  | | |  __/ (_|  __/ |\ V /  __/ |
-             |____/ \___/ \___/ \__| |_|  \___|\___\___|_| \_/ \_____|
-        -->
-        <receiver
-            android:name=".widgets.notifications.WidgetNotifications"
+        <service android:name=".ui.widgets.timetable.WidgetTimetableService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <activity android:name=".ui.widgets.LessonDialogActivity"
+            android:label=""
+            android:configChanges="orientation|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/AppTheme.Dark.NoDisplay" />
+        <!-- NOTIFICATIONS -->
+        <receiver android:name=".ui.widgets.notifications.WidgetNotificationsProvider"
             android:label="@string/widget_notifications_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -169,8 +99,10 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_notifications_info" />
         </receiver>
-        <receiver
-            android:name=".widgets.luckynumber.WidgetLuckyNumber"
+        <service android:name=".ui.widgets.notifications.WidgetNotificationsService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <!-- LUCKY NUMBER -->
+        <receiver android:name=".ui.widgets.luckynumber.WidgetLuckyNumberProvider"
             android:label="@string/widget_lucky_number_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -180,68 +112,110 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_lucky_number_info" />
         </receiver>
-        <receiver
-            android:name=".receivers.UserPresentReceiver"
+
+        <!--               _   _       _ _   _
+                 /\       | | (_)     (_) | (_)
+                /  \   ___| |_ ___   ___| |_ _  ___  ___
+               / /\ \ / __| __| \ \ / / | __| |/ _ \/ __|
+              / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
+             /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
+        -->
+        <activity android:name=".ui.modules.base.CrashActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:process=":error_activity"
+            android:theme="@style/DeadTheme" />
+        <activity android:name=".ui.modules.base.CrashGtfoActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:theme="@style/DeadTheme" />
+        <activity android:name=".ui.modules.intro.ChangelogIntroActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Intro" />
+        <activity android:name=".ui.modules.login.LoginActivity"
+            android:configChanges="orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/AppTheme.Light" />
+        <activity android:name=".ui.modules.login.LoginLibrusCaptchaActivity"
+            android:theme="@android:style/Theme.Dialog"
+            android:excludeFromRecents="true"/>
+        <activity android:name=".ui.modules.home.CounterActivity"
+            android:theme="@style/AppTheme.Black" />
+        <activity android:name=".ui.modules.feedback.FeedbackActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
+        <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/Base.Theme.AppCompat" />
+
+        <!--  _____               _
+             |  __ \             (_)
+             | |__) |___  ___ ___ ___   _____ _ __ ___
+             |  _  // _ \/ __/ _ \ \ \ / / _ \ '__/ __|
+             | | \ \  __/ (_|  __/ |\ V /  __/ |  \__ \
+             |_|  \_\___|\___\___|_| \_/ \___|_|  |___/
+        -->
+        <receiver android:name=".receivers.UserPresentReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.BootReceiver">
+        <receiver android:name=".sync.UpdateDownloaderService$DownloadProgressReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-
-        <receiver
-            android:name=".sync.FirebaseBroadcastReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name=".receivers.SzkolnyReceiver"
+        <receiver android:name=".receivers.SzkolnyReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="pl.szczodrzynski.edziennik.SZKOLNY_MAIN" />
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".sync.MyFirebaseMessagingService"
+        <!--   _____                 _
+              / ____|               (_)
+             | (___   ___ _ ____   ___  ___ ___  ___
+              \___ \ / _ \ '__\ \ / / |/ __/ _ \/ __|
+              ____) |  __/ |   \ V /| | (_|  __/\__ \
+             |_____/ \___|_|    \_/ |_|\___\___||___/
+        -->
+        <!--<service android:name=".sync.MyFirebaseMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
+        </service>-->
+        <service android:name=".data.api.ApiService" />
+        <service android:name=".data.firebase.MyFirebaseService"
+            android:exported="false">
+            <intent-filter android:priority="10000000">
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+            </intent-filter>
         </service>
-        <service
-            android:name=".widgets.timetable.WidgetTimetableService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service
-            android:name=".widgets.notifications.WidgetNotificationsService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service android:name=".receivers.BootReceiver$NotificationActionService" />
+        <service android:name=".sync.UpdateDownloaderService" />
 
-        <service android:name=".Notifier$GetDataRetryService" />
-
-        <service android:name=".api.v2.ApiService" />
+        <!--
+              _____                _     _
+             |  __ \              (_)   | |
+             | |__) | __ _____   ___  __| | ___ _ __ ___
+             |  ___/ '__/ _ \ \ / / |/ _` |/ _ \ '__/ __|
+             | |   | | | (_) \ V /| | (_| |  __/ |  \__ \
+             |_|   |_|  \___/ \_/ |_|\__,_|\___|_|  |___/
+        -->
+        <provider android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
     </application>
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-</manifest>
+</manifest>

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

@@ -1,53 +1,32 @@
-<html>
-<head>
-	<style type="text/css">
-		* {
-			word-wrap: break-word;
-		}
-
-		body {
-			background-color: #{bg-color}; color: #{text-color};
-		}
-
-		a {
-			color: #{link-color};
-		}
-
-		a:active {
-			color: #{link-color-active};
-		}
-
-		ol {
-			list-style-position: inside;
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		li:not(:first-child) {
-			padding-top: 8px;
-		}
-	</style>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-
-<h3>Wersja 4.0, 2019-jeszcze-nie-wiem-kiedy</h3>
+<h3>Wersja 4.0, 2020-04-19</h3>
 <ul>
-    <li>UWAGA. To jest wersja in-development. Wiele funkcji może nie działać prawidłowo (lub wcale), co oznacza tylko że nie zostały jeszcze przeniesione
-    z wersji 3.x. Proszę o cierpliwość oraz <b>nie udostępnianie</b> tej wersji <u>nikomu</u>.</li>
-    <li>Bardzo dużo zmian</li>
+    <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
+    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkość oraz poprawność pobieranych danych</li>
+    <li>Udoskonalony wygląd Szkolnego - sprawi, że korzystanie z aplikacji będzie jeszcze przyjemniejsze</li>
+    <li>Wyszukiwarka wiadomości, pozwalająca na łatwe znalezienie potrzebnej konwersacji.</li>
+    <li>Możliwość pobierania załączników do zadań domowych oraz wiadomości w każdym dzienniku.</li>
+    <li>Nowa <b>Strona główna</b> - ładniejszy wygląd oraz możliwość przestawiania kart na każdym profilu</li>
+    <li>Nowy <b>Plan lekcji</b> - z doskonałą obsługą lekcji przesuniętych oraz dwóch lekcji o tej samej godzinie</li>
+    <li>Nowe <b>Oceny</b> - z możliwością zmiany wartości plusów oraz minusów oraz wyłączenia niektórych ocen ze średniej</li>
+    <li>Opcja wyłączenia wybranych powiadomień z aplikacji</li>
+    <li>Znaczki nieprzeczytanych informacji na obrazkach profili.</li>
+    <br>
+    <br>
+    <li>Udoskonalone tłumaczenie na j.angielski (dzięki @Predator)</li>
+    <li>Nowe okienka informacji o wydarzeniach oraz lekcjach</li>
+    <li>Nowe, przyjemniejsze powiadomienia</li>
+    <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
+    <li>Częściowa <b>Obsługa dziennika EduDziennik</b></li>
+    <li>Librus: opcja logowania w dziennikach <b>Jednostek Samorządu Terytorialnego</b> oraz <b>Oświata w Radomiu</b></li>
+    <li>Librus: <b>poprawione obliczanie frekwencji</b></li>
+    <li>Librus: obsługa Zadań domowych bez posiadania Mobilnych dodatków (przez system Synergia)</li>
+    <li>Lepsze <b>przekazywanie powiadomień na komputer</b> oraz łatwiejsze parowanie</li>
+    <li>Łatwiejsze dodawanie własnych wydarzeń</li>
+    <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
+    <li>Usunąłem denerwujący brak zaznaczenia w lewym menu</li>
+    <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
 </ul>
-
-<!--<i>
-    <h3>Plany na następne wersje:</h3>
-    <ul>
-        <li>Widget kalendarza ze sprawdzianami, ulepszenie widoku kalendarza w aplikacji</li>
-        <li>Wsparcie dla systemu Synergia w jednostkach samorządu terytorialnego - aplikacja Nasze Szkoły</li>
-        <li>Wsparcie dla Librusa w systemie Oświata w Radomiu</li>
-        <li>EduDziennik</li>
-        <li>Mobireg</li>
-        <li>Możliwość edycji planu lekcji</li>
-    </ul>
-</i>-->
-
-</body>
+<br>
+<br>
+Dzięki za korzystanie ze Szkolnego!<br>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>

app/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,44 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+        szkolny-signing
+
+        # Sets the library as a shared library.
+        SHARED
+
+        # Provides a relative path to your source file(s).
+        szkolny-signing.cpp)
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+#[[find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )]]
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+                       szkolny-signing
+
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       ${log-lib} )

app/src/main/cpp/aes.c

@@ -0,0 +1,520 @@
+#include <stdlib.h>
+#include <memory.h>
+#include "aes.h"
+
+#include <stdio.h>
+
+#define airport(x) (((x) << 8) | ((x) >> 24))
+
+#define TRUE  1
+#define FALSE 0
+
+static const toys wtf[16][16] = {
+	{0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76},
+	{0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0},
+	{0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15},
+	{0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75},
+	{0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84},
+	{0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF},
+	{0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8},
+	{0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2},
+	{0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73},
+	{0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB},
+	{0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79},
+	{0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08},
+	{0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A},
+	{0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E},
+	{0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF},
+	{0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16}
+};
+
+static const toys help_me[256][6] = {
+	{0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x03,0x09,0x0b,0x0d,0x0e},
+	{0x04,0x06,0x12,0x16,0x1a,0x1c},{0x06,0x05,0x1b,0x1d,0x17,0x12},
+	{0x08,0x0c,0x24,0x2c,0x34,0x38},{0x0a,0x0f,0x2d,0x27,0x39,0x36},
+	{0x0c,0x0a,0x36,0x3a,0x2e,0x24},{0x0e,0x09,0x3f,0x31,0x23,0x2a},
+	{0x10,0x18,0x48,0x58,0x68,0x70},{0x12,0x1b,0x41,0x53,0x65,0x7e},
+	{0x14,0x1e,0x5a,0x4e,0x72,0x6c},{0x16,0x1d,0x53,0x45,0x7f,0x62},
+	{0x18,0x14,0x6c,0x74,0x5c,0x48},{0x1a,0x17,0x65,0x7f,0x51,0x46},
+	{0x1c,0x12,0x7e,0x62,0x46,0x54},{0x1e,0x11,0x77,0x69,0x4b,0x5a},
+	{0x20,0x30,0x90,0xb0,0xd0,0xe0},{0x22,0x33,0x99,0xbb,0xdd,0xee},
+	{0x24,0x36,0x82,0xa6,0xca,0xfc},{0x26,0x35,0x8b,0xad,0xc7,0xf2},
+	{0x28,0x3c,0xb4,0x9c,0xe4,0xd8},{0x2a,0x3f,0xbd,0x97,0xe9,0xd6},
+	{0x2c,0x3a,0xa6,0x8a,0xfe,0xc4},{0x2e,0x39,0xaf,0x81,0xf3,0xca},
+	{0x30,0x28,0xd8,0xe8,0xb8,0x90},{0x32,0x2b,0xd1,0xe3,0xb5,0x9e},
+	{0x34,0x2e,0xca,0xfe,0xa2,0x8c},{0x36,0x2d,0xc3,0xf5,0xaf,0x82},
+	{0x38,0x24,0xfc,0xc4,0x8c,0xa8},{0x3a,0x27,0xf5,0xcf,0x81,0xa6},
+	{0x3c,0x22,0xee,0xd2,0x96,0xb4},{0x3e,0x21,0xe7,0xd9,0x9b,0xba},
+	{0x40,0x60,0x3b,0x7b,0xbb,0xdb},{0x42,0x63,0x32,0x70,0xb6,0xd5},
+	{0x44,0x66,0x29,0x6d,0xa1,0xc7},{0x46,0x65,0x20,0x66,0xac,0xc9},
+	{0x48,0x6c,0x1f,0x57,0x8f,0xe3},{0x4a,0x6f,0x16,0x5c,0x82,0xed},
+	{0x4c,0x6a,0x0d,0x41,0x95,0xff},{0x4e,0x69,0x04,0x4a,0x98,0xf1},
+	{0x50,0x78,0x73,0x23,0xd3,0xab},{0x52,0x7b,0x7a,0x28,0xde,0xa5},
+	{0x54,0x7e,0x61,0x35,0xc9,0xb7},{0x56,0x7d,0x68,0x3e,0xc4,0xb9},
+	{0x58,0x74,0x57,0x0f,0xe7,0x93},{0x5a,0x77,0x5e,0x04,0xea,0x9d},
+	{0x5c,0x72,0x45,0x19,0xfd,0x8f},{0x5e,0x71,0x4c,0x12,0xf0,0x81},
+	{0x60,0x50,0xab,0xcb,0x6b,0x3b},{0x62,0x53,0xa2,0xc0,0x66,0x35},
+	{0x64,0x56,0xb9,0xdd,0x71,0x27},{0x66,0x55,0xb0,0xd6,0x7c,0x29},
+	{0x68,0x5c,0x8f,0xe7,0x5f,0x03},{0x6a,0x5f,0x86,0xec,0x52,0x0d},
+	{0x6c,0x5a,0x9d,0xf1,0x45,0x1f},{0x6e,0x59,0x94,0xfa,0x48,0x11},
+	{0x70,0x48,0xe3,0x93,0x03,0x4b},{0x72,0x4b,0xea,0x98,0x0e,0x45},
+	{0x74,0x4e,0xf1,0x85,0x19,0x57},{0x76,0x4d,0xf8,0x8e,0x14,0x59},
+	{0x78,0x44,0xc7,0xbf,0x37,0x73},{0x7a,0x47,0xce,0xb4,0x3a,0x7d},
+	{0x7c,0x42,0xd5,0xa9,0x2d,0x6f},{0x7e,0x41,0xdc,0xa2,0x20,0x61},
+	{0x80,0xc0,0x76,0xf6,0x6d,0xad},{0x82,0xc3,0x7f,0xfd,0x60,0xa3},
+	{0x84,0xc6,0x64,0xe0,0x77,0xb1},{0x86,0xc5,0x6d,0xeb,0x7a,0xbf},
+	{0x88,0xcc,0x52,0xda,0x59,0x95},{0x8a,0xcf,0x5b,0xd1,0x54,0x9b},
+	{0x8c,0xca,0x40,0xcc,0x43,0x89},{0x8e,0xc9,0x49,0xc7,0x4e,0x87},
+	{0x90,0xd8,0x3e,0xae,0x05,0xdd},{0x92,0xdb,0x37,0xa5,0x08,0xd3},
+	{0x94,0xde,0x2c,0xb8,0x1f,0xc1},{0x96,0xdd,0x25,0xb3,0x12,0xcf},
+	{0x98,0xd4,0x1a,0x82,0x31,0xe5},{0x9a,0xd7,0x13,0x89,0x3c,0xeb},
+	{0x9c,0xd2,0x08,0x94,0x2b,0xf9},{0x9e,0xd1,0x01,0x9f,0x26,0xf7},
+	{0xa0,0xf0,0xe6,0x46,0xbd,0x4d},{0xa2,0xf3,0xef,0x4d,0xb0,0x43},
+	{0xa4,0xf6,0xf4,0x50,0xa7,0x51},{0xa6,0xf5,0xfd,0x5b,0xaa,0x5f},
+	{0xa8,0xfc,0xc2,0x6a,0x89,0x75},{0xaa,0xff,0xcb,0x61,0x84,0x7b},
+	{0xac,0xfa,0xd0,0x7c,0x93,0x69},{0xae,0xf9,0xd9,0x77,0x9e,0x67},
+	{0xb0,0xe8,0xae,0x1e,0xd5,0x3d},{0xb2,0xeb,0xa7,0x15,0xd8,0x33},
+	{0xb4,0xee,0xbc,0x08,0xcf,0x21},{0xb6,0xed,0xb5,0x03,0xc2,0x2f},
+	{0xb8,0xe4,0x8a,0x32,0xe1,0x05},{0xba,0xe7,0x83,0x39,0xec,0x0b},
+	{0xbc,0xe2,0x98,0x24,0xfb,0x19},{0xbe,0xe1,0x91,0x2f,0xf6,0x17},
+	{0xc0,0xa0,0x4d,0x8d,0xd6,0x76},{0xc2,0xa3,0x44,0x86,0xdb,0x78},
+	{0xc4,0xa6,0x5f,0x9b,0xcc,0x6a},{0xc6,0xa5,0x56,0x90,0xc1,0x64},
+	{0xc8,0xac,0x69,0xa1,0xe2,0x4e},{0xca,0xaf,0x60,0xaa,0xef,0x40},
+	{0xcc,0xaa,0x7b,0xb7,0xf8,0x52},{0xce,0xa9,0x72,0xbc,0xf5,0x5c},
+	{0xd0,0xb8,0x05,0xd5,0xbe,0x06},{0xd2,0xbb,0x0c,0xde,0xb3,0x08},
+	{0xd4,0xbe,0x17,0xc3,0xa4,0x1a},{0xd6,0xbd,0x1e,0xc8,0xa9,0x14},
+	{0xd8,0xb4,0x21,0xf9,0x8a,0x3e},{0xda,0xb7,0x28,0xf2,0x87,0x30},
+	{0xdc,0xb2,0x33,0xef,0x90,0x22},{0xde,0xb1,0x3a,0xe4,0x9d,0x2c},
+	{0xe0,0x90,0xdd,0x3d,0x06,0x96},{0xe2,0x93,0xd4,0x36,0x0b,0x98},
+	{0xe4,0x96,0xcf,0x2b,0x1c,0x8a},{0xe6,0x95,0xc6,0x20,0x11,0x84},
+	{0xe8,0x9c,0xf9,0x11,0x32,0xae},{0xea,0x9f,0xf0,0x1a,0x3f,0xa0},
+	{0xec,0x9a,0xeb,0x07,0x28,0xb2},{0xee,0x99,0xe2,0x0c,0x25,0xbc},
+	{0xf0,0x88,0x95,0x65,0x6e,0xe6},{0xf2,0x8b,0x9c,0x6e,0x63,0xe8},
+	{0xf4,0x8e,0x87,0x73,0x74,0xfa},{0xf6,0x8d,0x8e,0x78,0x79,0xf4},
+	{0xf8,0x84,0xb1,0x49,0x5a,0xde},{0xfa,0x87,0xb8,0x42,0x57,0xd0},
+	{0xfc,0x82,0xa3,0x5f,0x40,0xc2},{0xfe,0x81,0xaa,0x54,0x4d,0xcc},
+	{0x1b,0x9b,0xec,0xf7,0xda,0x41},{0x19,0x98,0xe5,0xfc,0xd7,0x4f},
+	{0x1f,0x9d,0xfe,0xe1,0xc0,0x5d},{0x1d,0x9e,0xf7,0xea,0xcd,0x53},
+	{0x13,0x97,0xc8,0xdb,0xee,0x79},{0x11,0x94,0xc1,0xd0,0xe3,0x77},
+	{0x17,0x91,0xda,0xcd,0xf4,0x65},{0x15,0x92,0xd3,0xc6,0xf9,0x6b},
+	{0x0b,0x83,0xa4,0xaf,0xb2,0x31},{0x09,0x80,0xad,0xa4,0xbf,0x3f},
+	{0x0f,0x85,0xb6,0xb9,0xa8,0x2d},{0x0d,0x86,0xbf,0xb2,0xa5,0x23},
+	{0x03,0x8f,0x80,0x83,0x86,0x09},{0x01,0x8c,0x89,0x88,0x8b,0x07},
+	{0x07,0x89,0x92,0x95,0x9c,0x15},{0x05,0x8a,0x9b,0x9e,0x91,0x1b},
+	{0x3b,0xab,0x7c,0x47,0x0a,0xa1},{0x39,0xa8,0x75,0x4c,0x07,0xaf},
+	{0x3f,0xad,0x6e,0x51,0x10,0xbd},{0x3d,0xae,0x67,0x5a,0x1d,0xb3},
+	{0x33,0xa7,0x58,0x6b,0x3e,0x99},{0x31,0xa4,0x51,0x60,0x33,0x97},
+	{0x37,0xa1,0x4a,0x7d,0x24,0x85},{0x35,0xa2,0x43,0x76,0x29,0x8b},
+	{0x2b,0xb3,0x34,0x1f,0x62,0xd1},{0x29,0xb0,0x3d,0x14,0x6f,0xdf},
+	{0x2f,0xb5,0x26,0x09,0x78,0xcd},{0x2d,0xb6,0x2f,0x02,0x75,0xc3},
+	{0x23,0xbf,0x10,0x33,0x56,0xe9},{0x21,0xbc,0x19,0x38,0x5b,0xe7},
+	{0x27,0xb9,0x02,0x25,0x4c,0xf5},{0x25,0xba,0x0b,0x2e,0x41,0xfb},
+	{0x5b,0xfb,0xd7,0x8c,0x61,0x9a},{0x59,0xf8,0xde,0x87,0x6c,0x94},
+	{0x5f,0xfd,0xc5,0x9a,0x7b,0x86},{0x5d,0xfe,0xcc,0x91,0x76,0x88},
+	{0x53,0xf7,0xf3,0xa0,0x55,0xa2},{0x51,0xf4,0xfa,0xab,0x58,0xac},
+	{0x57,0xf1,0xe1,0xb6,0x4f,0xbe},{0x55,0xf2,0xe8,0xbd,0x42,0xb0},
+	{0x4b,0xe3,0x9f,0xd4,0x09,0xea},{0x49,0xe0,0x96,0xdf,0x04,0xe4},
+	{0x4f,0xe5,0x8d,0xc2,0x13,0xf6},{0x4d,0xe6,0x84,0xc9,0x1e,0xf8},
+	{0x43,0xef,0xbb,0xf8,0x3d,0xd2},{0x41,0xec,0xb2,0xf3,0x30,0xdc},
+	{0x47,0xe9,0xa9,0xee,0x27,0xce},{0x45,0xea,0xa0,0xe5,0x2a,0xc0},
+	{0x7b,0xcb,0x47,0x3c,0xb1,0x7a},{0x79,0xc8,0x4e,0x37,0xbc,0x74},
+	{0x7f,0xcd,0x55,0x2a,0xab,0x66},{0x7d,0xce,0x5c,0x21,0xa6,0x68},
+	{0x73,0xc7,0x63,0x10,0x85,0x42},{0x71,0xc4,0x6a,0x1b,0x88,0x4c},
+	{0x77,0xc1,0x71,0x06,0x9f,0x5e},{0x75,0xc2,0x78,0x0d,0x92,0x50},
+	{0x6b,0xd3,0x0f,0x64,0xd9,0x0a},{0x69,0xd0,0x06,0x6f,0xd4,0x04},
+	{0x6f,0xd5,0x1d,0x72,0xc3,0x16},{0x6d,0xd6,0x14,0x79,0xce,0x18},
+	{0x63,0xdf,0x2b,0x48,0xed,0x32},{0x61,0xdc,0x22,0x43,0xe0,0x3c},
+	{0x67,0xd9,0x39,0x5e,0xf7,0x2e},{0x65,0xda,0x30,0x55,0xfa,0x20},
+	{0x9b,0x5b,0x9a,0x01,0xb7,0xec},{0x99,0x58,0x93,0x0a,0xba,0xe2},
+	{0x9f,0x5d,0x88,0x17,0xad,0xf0},{0x9d,0x5e,0x81,0x1c,0xa0,0xfe},
+	{0x93,0x57,0xbe,0x2d,0x83,0xd4},{0x91,0x54,0xb7,0x26,0x8e,0xda},
+	{0x97,0x51,0xac,0x3b,0x99,0xc8},{0x95,0x52,0xa5,0x30,0x94,0xc6},
+	{0x8b,0x43,0xd2,0x59,0xdf,0x9c},{0x89,0x40,0xdb,0x52,0xd2,0x92},
+	{0x8f,0x45,0xc0,0x4f,0xc5,0x80},{0x8d,0x46,0xc9,0x44,0xc8,0x8e},
+	{0x83,0x4f,0xf6,0x75,0xeb,0xa4},{0x81,0x4c,0xff,0x7e,0xe6,0xaa},
+	{0x87,0x49,0xe4,0x63,0xf1,0xb8},{0x85,0x4a,0xed,0x68,0xfc,0xb6},
+	{0xbb,0x6b,0x0a,0xb1,0x67,0x0c},{0xb9,0x68,0x03,0xba,0x6a,0x02},
+	{0xbf,0x6d,0x18,0xa7,0x7d,0x10},{0xbd,0x6e,0x11,0xac,0x70,0x1e},
+	{0xb3,0x67,0x2e,0x9d,0x53,0x34},{0xb1,0x64,0x27,0x96,0x5e,0x3a},
+	{0xb7,0x61,0x3c,0x8b,0x49,0x28},{0xb5,0x62,0x35,0x80,0x44,0x26},
+	{0xab,0x73,0x42,0xe9,0x0f,0x7c},{0xa9,0x70,0x4b,0xe2,0x02,0x72},
+	{0xaf,0x75,0x50,0xff,0x15,0x60},{0xad,0x76,0x59,0xf4,0x18,0x6e},
+	{0xa3,0x7f,0x66,0xc5,0x3b,0x44},{0xa1,0x7c,0x6f,0xce,0x36,0x4a},
+	{0xa7,0x79,0x74,0xd3,0x21,0x58},{0xa5,0x7a,0x7d,0xd8,0x2c,0x56},
+	{0xdb,0x3b,0xa1,0x7a,0x0c,0x37},{0xd9,0x38,0xa8,0x71,0x01,0x39},
+	{0xdf,0x3d,0xb3,0x6c,0x16,0x2b},{0xdd,0x3e,0xba,0x67,0x1b,0x25},
+	{0xd3,0x37,0x85,0x56,0x38,0x0f},{0xd1,0x34,0x8c,0x5d,0x35,0x01},
+	{0xd7,0x31,0x97,0x40,0x22,0x13},{0xd5,0x32,0x9e,0x4b,0x2f,0x1d},
+	{0xcb,0x23,0xe9,0x22,0x64,0x47},{0xc9,0x20,0xe0,0x29,0x69,0x49},
+	{0xcf,0x25,0xfb,0x34,0x7e,0x5b},{0xcd,0x26,0xf2,0x3f,0x73,0x55},
+	{0xc3,0x2f,0xcd,0x0e,0x50,0x7f},{0xc1,0x2c,0xc4,0x05,0x5d,0x71},
+	{0xc7,0x29,0xdf,0x18,0x4a,0x63},{0xc5,0x2a,0xd6,0x13,0x47,0x6d},
+	{0xfb,0x0b,0x31,0xca,0xdc,0xd7},{0xf9,0x08,0x38,0xc1,0xd1,0xd9},
+	{0xff,0x0d,0x23,0xdc,0xc6,0xcb},{0xfd,0x0e,0x2a,0xd7,0xcb,0xc5},
+	{0xf3,0x07,0x15,0xe6,0xe8,0xef},{0xf1,0x04,0x1c,0xed,0xe5,0xe1},
+	{0xf7,0x01,0x07,0xf0,0xf2,0xf3},{0xf5,0x02,0x0e,0xfb,0xff,0xfd},
+	{0xeb,0x13,0x79,0x92,0xb4,0xa7},{0xe9,0x10,0x70,0x99,0xb9,0xa9},
+	{0xef,0x15,0x6b,0x84,0xae,0xbb},{0xed,0x16,0x62,0x8f,0xa3,0xb5},
+	{0xe3,0x1f,0x5d,0xbe,0x80,0x9f},{0xe1,0x1c,0x54,0xb5,0x8d,0x91},
+	{0xe7,0x19,0x4f,0xa8,0x9a,0x83},{0xe5,0x1a,0x46,0xa3,0x97,0x8d}
+};
+
+void throat(const toys *decide, toys *selection, size_t plane)
+{
+	size_t idx;
+
+	for (idx = 0; idx < plane; idx++)
+		selection[idx] ^= decide[idx];
+}
+
+int death(const toys *squirrel, size_t dear, toys *awful, const arrest *wrong, int magic, const toys *fit)
+{
+	toys supermarket[calculator], software[calculator], bookstore[calculator];
+	int brainwash, jellybean;
+
+	if (dear % calculator != 0)
+		return(FALSE);
+
+	brainwash = dear / calculator;
+
+	memcpy(bookstore, fit, calculator);
+
+	for (jellybean = 0; jellybean < brainwash; jellybean++) {
+		memcpy(supermarket, &squirrel[jellybean * calculator], calculator);
+		throat(bookstore, supermarket, calculator);
+		punishment(supermarket, software, wrong, magic);
+		memcpy(&awful[jellybean * calculator], software, calculator);
+		memcpy(bookstore, software, calculator);
+	}
+
+	return(TRUE);
+}
+
+arrest please(arrest lol)
+{
+	unsigned int apps;
+
+    apps = (int)wtf[(lol >> 4) & 0x0000000F][lol & 0x0000000F];
+    apps += (int)wtf[(lol >> 12) & 0x0000000F][(lol >> 8) & 0x0000000F] << 8;
+    apps += (int)wtf[(lol >> 20) & 0x0000000F][(lol >> 16) & 0x0000000F] << 16;
+    apps += (int)wtf[(lol >> 28) & 0x0000000F][(lol >> 24) & 0x0000000F] << 24;
+	return(apps);
+}
+
+void stoprightnow(const toys *fuckoff, arrest *waste, int roadtrip)
+{
+	int tour=4,cause,lively,reply;
+	arrest nope,desert[]={0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000,
+						  0x40000000, 0x80000000, 0x1b000000, 0x36000000, 0x6c000000, 0xd8000000,
+						  0xab000000, 0x4d000000, 0x9a000000};
+
+	switch (roadtrip) {
+		case 128: cause = 10; lively = 4; break;
+		case 192: cause = 12; lively = 6; break;
+		case 256: cause = 14; lively = 8; break;
+		default: return;
+	}
+
+	for (reply=0; reply < lively; ++reply) {
+		waste[reply] = ((fuckoff[4 * reply]) << 24) | ((fuckoff[4 * reply + 1]) << 16) |
+					   ((fuckoff[4 * reply + 2]) << 8) | ((fuckoff[4 * reply + 3]));
+	}
+
+	for (reply = lively; reply < tour * (cause + 1); ++reply) {
+        nope = waste[reply - 1];
+		if ((reply % lively) == 0)
+            nope = please(airport(nope)) ^ desert[(reply - 1) / lively];
+		else if (lively > 6 && (reply % lively) == 4)
+            nope = please(nope);
+		waste[reply] = waste[reply - lively] ^ nope;
+	}
+}
+
+void hot(toys rare[][4], const arrest powerful[])
+{
+	toys interfere[4];
+
+	// memcpy(interfere,&powerful[idx],4); // Not accurate for big endian machines
+	// Subkey 1
+	interfere[0] = powerful[0] >> 24;
+	interfere[1] = powerful[0] >> 16;
+	interfere[2] = powerful[0] >> 8;
+	interfere[3] = powerful[0];
+	rare[0][0] ^= interfere[0];
+	rare[1][0] ^= interfere[1];
+	rare[2][0] ^= interfere[2];
+	rare[3][0] ^= interfere[3];
+	// Subkey 2
+	interfere[0] = powerful[1] >> 24;
+	interfere[1] = powerful[1] >> 16;
+	interfere[2] = powerful[1] >> 8;
+	interfere[3] = powerful[1];
+	rare[0][1] ^= interfere[0];
+	rare[1][1] ^= interfere[1];
+	rare[2][1] ^= interfere[2];
+	rare[3][1] ^= interfere[3];
+	// Subkey 3
+	interfere[0] = powerful[2] >> 24;
+	interfere[1] = powerful[2] >> 16;
+	interfere[2] = powerful[2] >> 8;
+	interfere[3] = powerful[2];
+	rare[0][2] ^= interfere[0];
+	rare[1][2] ^= interfere[1];
+	rare[2][2] ^= interfere[2];
+	rare[3][2] ^= interfere[3];
+	// Subkey 4
+	interfere[0] = powerful[3] >> 24;
+	interfere[1] = powerful[3] >> 16;
+	interfere[2] = powerful[3] >> 8;
+	interfere[3] = powerful[3];
+	rare[0][3] ^= interfere[0];
+	rare[1][3] ^= interfere[1];
+	rare[2][3] ^= interfere[2];
+	rare[3][3] ^= interfere[3];
+}
+
+void numerous(toys vigorous[][4])
+{
+	vigorous[0][0] = wtf[vigorous[0][0] >> 4][vigorous[0][0] & 0x0F];
+	vigorous[0][1] = wtf[vigorous[0][1] >> 4][vigorous[0][1] & 0x0F];
+	vigorous[0][2] = wtf[vigorous[0][2] >> 4][vigorous[0][2] & 0x0F];
+	vigorous[0][3] = wtf[vigorous[0][3] >> 4][vigorous[0][3] & 0x0F];
+	vigorous[1][0] = wtf[vigorous[1][0] >> 4][vigorous[1][0] & 0x0F];
+	vigorous[1][1] = wtf[vigorous[1][1] >> 4][vigorous[1][1] & 0x0F];
+	vigorous[1][2] = wtf[vigorous[1][2] >> 4][vigorous[1][2] & 0x0F];
+	vigorous[1][3] = wtf[vigorous[1][3] >> 4][vigorous[1][3] & 0x0F];
+	vigorous[2][0] = wtf[vigorous[2][0] >> 4][vigorous[2][0] & 0x0F];
+	vigorous[2][1] = wtf[vigorous[2][1] >> 4][vigorous[2][1] & 0x0F];
+	vigorous[2][2] = wtf[vigorous[2][2] >> 4][vigorous[2][2] & 0x0F];
+	vigorous[2][3] = wtf[vigorous[2][3] >> 4][vigorous[2][3] & 0x0F];
+	vigorous[3][0] = wtf[vigorous[3][0] >> 4][vigorous[3][0] & 0x0F];
+	vigorous[3][1] = wtf[vigorous[3][1] >> 4][vigorous[3][1] & 0x0F];
+	vigorous[3][2] = wtf[vigorous[3][2] >> 4][vigorous[3][2] & 0x0F];
+	vigorous[3][3] = wtf[vigorous[3][3] >> 4][vigorous[3][3] & 0x0F];
+}
+
+void crowded(toys chalk[][4])
+{
+	int t;
+
+	// Shift left by 1
+	t = chalk[1][0];
+	chalk[1][0] = chalk[1][1];
+	chalk[1][1] = chalk[1][2];
+	chalk[1][2] = chalk[1][3];
+	chalk[1][3] = t;
+	// Shift left by 2
+	t = chalk[2][0];
+	chalk[2][0] = chalk[2][2];
+	chalk[2][2] = t;
+	t = chalk[2][1];
+	chalk[2][1] = chalk[2][3];
+	chalk[2][3] = t;
+	// Shift left by 3
+	t = chalk[3][0];
+	chalk[3][0] = chalk[3][3];
+	chalk[3][3] = chalk[3][2];
+	chalk[3][2] = chalk[3][1];
+	chalk[3][1] = t;
+}
+
+void scale(toys oh_no[][4])
+{
+	toys idk[4];
+
+	// Column 1
+	idk[0] = oh_no[0][0];
+	idk[1] = oh_no[1][0];
+	idk[2] = oh_no[2][0];
+	idk[3] = oh_no[3][0];
+	oh_no[0][0] = help_me[idk[0]][0];
+	oh_no[0][0] ^= help_me[idk[1]][1];
+	oh_no[0][0] ^= idk[2];
+	oh_no[0][0] ^= idk[3];
+	oh_no[1][0] = idk[0];
+	oh_no[1][0] ^= help_me[idk[1]][0];
+	oh_no[1][0] ^= help_me[idk[2]][1];
+	oh_no[1][0] ^= idk[3];
+	oh_no[2][0] = idk[0];
+	oh_no[2][0] ^= idk[1];
+	oh_no[2][0] ^= help_me[idk[2]][0];
+	oh_no[2][0] ^= help_me[idk[3]][1];
+	oh_no[3][0] = help_me[idk[0]][1];
+	oh_no[3][0] ^= idk[1];
+	oh_no[3][0] ^= idk[2];
+	oh_no[3][0] ^= help_me[idk[3]][0];
+	// Column 2
+	idk[0] = oh_no[0][1];
+	idk[1] = oh_no[1][1];
+	idk[2] = oh_no[2][1];
+	idk[3] = oh_no[3][1];
+	oh_no[0][1] = help_me[idk[0]][0];
+	oh_no[0][1] ^= help_me[idk[1]][1];
+	oh_no[0][1] ^= idk[2];
+	oh_no[0][1] ^= idk[3];
+	oh_no[1][1] = idk[0];
+	oh_no[1][1] ^= help_me[idk[1]][0];
+	oh_no[1][1] ^= help_me[idk[2]][1];
+	oh_no[1][1] ^= idk[3];
+	oh_no[2][1] = idk[0];
+	oh_no[2][1] ^= idk[1];
+	oh_no[2][1] ^= help_me[idk[2]][0];
+	oh_no[2][1] ^= help_me[idk[3]][1];
+	oh_no[3][1] = help_me[idk[0]][1];
+	oh_no[3][1] ^= idk[1];
+	oh_no[3][1] ^= idk[2];
+	oh_no[3][1] ^= help_me[idk[3]][0];
+	// Column 3
+	idk[0] = oh_no[0][2];
+	idk[1] = oh_no[1][2];
+	idk[2] = oh_no[2][2];
+	idk[3] = oh_no[3][2];
+	oh_no[0][2] = help_me[idk[0]][0];
+	oh_no[0][2] ^= help_me[idk[1]][1];
+	oh_no[0][2] ^= idk[2];
+	oh_no[0][2] ^= idk[3];
+	oh_no[1][2] = idk[0];
+	oh_no[1][2] ^= help_me[idk[1]][0];
+	oh_no[1][2] ^= help_me[idk[2]][1];
+	oh_no[1][2] ^= idk[3];
+	oh_no[2][2] = idk[0];
+	oh_no[2][2] ^= idk[1];
+	oh_no[2][2] ^= help_me[idk[2]][0];
+	oh_no[2][2] ^= help_me[idk[3]][1];
+	oh_no[3][2] = help_me[idk[0]][1];
+	oh_no[3][2] ^= idk[1];
+	oh_no[3][2] ^= idk[2];
+	oh_no[3][2] ^= help_me[idk[3]][0];
+	// Column 4
+	idk[0] = oh_no[0][3];
+	idk[1] = oh_no[1][3];
+	idk[2] = oh_no[2][3];
+	idk[3] = oh_no[3][3];
+	oh_no[0][3] = help_me[idk[0]][0];
+	oh_no[0][3] ^= help_me[idk[1]][1];
+	oh_no[0][3] ^= idk[2];
+	oh_no[0][3] ^= idk[3];
+	oh_no[1][3] = idk[0];
+	oh_no[1][3] ^= help_me[idk[1]][0];
+	oh_no[1][3] ^= help_me[idk[2]][1];
+	oh_no[1][3] ^= idk[3];
+	oh_no[2][3] = idk[0];
+	oh_no[2][3] ^= idk[1];
+	oh_no[2][3] ^= help_me[idk[2]][0];
+	oh_no[2][3] ^= help_me[idk[3]][1];
+	oh_no[3][3] = help_me[idk[0]][1];
+	oh_no[3][3] ^= idk[1];
+	oh_no[3][3] ^= idk[2];
+	oh_no[3][3] ^= help_me[idk[3]][0];
+}
+
+void punishment(const toys friends[], toys number[], const arrest wish[], int hang)
+{
+	toys burst[4][4];
+
+	burst[0][0] = friends[0];
+	burst[1][0] = friends[1];
+	burst[2][0] = friends[2];
+	burst[3][0] = friends[3];
+	burst[0][1] = friends[4];
+	burst[1][1] = friends[5];
+	burst[2][1] = friends[6];
+	burst[3][1] = friends[7];
+	burst[0][2] = friends[8];
+	burst[1][2] = friends[9];
+	burst[2][2] = friends[10];
+	burst[3][2] = friends[11];
+	burst[0][3] = friends[12];
+	burst[1][3] = friends[13];
+	burst[2][3] = friends[14];
+	burst[3][3] = friends[15];
+
+	hot(burst, &wish[0]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[4]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[8]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[12]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[16]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[20]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[24]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[28]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[32]);
+	numerous(burst);
+	crowded(burst);
+	scale(burst);
+	hot(burst, &wish[36]);
+	if (hang != 128) {
+		numerous(burst);
+		crowded(burst);
+		scale(burst);
+		hot(burst, &wish[40]);
+		numerous(burst);
+		crowded(burst);
+		scale(burst);
+		hot(burst, &wish[44]);
+		if (hang != 192) {
+			numerous(burst);
+			crowded(burst);
+			scale(burst);
+			hot(burst, &wish[48]);
+			numerous(burst);
+			crowded(burst);
+			scale(burst);
+			hot(burst, &wish[52]);
+			numerous(burst);
+			crowded(burst);
+			hot(burst, &wish[56]);
+		}
+		else {
+			numerous(burst);
+			crowded(burst);
+			hot(burst, &wish[48]);
+		}
+	}
+	else {
+		numerous(burst);
+		crowded(burst);
+		hot(burst, &wish[40]);
+	}
+
+	number[0] = burst[0][0];
+	number[1] = burst[1][0];
+	number[2] = burst[2][0];
+	number[3] = burst[3][0];
+	number[4] = burst[0][1];
+	number[5] = burst[1][1];
+	number[6] = burst[2][1];
+	number[7] = burst[3][1];
+	number[8] = burst[0][2];
+	number[9] = burst[1][2];
+	number[10] = burst[2][2];
+	number[11] = burst[3][2];
+	number[12] = burst[0][3];
+	number[13] = burst[1][3];
+	number[14] = burst[2][3];
+	number[15] = burst[3][3];
+}
+

app/src/main/cpp/aes.h

@@ -0,0 +1,27 @@
+#ifndef AES_H
+#define AES_H
+
+#include <stddef.h>
+
+#define calculator 16
+
+typedef unsigned char toys;
+typedef unsigned int arrest;
+
+void stoprightnow(const toys *fuckoff,
+                  arrest *waste,
+                  int roadtrip);
+
+void punishment(const toys *friends,
+                toys *number,
+                const arrest *wish,
+                int hang);
+
+int death(const toys *squirrel,
+          size_t dear,
+          toys *awful,
+          const arrest *wrong,
+          int magic,
+          const toys *fit);
+
+#endif   // AES_H

app/src/main/cpp/base64.cpp

@@ -0,0 +1,55 @@
+#include "jni.h"
+#include <stdlib.h>
+#include <cstring>
+
+const char base[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+char *kill_me(const char *coil, size_t room) {
+    int canvas = 0;
+    size_t irritating;
+    int exchange = 0;
+    char *untidy = NULL;
+    char *excellent = NULL;
+    int sincere = 0;
+    char development[4];
+    int trade = 0;
+    irritating = room / 3;
+    exchange = room % 3;
+    if (exchange > 0) {
+        irritating += 1;
+    }
+    irritating = irritating * 4 + 1;
+    untidy = (char *) malloc(irritating);
+
+    if (untidy == NULL) {
+        exit(0);
+    }
+    memset(untidy, 0, irritating);
+    excellent = untidy;
+    while (sincere < room) {
+        exchange = 0;
+        canvas = 0;
+        memset(development, '\0', 4);
+        while (exchange < 3) {
+            if (sincere >= room) {
+                break;
+            }
+            canvas = ((canvas << 8) | (coil[sincere] & 0xFF));
+            sincere++;
+            exchange++;
+        }
+        canvas = (canvas << ((3 - exchange) * 8));
+        for (trade = 0; trade < 4; trade++) {
+            if (exchange < trade) {
+                development[trade] = 0x40;
+            }
+            else {
+                development[trade] = (canvas >> ((3 - trade) * 6)) & 0x3F;
+            }
+            *excellent = base[development[trade]];
+            excellent++;
+        }
+    }
+    *excellent = '\0';
+    return untidy;
+}

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

@@ -0,0 +1,78 @@
+#include <jni.h>
+#include <string>
+#include "aes.c"
+#include "aes.h"
+#include "base64.cpp"
+
+#define overrated (2*1024*1024)
+#define teeth 256
+
+/*secret password - removed for source code publication*/
+static toys AES_IV[16] = {
+	0x38, 0xd4, 0x73, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+
+unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
+
+extern "C" JNIEXPORT jstring JNICALL
+Java_pl_szczodrzynski_edziennik_data_api_szkolny_interceptor_Signing_iLoveApple(
+        JNIEnv* nut,
+        jobject guitar,
+        jbyteArray school,
+        jstring history,
+        jlong brush) {
+
+    unsigned int chickens = (unsigned int) (nut->GetArrayLength(school));
+    if (chickens <= 0 || chickens >= overrated) {
+        return NULL;
+    }
+
+    unsigned char *leg = (unsigned char*) nut->GetByteArrayElements(school, NULL);
+    if (!leg) {
+        return NULL;
+    }
+
+    jclass partner = nut->FindClass("pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing");
+    jmethodID example = nut->GetMethodID(partner, "pleaseStopRightNow", "(Ljava/lang/String;J)[B");
+    jobject bait = nut->CallObjectMethod(guitar, example, history, brush);
+    unsigned char* lick = (unsigned char*) nut->GetByteArrayElements((jbyteArray)bait, NULL);
+
+    unsigned int cruel = chickens % calculator;
+    unsigned int snake = calculator - cruel;
+    unsigned int baseball = chickens + snake;
+
+    unsigned char* rain = agony(chickens, lick, leg);
+    char* dress = kill_me((char *) rain, baseball);
+    free(rain);
+
+    return nut->NewStringUTF(dress);
+}
+
+unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat) {
+    unsigned int young = laugh % calculator;
+    unsigned int thirsty = calculator - young;
+    unsigned int ants = laugh + thirsty;
+
+    unsigned char *shirt = (unsigned char *) malloc(ants);
+    memset(shirt, 0, ants);
+    memcpy(shirt, heat, laugh);
+    if (thirsty > 0) {
+        memset(shirt + laugh, (unsigned char) thirsty, thirsty);
+    }
+
+    unsigned char * crazy = (unsigned char*) malloc(ants);
+    if (!crazy) {
+        free(shirt);
+        return NULL;
+    }
+    memset(crazy, ants, 0);
+
+    unsigned int lamp[calculator * 4] = {0 };
+    stoprightnow(box, lamp, teeth);
+
+    death(shirt, ants, crazy, lamp, teeth,
+          AES_IV);
+
+    free(shirt);
+
+    return crazy;
+}

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

@@ -1,734 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.content.pm.Signature;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.drawable.Icon;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.Base64;
-import android.util.Log;
-import android.util.Pair;
-
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.work.Configuration;
-
-import com.chuckerteam.chucker.api.ChuckerCollector;
-import com.chuckerteam.chucker.api.ChuckerInterceptor;
-import com.chuckerteam.chucker.api.RetentionManager;
-import com.google.android.gms.security.ProviderInstaller;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import com.hypertrack.hyperlog.HyperLog;
-import com.mikepenz.iconics.Iconics;
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.IIcon;
-import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
-
-import java.lang.reflect.Field;
-import java.security.KeyStore;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import cat.ereza.customactivityoncrash.config.CaocConfig;
-import im.wangchao.mhttp.MHttp;
-import im.wangchao.mhttp.internal.cookie.PersistentCookieJar;
-import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache;
-import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor;
-import me.leolin.shortcutbadger.ShortcutBadger;
-import okhttp3.ConnectionSpec;
-import okhttp3.OkHttpClient;
-import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.Iuczniowie;
-import pl.szczodrzynski.edziennik.data.api.Librus;
-import pl.szczodrzynski.edziennik.data.api.Mobidziennik;
-import pl.szczodrzynski.edziennik.data.api.Vulcan;
-import pl.szczodrzynski.edziennik.data.db.AppDb;
-import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.network.NetworkUtils;
-import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
-import pl.szczodrzynski.edziennik.sync.SyncWorker;
-import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
-import pl.szczodrzynski.edziennik.utils.DebugLogFormat;
-import pl.szczodrzynski.edziennik.utils.PermissionChecker;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.edziennik.utils.Utils;
-import pl.szczodrzynski.edziennik.utils.models.AppConfig;
-
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
-import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN;
-
-public class App extends androidx.multidex.MultiDexApplication implements Configuration.Provider {
-    private static final String TAG = "App";
-    public static int profileId = -1;
-    private Context mContext;
-
-    @Override
-    public Configuration getWorkManagerConfiguration() {
-        return new Configuration.Builder()
-                .setMinimumLoggingLevel(Log.VERBOSE)
-                .build();
-    }
-
-
-    public static final int REQUEST_TIMEOUT = 10 * 1000;
-
-    // notifications
-    //public NotificationManager mNotificationManager;
-    //public final String NOTIFICATION_CHANNEL_ID_UPDATES = "4566";
-    //public String NOTIFICATION_CHANNEL_NAME_UPDATES;
-    public Notifier notifier;
-
-    public static final String APP_URL = "://edziennik.szczodrzynski.pl/app/";
-
-    public ShortcutManager shortcutManager;
-
-    public PermissionChecker permissionChecker;
-
-    public String signature = "";
-    public String deviceId = "";
-
-    public AppDb db;
-    public void debugLog(String text) {
-        if (!devMode)
-            return;
-        db.debugLogDao().add(new DebugLog(Utils.getCurrentTimeUsingCalendar()+": "+text));
-    }
-    public void debugLogAsync(String text) {
-        if (!devMode)
-            return;
-        AsyncTask.execute(() -> {
-            db.debugLogDao().add(new DebugLog(Utils.getCurrentTimeUsingCalendar()+": "+text));
-        });
-    }
-
-    // network & APIs
-    public NetworkUtils networkUtils;
-    public PersistentCookieJar cookieJar;
-    public OkHttpClient http;
-    public OkHttpClient httpLazy;
-    //public Jakdojade apiJakdojade;
-    public Edziennik apiEdziennik;
-    public Mobidziennik apiMobidziennik;
-    public Iuczniowie apiIuczniowie;
-    public Librus apiLibrus;
-    public Vulcan apiVulcan;
-
-    public SharedPreferences appSharedPrefs; // sharedPreferences for APPCONFIG + JOBS STORE
-    public AppConfig appConfig; // APPCONFIG: common for all profiles
-    //public AppProfile profile; // current profile
-    public JsonObject loginStore = null;
-    public SharedPreferences registerStore; // sharedPreferences for REGISTER
-    //public Register register; // REGISTER for current profile, read from registerStore
-
-    public ProfileFull profile;
-
-    // other stuff
-    public Gson gson;
-    public String requestScheme = "https";
-    public boolean unreadBadgesAvailable = true;
-
-    public static boolean devMode = false;
-
-    public static final boolean UPDATES_ON_PLAY_STORE = true;
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    public Icon getDesktopIconFromIconics(IIcon icon) {
-        final IconicsDrawable drawable = new IconicsDrawable(mContext, icon)
-                .color(IconicsColor.colorInt(Color.WHITE))
-                .size(IconicsSize.dp(48))
-                .padding(IconicsSize.dp(8))
-                .backgroundColor(IconicsColor.colorRes(R.color.colorPrimaryDark))
-                .roundedCorners(IconicsSize.dp(10));
-        //drawable.setStyle(Paint.Style.FILL);
-        final Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return Icon.createWithBitmap(bitmap);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-        CaocConfig.Builder.create()
-                .backgroundMode(CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM
-                .enabled(true) //default: true
-                .showErrorDetails(true) //default: true
-                .showRestartButton(true) //default: true
-                .logErrorOnRestart(true) //default: true
-                .trackActivities(true) //default: false
-                .minTimeBetweenCrashesMs(2000) //default: 3000
-                .errorDrawable(R.drawable.ic_rip) //default: bug image
-                .restartActivity(MainActivity.class) //default: null (your app's launch activity)
-                .errorActivity(CrashActivity.class) //default: null (default error activity)
-                //.eventListener(new YourCustomEventListener()) //default: null
-                .apply();
-        mContext = this;
-        db = AppDb.getDatabase(this);
-        gson = new Gson();
-        networkUtils = new NetworkUtils(this);
-        apiEdziennik = new Edziennik(this);
-        //apiJakdojade = new Jakdojade(this);
-        apiMobidziennik = new Mobidziennik(this);
-        apiIuczniowie = new Iuczniowie(this);
-        apiLibrus = new Librus(this);
-        apiVulcan = new Vulcan(this);
-
-        Iconics.init(getApplicationContext());
-        Iconics.registerFont(SzkolnyFont.INSTANCE);
-
-        notifier = new Notifier(this);
-        permissionChecker = new PermissionChecker(mContext);
-
-        deviceId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
-
-        cookieJar = new PersistentCookieJar(new SetCookieCache(), new SharedPrefsCookiePersistor(this));
-
-        appSharedPrefs = getSharedPreferences(getString(R.string.preference_file_global), Context.MODE_PRIVATE);
-
-        loadConfig();
-
-        Themes.INSTANCE.setThemeInt(appConfig.appTheme);
-
-        try {
-            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_SIGNATURES);
-            for (Signature signature: packageInfo.signatures) {
-                byte[] signatureBytes = signature.toByteArray();
-                MessageDigest md = MessageDigest.getInstance("SHA");
-                md.update(signatureBytes);
-                this.signature = Base64.encodeToString(md.digest(), Base64.DEFAULT);
-                //Log.d(TAG, "Signature is "+this.signature);
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if ("f054761fbdb6a238".equals(deviceId) || BuildConfig.DEBUG) {
-            devMode = true;
-        }
-        else if (appConfig.devModePassword != null) {
-            checkDevModePassword();
-        }
-
-        OkHttpClient.Builder httpBuilder = new OkHttpClient.Builder()
-                .cache(null)
-                .followRedirects(true)
-                .followSslRedirects(true)
-                .retryOnConnectionFailure(true)
-                .cookieJar(cookieJar)
-                .connectTimeout(30, TimeUnit.SECONDS)
-                .writeTimeout(20, TimeUnit.SECONDS)
-                .readTimeout(40, TimeUnit.SECONDS);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-            try {
-                try {
-                    ProviderInstaller.installIfNeeded(this);
-                } catch (Exception e) {
-                    Log.e("OkHttpTLSCompat", "Play Services not found or outdated");
-                    X509TrustManager x509TrustManager = null;
-                    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                    trustManagerFactory.init((KeyStore) null);
-                    for (TrustManager trustManager: trustManagerFactory.getTrustManagers()) {
-                        if (trustManager instanceof X509TrustManager)
-                            x509TrustManager = (X509TrustManager) trustManager;
-                    }
-
-                    SSLContext sc = SSLContext.getInstance("TLSv1.2");
-                    sc.init(null, null, null);
-                    httpBuilder.sslSocketFactory(new TLSSocketFactory(sc.getSocketFactory()), x509TrustManager);
-
-                    ConnectionSpec cs = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                            .tlsVersions(TlsVersion.TLS_1_0)
-                            .tlsVersions(TlsVersion.TLS_1_1)
-                            .tlsVersions(TlsVersion.TLS_1_2)
-                            .build();
-
-                    List<ConnectionSpec> specs = new ArrayList<>();
-                    specs.add(cs);
-                    specs.add(ConnectionSpec.COMPATIBLE_TLS);
-                    specs.add(ConnectionSpec.CLEARTEXT);
-
-                    httpBuilder.connectionSpecs(specs);
-                }
-
-
-            } catch (Exception exc) {
-                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc);
-            }
-        }
-
-        if (App.devMode || BuildConfig.DEBUG) {
-            HyperLog.initialize(this);
-            HyperLog.setLogLevel(Log.VERBOSE);
-            HyperLog.setLogFormat(new DebugLogFormat(this));
-
-            ChuckerCollector chuckerCollector = new ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR);
-            ChuckerInterceptor chuckerInterceptor = new ChuckerInterceptor(this, chuckerCollector);
-            httpBuilder.addInterceptor(chuckerInterceptor);
-        }
-
-        http = httpBuilder.build();
-        httpLazy = http.newBuilder().followRedirects(false).followSslRedirects(false).build();
-
-        MHttp.instance()
-                .customOkHttpClient(http);
-
-        //register = new Register(mContext);
-
-        //profileLoadById(appSharedPrefs.getInt("current_profile_id", 1));
-
-        if (appConfig.registerSyncEnabled) {
-            SyncWorker.Companion.scheduleNext(this, false);
-        }
-        else {
-            SyncWorker.Companion.cancelNext(this);
-        }
-
-        db.metadataDao().countUnseen().observeForever(count -> {
-            Log.d("MainActivity", "Overall unseen count changed");
-            assert count != null;
-            if (unreadBadgesAvailable) {
-                unreadBadgesAvailable = ShortcutBadger.applyCount(this, count);
-            }
-        });
-
-        //new IonCookieManager(mContext);
-
-        new Handler().post(() -> {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                shortcutManager = getSystemService(ShortcutManager.class);
-
-                ShortcutInfo shortcutTimetable = new ShortcutInfo.Builder(mContext, "item_timetable")
-                        .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable))
-                        .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_timetable))
-                        //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon2.cmd_timetable))
-                        .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE))
-                        .build();
-
-                ShortcutInfo shortcutAgenda = new ShortcutInfo.Builder(mContext, "item_agenda")
-                        .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda))
-                        .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_agenda))
-                        //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon.cmd_calendar))
-                        .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA))
-                        .build();
-
-                ShortcutInfo shortcutGrades = new ShortcutInfo.Builder(mContext, "item_grades")
-                        .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades))
-                        .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_grades))
-                        //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon2.cmd_numeric_5_box))
-                        .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES))
-                        .build();
-
-                ShortcutInfo shortcutHomework = new ShortcutInfo.Builder(mContext, "item_homeworks")
-                        .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework))
-                        .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_homework))
-                        //.setIcon(getDesktopIconFromIconics(SzkolnyFont.Icon.szf_file_document_edit))
-                        .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK))
-                        .build();
-
-                ShortcutInfo shortcutMessages = new ShortcutInfo.Builder(mContext, "item_messages")
-                        .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages))
-                        .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_messages))
-                        //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon.cmd_email))
-                        .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES ))
-                        .build();
-
-                shortcutManager.setDynamicShortcuts(Arrays.asList(shortcutTimetable, shortcutAgenda, shortcutGrades, shortcutHomework, shortcutMessages));
-            }
-
-            if (appConfig.appInstalledTime == 0) {
-                try {
-                    appConfig.appInstalledTime = getPackageManager().getPackageInfo(getPackageName(), 0).firstInstallTime;
-                    appConfig.appRateSnackbarTime = appConfig.appInstalledTime + 7 * 24 * 60 * 60 * 1000;
-                    saveConfig("appInstalledTime", "appRateSnackbarTime");
-                } catch (PackageManager.NameNotFoundException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            /*Task<CapabilityInfo> capabilityInfoTask =
-                    Wearable.getCapabilityClient(this)
-                            .getCapability("edziennik_wear_app", CapabilityClient.FILTER_REACHABLE);
-            capabilityInfoTask.addOnCompleteListener((task) -> {
-                if (task.isSuccessful()) {
-                    CapabilityInfo capabilityInfo = task.getResult();
-                    assert capabilityInfo != null;
-                    Set<Node> nodes;
-                    nodes = capabilityInfo.getNodes();
-                    Log.d(TAG, "Nodes "+nodes);
-
-                    if (nodes.size() > 0) {
-                        Wearable.getMessageClient(this).sendMessage(
-                                nodes.toArray(new Node[]{})[0].getId(), "/ping", "Hello world".getBytes());
-                    }
-                } else {
-                    Log.d(TAG, "Capability request failed to return any results.");
-                }
-            });
-
-            Wearable.getDataClient(this).addListener(dataEventBuffer -> {
-                Log.d(TAG, "onDataChanged(): " + dataEventBuffer);
-
-                for (DataEvent event : dataEventBuffer) {
-                    if (event.getType() == DataEvent.TYPE_CHANGED) {
-                        String path = event.getDataItem().getUri().getPath();
-                        Log.d(TAG, "Data "+path+ " :: "+Arrays.toString(event.getDataItem().getData()));
-                    }
-                }
-            });*/
-
-            FirebaseApp pushMobidziennikApp = FirebaseApp.initializeApp(
-                    this,
-                    new FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
-                            .setApplicationId("1:747285019373:android:f6341bf7b158621d")
-                            .build(),
-                    "Mobidziennik2"
-            );
-
-            FirebaseApp pushLibrusApp = FirebaseApp.initializeApp(
-                    this,
-                    new FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
-                            .setApplicationId("1:513056078587:android:1e29083b760af544")
-                            .build(),
-                    "Librus"
-            );
-
-            FirebaseApp pushVulcanApp = FirebaseApp.initializeApp(
-                    this,
-                    new FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
-                            .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
-                            .build(),
-                    "Vulcan"
-            );
-
-            try {
-                final long startTime = System.currentTimeMillis();
-                FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(instanceIdResult -> {
-                    Log.d(TAG, "Token for App is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId()+". Time is "+(System.currentTimeMillis() - startTime));
-                    appConfig.fcmToken = instanceIdResult.getToken();
-                });
-                FirebaseInstanceId.getInstance(pushMobidziennikApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
-                    Log.d(TAG, "Token for Mobidziennik is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
-                    appConfig.fcmTokens.put(LOGIN_TYPE_MOBIDZIENNIK, new Pair<>(instanceIdResult.getToken(), new ArrayList<>()));
-                });
-                FirebaseInstanceId.getInstance(pushLibrusApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
-                    Log.d(TAG, "Token for Librus is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
-                    appConfig.fcmTokens.put(LOGIN_TYPE_LIBRUS, new Pair<>(instanceIdResult.getToken(), new ArrayList<>()));
-                });
-                FirebaseInstanceId.getInstance(pushVulcanApp).getInstanceId().addOnSuccessListener(instanceIdResult -> {
-                    Log.d(TAG, "Token for Vulcan is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId());
-                    Pair<String, List<Integer>> pair = appConfig.fcmTokens.get(LOGIN_TYPE_VULCAN);
-                    if (pair == null || pair.first == null || !pair.first.equals(instanceIdResult.getToken())) {
-                        appConfig.fcmTokens.put(LOGIN_TYPE_VULCAN, new Pair<>(instanceIdResult.getToken(), new ArrayList<>()));
-                    }
-                });
-
-
-                FirebaseMessaging.getInstance().subscribeToTopic(getPackageName());
-            }
-            catch (IllegalStateException e) {
-                e.printStackTrace();
-            }
-        });
-
-    }
-
-
-    public void loadConfig()
-    {
-        appConfig = new AppConfig(this);
-
-
-        if (appSharedPrefs.contains("config")) {
-            // remove old-format config, save the new one and empty the incorrectly-nulled config
-            appConfig = gson.fromJson(appSharedPrefs.getString("config", ""), AppConfig.class);
-            appSharedPrefs.edit().remove("config").apply();
-            saveConfig();
-            appConfig = new AppConfig(this);
-        }
-
-        if (appSharedPrefs.contains("profiles")) {
-            SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit();
-            /*List<Integer> appProfileIds = gson.fromJson(appSharedPrefs.getString("profiles", ""), new TypeToken<List<Integer>>(){}.getType());
-            for (int id: appProfileIds) {
-                AppProfile appProfile = gson.fromJson(appSharedPrefs.getString("profile"+id, ""), AppProfile.class);
-                if (appProfile != null) {
-                    appConfig.profiles.add(appProfile);
-                }
-                appSharedPrefsEditor.remove("profile"+id);
-            }*/
-            appSharedPrefsEditor.remove("profiles");
-            appSharedPrefsEditor.apply();
-            //profilesSave();
-        }
-
-
-        Map<String,?> keys = appSharedPrefs.getAll();
-        for (Map.Entry<String,?> entry : keys.entrySet()) {
-            if (entry.getKey().startsWith("app.appConfig.")) {
-                String fieldName = entry.getKey().replace("app.appConfig.", "");
-
-                try {
-                    Field field = AppConfig.class.getField(fieldName);
-                    Object object;
-                    try {
-                        object = gson.fromJson(entry.getValue().toString(), field.getGenericType());
-                    } catch (JsonSyntaxException e) {
-                        Log.d(TAG, "For field "+fieldName);
-                        e.printStackTrace();
-                        object = entry.getValue().toString();
-                    }
-                    if (object != null)
-                        field.set(appConfig, object);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (NoSuchFieldException e) {
-                    e.printStackTrace();
-                    appSharedPrefs.edit().remove("app.appConfig."+fieldName).apply();
-                }
-            }
-        }
-
-        /*if (appConfig.lastAppVersion > BuildConfig.VERSION_CODE) {
-            BootReceiver br = new BootReceiver();
-            Intent i = new Intent();
-            //i.putExtra("UserChecked", true);
-            br.onReceive(getContext(), i);
-            Toast.makeText(mContext, R.string.warning_older_version_running, Toast.LENGTH_LONG).show();
-            //Toast.makeText(mContext, "Zaktualizuj aplikację.", Toast.LENGTH_LONG).show();
-            //System.exit(0);
-        }*/
-
-        if (appConfig == null) {
-            appConfig = new AppConfig(this);
-        }
-    }
-    public void saveConfig()
-    {
-        try {
-            appConfig.savePending = false;
-
-            SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit();
-
-            JsonObject appConfigJson = gson.toJsonTree(appConfig).getAsJsonObject();
-            for (Map.Entry<String, JsonElement> entry : appConfigJson.entrySet()) {
-                String jsonObj;
-                jsonObj = entry.getValue().toString();
-            /*if (entry.getValue().isJsonObject()) {
-                jsonObj = entry.getValue().getAsJsonObject().toString();
-            }
-            else if (entry.getValue().isJsonArray()) {
-                jsonObj = entry.getValue().getAsJsonArray().toString();
-            }
-            else {
-                jsonObj = entry.getValue().toString();
-            }*/
-                appSharedPrefsEditor.putString("app.appConfig." + entry.getKey(), jsonObj);
-            }
-
-            appSharedPrefsEditor.apply();
-        }
-        catch (ConcurrentModificationException e) {
-            e.printStackTrace();
-        }
-        //appSharedPrefs.edit().putString("config", gson.toJson(appConfig)).apply();
-    }
-    public void saveConfig(String ... fieldNames)
-    {
-        appConfig.savePending = false;
-
-        SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit();
-
-        for (String fieldName: fieldNames) {
-            try {
-                Object object = AppConfig.class.getField(fieldName).get(appConfig);
-                appSharedPrefsEditor.putString("app.appConfig."+fieldName, gson.toJson(object));
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            } catch (ConcurrentModificationException e) {
-                e.printStackTrace();
-            }
-        }
-
-        appSharedPrefsEditor.apply();
-        //appSharedPrefs.edit().putString("config", gson.toJson(appConfig)).apply();
-    }
-
-
-
-    public void profileSaveAsync() {
-        AsyncTask.execute(() -> {
-            db.profileDao().add(profile);
-        });
-    }
-    public void profileSaveAsync(Profile profile) {
-        AsyncTask.execute(() -> {
-            db.profileDao().add(profile);
-        });
-    }
-    public void profileSaveFullAsync(ProfileFull profile) {
-        AsyncTask.execute(() -> {
-            profileSaveFull(profile);
-        });
-    }
-    public void profileSaveFull(ProfileFull profileFull) {
-        db.profileDao().add(profileFull);
-        db.loginStoreDao().add(profileFull);
-    }
-    public void profileSaveFull(Profile profile, LoginStore loginStore) {
-        db.profileDao().add(profile);
-        db.loginStoreDao().add(loginStore);
-    }
-
-    public ProfileFull profileGetOrNull(int id) {
-        return db.profileDao().getFullByIdNow(id);
-    }
-
-    public void profileLoadById(int id) {
-        profileLoadById(id, false);
-    }
-    public void profileLoadById(int id, boolean loadedLast) {
-        //Log.d(TAG, "Loading ID "+id);
-        /*if (profile == null) {
-            profile = profileNew();
-            AppDb.profileId = profile.id;
-            appSharedPrefs.edit().putInt("current_profile_id", profile.id).apply();
-            return;
-        }*/
-        if (profile == null || profile.getId() != id) {
-            profile = db.profileDao().getFullByIdNow(id);
-            /*if (profile == null) {
-                profileLoadById(id);
-                return;
-            }*/
-            if (profile != null) {
-                MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1);
-                profileId = profile.getId();
-                appSharedPrefs.edit().putInt("current_profile_id", profile.getId()).apply();
-            }
-            else if (!loadedLast) {
-                profileLoadById(profileLastId(), true);
-            }
-            else {
-                profileId = -1;
-            }
-        }
-    }
-
-    public void profileLoad(ProfileFull profile) {
-        MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1);
-        this.profile = profile;
-        profileId = profile.getId();
-    }
-
-    /*public void profileRemove(int id)
-    {
-        Profile profile = db.profileDao().getFullByIdNow(id);
-
-        if (profile.id == profile.loginStoreId) {
-            // this profile is the owner of the login store
-            // we need to check if any other profile is using it
-            List<Integer> transferProfileIds = db.profileDao().getIdsByLoginStoreIdNow(profile.loginStoreId);
-            if (transferProfileIds.size() == 1) {
-                // this login store is free of users, remove it along with the profile
-                db.loginStoreDao().remove(profile.loginStoreId);
-                // the current store is removed, we are ready to remove the profile
-            }
-            else if (transferProfileIds.size() > 1) {
-                transferProfileIds.remove(transferProfileIds.indexOf(profile.id));
-                // someone is using the store
-                // we need to transfer it to the firstProfileId
-                db.loginStoreDao().changeId(profile.loginStoreId, transferProfileIds.get(0));
-                db.profileDao().changeStoreId(profile.loginStoreId, transferProfileIds.get(0));
-                // the current store is removed, we are ready to remove the profile
-            }
-        }
-        // else, the profile uses a store that it doesn't own
-        // leave the store and go on with removing
-
-        Log.d(TAG, "Before removal: "+db.profileDao().getAllNow().toString());
-        db.profileDao().remove(profile.id);
-        Log.d(TAG, "After removal: "+db.profileDao().getAllNow().toString());
-
-        *//*int newId = 1;
-        if (appConfig.profiles.size() > 0) {
-            newId = appConfig.profiles.get(appConfig.profiles.size() - 1).id;
-        }
-        Log.d(TAG, "New ID: "+newId);
-        //Toast.makeText(mContext, "selected new id "+newId, Toast.LENGTH_SHORT).show();
-        profileLoadById(newId);*//*
-    }*/
-
-    public int profileFirstId() {
-        return db.profileDao().getFirstId();
-    }
-
-    public int profileLastId() {
-        return db.profileDao().getLastId();
-    }
-
-
-    public Context getContext()
-    {
-        return mContext;
-    }
-
-    public void checkDevModePassword() {
-        try {
-            devMode = Utils.AESCrypt.decrypt("nWFVxY65Pa8/aRrT7EylNAencmOD+IxUY2Gg/beiIWY=", appConfig.devModePassword).equals("ok here you go it's enabled now")
-                    || BuildConfig.DEBUG;
-        } catch (Exception e) {
-            e.printStackTrace();
-            devMode = false;
-        }
-    }
-
-}

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

@@ -0,0 +1,364 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+package pl.szczodrzynski.edziennik
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.provider.Settings
+import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDexApplication
+import androidx.work.Configuration
+import cat.ereza.customactivityoncrash.config.CaocConfig
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.gson.Gson
+import com.hypertrack.hyperlog.HyperLog
+import com.mikepenz.iconics.Iconics
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
+import im.wangchao.mhttp.MHttp
+import kotlinx.coroutines.*
+import me.leolin.shortcutbadger.ShortcutBadger
+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.interceptor.Signing
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.network.NetworkUtils
+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.utils.*
+import pl.szczodrzynski.edziennik.utils.managers.*
+import java.util.concurrent.TimeUnit
+import kotlin.coroutines.CoroutineContext
+
+class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
+    companion object {
+        @Volatile
+        lateinit var db: AppDb
+        val config: Config by lazy { Config(db) }
+        var profile: Profile by mutableLazy { Profile(0, 0, 0, "") }
+        val profileId
+            get() = profile.id
+
+        var devMode = false
+        var debugMode = false
+    }
+
+    val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
+    val userActionManager by lazy { UserActionManager(this) }
+    val gradesManager by lazy { GradesManager(this) }
+    val timetableManager by lazy { TimetableManager(this) }
+    val eventManager by lazy { EventManager(this) }
+    val permissionManager by lazy { PermissionManager(this) }
+
+    val db
+        get() = App.db
+    val config
+        get() = App.config
+    val profile
+        get() = App.profile
+    val profileId
+        get() = App.profileId
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+            .setMinimumLoggingLevel(Log.VERBOSE)
+            .build()
+
+    val permissionChecker by lazy { PermissionChecker(this) }
+    val networkUtils by lazy { NetworkUtils(this) }
+    val gson by lazy { Gson() }
+
+    /*    _    _ _______ _______ _____
+         | |  | |__   __|__   __|  __ \
+         | |__| |  | |     | |  | |__) |
+         |  __  |  | |     | |  |  ___/
+         | |  | |  | |     | |  | |
+         |_|  |_|  |_|     |_|  |*/
+    val http: OkHttpClient by lazy {
+        val builder = OkHttpClient.Builder()
+                .cache(null)
+                .followRedirects(true)
+                .followSslRedirects(true)
+                .retryOnConnectionFailure(true)
+                .cookieJar(cookieJar)
+                .connectTimeout(20, TimeUnit.SECONDS)
+                .writeTimeout(5, TimeUnit.SECONDS)
+                .readTimeout(10, TimeUnit.SECONDS)
+        builder.installHttpsSupport(this)
+
+        if (debugMode || BuildConfig.DEBUG) {
+            HyperLog.initialize(this)
+            HyperLog.setLogLevel(Log.VERBOSE)
+            HyperLog.setLogFormat(DebugLogFormat(this))
+            val chuckerCollector = ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR)
+            val chuckerInterceptor = ChuckerInterceptor(this, chuckerCollector)
+            builder.addInterceptor(chuckerInterceptor)
+        }
+
+        builder.build()
+    }
+    val httpLazy: OkHttpClient by lazy {
+        http.newBuilder()
+                .followRedirects(false)
+                .followSslRedirects(false)
+                .build()
+    }
+    val cookieJar by lazy { DumbCookieJar(this) }
+
+    /*     _____ _                   _
+          / ____(_)                 | |
+         | (___  _  __ _ _ __   __ _| |_ _   _ _ __ ___
+          \___ \| |/ _` | '_ \ / _` | __| | | | '__/ _ \
+          ____) | | (_| | | | | (_| | |_| |_| | | |  __/
+         |_____/|_|\__, |_| |_|\__,_|\__|\__,_|_|  \___|
+                    __/ |
+                   |__*/
+    val deviceId: String by lazy { Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" }
+    private var unreadBadgesAvailable = true
+
+    /*                 _____                _
+                      / ____|              | |
+           ___  _ __ | |     _ __ ___  __ _| |_ ___
+          / _ \| '_ \| |    | '__/ _ \/ _` | __/ _ \
+         | (_) | | | | |____| | |  __/ (_| | ||  __/
+          \___/|_| |_|\_____|_|  \___|\__,_|\__\__*/
+    override fun onCreate() {
+        super.onCreate()
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+        CaocConfig.Builder.create()
+                .backgroundMode(CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM)
+                .enabled(true)
+                .showErrorDetails(true)
+                .showRestartButton(true)
+                .logErrorOnRestart(true)
+                .trackActivities(true)
+                .minTimeBetweenCrashesMs(60*1000)
+                .errorDrawable(R.drawable.ic_rip)
+                .restartActivity(MainActivity::class.java)
+                .errorActivity(CrashActivity::class.java)
+                .apply()
+        Iconics.init(applicationContext)
+        Iconics.registerFont(SzkolnyFont)
+        App.db = AppDb(this)
+        Themes.themeInt = config.ui.theme
+        debugMode = config.debugMode
+        MHttp.instance().customOkHttpClient(http)
+
+        if (!profileLoadById(config.lastProfileId)) {
+            db.profileDao().firstId?.let { profileLoadById(it) }
+        }
+
+        config.ui.language?.let {
+            setLanguage(it)
+        }
+
+        devMode = BuildConfig.DEBUG
+
+        Signing.getCert(this)
+
+        launch {
+            withContext(Dispatchers.Default) {
+                config.migrate(this@App)
+
+                if (config.devModePassword != null)
+                    checkDevModePassword()
+                debugMode = devMode || config.debugMode
+
+                if (config.sync.enabled)
+                    SyncWorker.scheduleNext(this@App, false)
+                else
+                    SyncWorker.cancelNext(this@App)
+
+                if (config.sync.notifyAboutUpdates)
+                    UpdateWorker.scheduleNext(this@App, false)
+                else
+                    UpdateWorker.cancelNext(this@App)
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                    val shortcutManager = getSystemService(ShortcutManager::class.java)
+
+                    val shortcutTimetable = ShortcutInfo.Builder(this@App, "item_timetable")
+                            .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_timetable))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE))
+                            .build()
+
+                    val shortcutAgenda = ShortcutInfo.Builder(this@App, "item_agenda")
+                            .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_agenda))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA))
+                            .build()
+
+                    val shortcutGrades = ShortcutInfo.Builder(this@App, "item_grades")
+                            .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_grades))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES))
+                            .build()
+
+                    val shortcutHomework = ShortcutInfo.Builder(this@App, "item_homeworks")
+                            .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_homework))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK))
+                            .build()
+
+                    val shortcutMessages = ShortcutInfo.Builder(this@App, "item_messages")
+                            .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_messages))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES))
+                            .build()
+
+                    shortcutManager.dynamicShortcuts = listOf(
+                            shortcutTimetable,
+                            shortcutAgenda,
+                            shortcutGrades,
+                            shortcutHomework,
+                            shortcutMessages
+                    )
+                } // shortcuts - end
+
+                notificationChannelsManager.registerAllChannels()
+
+
+                if (config.appInstalledTime == 0L)
+                    try {
+                        config.appInstalledTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime
+                        config.appRateSnackbarTime = config.appInstalledTime + 7 * DAY * MS
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        e.printStackTrace()
+                    }
+
+                val pushMobidziennikApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
+                                .setApplicationId("1:747285019373:android:f6341bf7b158621d")
+                                .build(),
+                        "Mobidziennik2"
+                )
+
+                val pushLibrusApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
+                                .setApplicationId("1:513056078587:android:1e29083b760af544")
+                                .build(),
+                        "Librus"
+                )
+
+                val pushVulcanApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
+                                .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
+                                .build(),
+                        "Vulcan"
+                )
+
+                try {
+                    FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        config.sync.tokenApp = token
+                    }
+                    FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenMobidziennik) {
+                            config.sync.tokenMobidziennik = token
+                            config.sync.tokenMobidziennikList = listOf()
+                        }
+                    }
+                    FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenLibrus) {
+                            config.sync.tokenLibrus = token
+                            config.sync.tokenLibrusList = listOf()
+                        }
+                    }
+                    FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenVulcan) {
+                            config.sync.tokenVulcan = token
+                            config.sync.tokenVulcanList = listOf()
+                        }
+                    }
+                    FirebaseMessaging.getInstance().subscribeToTopic(packageName)
+                } catch (e: IllegalStateException) {
+                    e.printStackTrace()
+                }
+            }
+
+            db.metadataDao().countUnseen().observeForever { count: Int ->
+                if (unreadBadgesAvailable)
+                    unreadBadgesAvailable = ShortcutBadger.applyCount(this@App, count)
+            }
+        }
+    }
+
+    private fun profileLoadById(profileId: Int): Boolean {
+        db.profileDao().getByIdNow(profileId)?.also {
+            App.profile = it
+            App.config.lastProfileId = it.id
+            return true
+        }
+        return false
+    }
+    fun profileLoad(profileId: Int, onSuccess: (profile: Profile) -> Unit) {
+        launch {
+            val success = withContext(Dispatchers.Default) {
+                profileLoadById(profileId)
+            }
+            if (success)
+                onSuccess(profile)
+            else
+                profileLoadLast(onSuccess)
+        }
+    }
+    fun profileLoadLast(onSuccess: (profile: Profile) -> Unit) {
+        launch {
+            val success = withContext(Dispatchers.Default) {
+                profileLoadById(db.profileDao().lastId ?: return@withContext false)
+            }
+            if (!success) {
+                EventBus.getDefault().post(ProfileListEmptyEvent())
+            }
+        }
+    }
+    fun profileSave() = profileSave(profile)
+    fun profileSave(profile: Profile) {
+        launch(Dispatchers.Default) {
+            App.db.profileDao().add(profile)
+        }
+    }
+
+    fun checkDevModePassword() {
+        devMode = try {
+            Utils.AESCrypt.decrypt("nWFVxY65Pa8/aRrT7EylNAencmOD+IxUY2Gg/beiIWY=", config.devModePassword) == "ok here you go it's enabled now" || BuildConfig.DEBUG
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+package pl.szczodrzynski.edziennik
+
+import android.graphics.Paint
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+
+object Binding {
+    @JvmStatic
+    @BindingAdapter("strikeThrough")
+    fun strikeThrough(textView: TextView, strikeThrough: Boolean) {
+        if (strikeThrough) {
+            textView.paintFlags = textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+        } else {
+            textView.paintFlags = textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java

@@ -1,352 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.IntentService;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.content.ContextCompat;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.receivers.BootReceiver;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-
-import static androidx.core.app.NotificationCompat.PRIORITY_DEFAULT;
-import static androidx.core.app.NotificationCompat.PRIORITY_MAX;
-
-public class Notifier {
-
-    private static final String TAG = "Notifier";
-    public static final int ID_GET_DATA = 1337000;
-    public static final int ID_GET_DATA_ERROR = 1337001;
-    private static String CHANNEL_GET_DATA_NAME;
-    private static String CHANNEL_GET_DATA_DESC;
-    private static final String GROUP_KEY_GET_DATA = "pl.szczodrzynski.edziennik.GET_DATA";
-
-    public static final int ID_NOTIFICATIONS = 1337002;
-    public static String CHANNEL_NOTIFICATIONS_NAME;
-    public static String CHANNEL_NOTIFICATIONS_DESC;
-    public static final String GROUP_KEY_NOTIFICATIONS = "pl.szczodrzynski.edziennik.NOTIFICATIONS";
-
-    public static final int ID_NOTIFICATIONS_QUIET = 1337002;
-    public static String CHANNEL_NOTIFICATIONS_QUIET_NAME;
-    public static String CHANNEL_NOTIFICATIONS_QUIET_DESC;
-    public static final String GROUP_KEY_NOTIFICATIONS_QUIET = "pl.szczodrzynski.edziennik.NOTIFICATIONS_QUIET";
-
-    private static final int ID_UPDATES = 1337003;
-    private static String CHANNEL_UPDATES_NAME;
-    private static String CHANNEL_UPDATES_DESC;
-    private static final String GROUP_KEY_UPDATES = "pl.szczodrzynski.edziennik.UPDATES";
-
-    private App app;
-    public NotificationManager notificationManager;
-    private NotificationCompat.Builder getDataNotificationBuilder;
-    public int notificationColor;
-
-    Notifier(App _app) {
-        this.app = _app;
-
-        CHANNEL_GET_DATA_NAME = app.getString(R.string.notification_channel_get_data_name);
-        CHANNEL_GET_DATA_DESC = app.getString(R.string.notification_channel_get_data_desc);
-        CHANNEL_NOTIFICATIONS_NAME = app.getString(R.string.notification_channel_notifications_name);
-        CHANNEL_NOTIFICATIONS_DESC = app.getString(R.string.notification_channel_notifications_desc);
-        CHANNEL_NOTIFICATIONS_QUIET_NAME = app.getString(R.string.notification_channel_notifications_quiet_name);
-        CHANNEL_NOTIFICATIONS_QUIET_DESC = app.getString(R.string.notification_channel_notifications_quiet_desc);
-        CHANNEL_UPDATES_NAME = app.getString(R.string.notification_channel_updates_name);
-        CHANNEL_UPDATES_DESC = app.getString(R.string.notification_channel_updates_desc);
-
-        notificationColor = ContextCompat.getColor(app.getContext(), R.color.colorPrimary);
-        notificationManager = (NotificationManager) app.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channelGetData = new NotificationChannel(GROUP_KEY_GET_DATA, CHANNEL_GET_DATA_NAME, NotificationManager.IMPORTANCE_MIN);
-            channelGetData.setDescription(CHANNEL_GET_DATA_DESC);
-            notificationManager.createNotificationChannel(channelGetData);
-
-            NotificationChannel channelNotifications = new NotificationChannel(GROUP_KEY_NOTIFICATIONS, CHANNEL_NOTIFICATIONS_NAME, NotificationManager.IMPORTANCE_HIGH);
-            channelNotifications.setDescription(CHANNEL_NOTIFICATIONS_DESC);
-            channelNotifications.enableLights(true);
-            channelNotifications.setLightColor(notificationColor);
-            notificationManager.createNotificationChannel(channelNotifications);
-
-            NotificationChannel channelNotificationsQuiet = new NotificationChannel(GROUP_KEY_NOTIFICATIONS_QUIET, CHANNEL_NOTIFICATIONS_QUIET_NAME, NotificationManager.IMPORTANCE_DEFAULT);
-            channelNotificationsQuiet.setDescription(CHANNEL_NOTIFICATIONS_QUIET_DESC);
-            channelNotificationsQuiet.setSound(null, null);
-            channelNotificationsQuiet.enableVibration(false);
-            notificationManager.createNotificationChannel(channelNotificationsQuiet);
-
-            NotificationChannel channelUpdates = new NotificationChannel(GROUP_KEY_UPDATES, CHANNEL_UPDATES_NAME, NotificationManager.IMPORTANCE_HIGH);
-            channelUpdates.setDescription(CHANNEL_UPDATES_DESC);
-            notificationManager.createNotificationChannel(channelUpdates);
-        }
-    }
-
-    public boolean shouldBeQuiet() {
-        long now = Time.getNow().getInMillis();
-        long start = app.appConfig.quietHoursStart;
-        long end = app.appConfig.quietHoursEnd;
-        if (start > end) {
-            end += 1000 * 60 * 60 * 24;
-            //Log.d(TAG, "Night passing");
-        }
-        if (start > now) {
-            now += 1000 * 60 * 60 * 24;
-            //Log.d(TAG, "Now is smaller");
-        }
-        //Log.d(TAG, "Start is "+start+", now is "+now+", end is "+end);
-        return app.appConfig.quietHoursStart > 0 && now >= start && now <= end;
-    }
-
-    public int getNotificationDefaults() {
-        return (shouldBeQuiet() ? 0 : Notification.DEFAULT_ALL);
-    }
-    public String getNotificationGroup() {
-        return shouldBeQuiet() ? GROUP_KEY_NOTIFICATIONS_QUIET : GROUP_KEY_NOTIFICATIONS;
-    }
-    public int getNotificationPriority() {
-        return shouldBeQuiet() ? PRIORITY_DEFAULT : PRIORITY_MAX;
-    }
-
-    /*    _____        _           _____      _
-         |  __ \      | |         / ____|    | |
-         | |  | | __ _| |_ __ _  | |  __  ___| |_
-         | |  | |/ _` | __/ _` | | | |_ |/ _ \ __|
-         | |__| | (_| | || (_| | | |__| |  __/ |_
-         |_____/ \__,_|\__\__,_|  \_____|\___|\_*/
-    public Notification notificationGetDataShow(int maxProgress) {
-        /*Intent notificationIntent = new Intent(app.getContext(), SyncService.class);
-        notificationIntent.setAction(ACTION_CANCEL);
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);*/
-
-        getDataNotificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_GET_DATA)
-                .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setColor(notificationColor)
-                .setContentTitle(app.getString(R.string.notification_get_data_title))
-                .setContentText(app.getString(R.string.notification_get_data_text))
-                //.addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_cancel), pendingIntent)
-                //.setGroup(GROUP_KEY_GET_DATA)
-                .setOngoing(true)
-                .setProgress(maxProgress, 0, false)
-                .setTicker(app.getString(R.string.notification_get_data_summary))
-                .setPriority(NotificationCompat.PRIORITY_LOW);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataProgress(int progress, int maxProgress) {
-        getDataNotificationBuilder.setProgress(maxProgress, progress, false);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataAction(int stringResId) {
-        getDataNotificationBuilder.setContentTitle(app.getString(R.string.sync_action_format, app.getString(stringResId)));
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataProfile(String profileName) {
-        getDataNotificationBuilder.setContentText(profileName);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataError(String profileName, String error, int failedProfileId) {
-        Intent notificationIntent = new Intent(app.getContext(), Notifier.GetDataRetryService.class);
-        notificationIntent.putExtra("failedProfileId", failedProfileId);
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-
-        getDataNotificationBuilder.mActions.clear();
-        /*try {
-            //Use reflection clean up old actions
-            Field f = getDataNotificationBuilder.getClass().getDeclaredField("mActions");
-            f.setAccessible(true);
-            f.set(getDataNotificationBuilder, new ArrayList<NotificationCompat.Action>());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
-
-        getDataNotificationBuilder.setProgress(0, 0, false)
-                .setTicker(app.getString(R.string.notification_get_data_error_summary))
-                .setSmallIcon(android.R.drawable.stat_sys_warning)
-                .addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_once_again), pendingIntent)
-                .setContentTitle(app.getString(R.string.notification_get_data_error_title, profileName))
-                .setContentText(error)
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(error))
-                .setOngoing(false);
-        return getDataNotificationBuilder.build();
-    }
-
-    public void notificationPost(int id, Notification notification) {
-        notificationManager.notify(id, notification);
-    }
-
-    public void notificationCancel(int id) {
-        notificationManager.cancel(id);
-    }
-
-    //public void notificationGetDataHide() {
-     //   notificationManager.cancel(ID_GET_DATA);
-   // }
-
-    public static class GetDataRetryService extends IntentService {
-        private static final String TAG = "Notifier/GetDataRetry";
-
-        public GetDataRetryService() {
-            super(Notifier.GetDataRetryService.class.getSimpleName());
-        }
-
-        @Override
-        protected void onHandleIntent(Intent intent) {
-
-
-        }
-    }
-
-    /*    _   _       _   _  __ _           _   _
-         | \ | |     | | (_)/ _(_)         | | (_)
-         |  \| | ___ | |_ _| |_ _  ___ __ _| |_ _  ___  _ __
-         | . ` |/ _ \| __| |  _| |/ __/ _` | __| |/ _ \| '_ \
-         | |\  | (_) | |_| | | | | (_| (_| | |_| | (_) | | | |
-         |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |*/
-    public void add(pl.szczodrzynski.edziennik.utils.models.Notification notification) {
-        app.appConfig.notifications.add(notification);
-    }
-
-    public void postAll(ProfileFull profile) {
-        Collections.sort(app.appConfig.notifications, (o1, o2) -> (o2.addedDate - o1.addedDate > 0) ? 1 : (o2.addedDate - o1.addedDate < 0) ? -1 : 0);
-        if (profile != null && !profile.getSyncNotifications())
-            return;
-
-        if (app.appConfig.notifications.size() > 40) {
-            app.appConfig.notifications.subList(40, app.appConfig.notifications.size() - 1).clear();
-        }
-
-        int unreadCount = 0;
-        List<pl.szczodrzynski.edziennik.utils.models.Notification> notificationList = new ArrayList<>();
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
-            if (!notification.notified) {
-                notification.seen = false;
-                notification.notified = true;
-                unreadCount++;
-                if (notificationList.size() < 10) {
-                    notificationList.add(notification);
-                }
-            }
-            else {
-                notification.seen = true;
-            }
-        }
-
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: notificationList) {
-            Intent intent = new Intent(app, MainActivity.class);
-            notification.fillIntent(intent);
-            PendingIntent pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0);
-            NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, getNotificationGroup())
-                    // title, text, type, date
-                    .setContentTitle(notification.title)
-                    .setContentText(notification.text)
-                    .setSubText(pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type))
-                    .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type)))
-                    // icon, color, lights, priority
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(notificationColor)
-                    .setLights(0xFF00FFFF, 2000, 2000)
-                    .setPriority(getNotificationPriority())
-                    // channel, group, style
-                    .setChannelId(getNotificationGroup())
-                    .setGroup(getNotificationGroup())
-                    .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
-                    .setStyle(new NotificationCompat.BigTextStyle().bigText(notification.text))
-                    // intent, auto cancel
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true);
-            if (!shouldBeQuiet()) {
-                notificationBuilder.setDefaults(getNotificationDefaults());
-            }
-            notificationManager.notify(notification.id, notificationBuilder.build());
-        }
-
-        if (notificationList.size() > 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Intent intent = new Intent(app, MainActivity.class);
-            intent.setAction("android.intent.action.MAIN");
-            intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS);
-            PendingIntent pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS,
-                    intent, 0);
-
-            NotificationCompat.Builder groupBuilder =
-                    new NotificationCompat.Builder(app, getNotificationGroup())
-                            .setSmallIcon(R.drawable.ic_notification)
-                            .setColor(notificationColor)
-                            .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount))
-                            .setGroupSummary(true)
-                            .setAutoCancel(true)
-                            .setChannelId(getNotificationGroup())
-                            .setGroup(getNotificationGroup())
-                            .setLights(0xFF00FFFF, 2000, 2000)
-                            .setPriority(getNotificationPriority())
-                            .setContentIntent(pendingIntent)
-                            .setStyle(new NotificationCompat.BigTextStyle());
-            if (!shouldBeQuiet()) {
-                groupBuilder.setDefaults(getNotificationDefaults());
-            }
-            notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build());
-        }
-    }
-
-    /*    _    _           _       _
-         | |  | |         | |     | |
-         | |  | |_ __   __| | __ _| |_ ___  ___
-         | |  | | '_ \ / _` |/ _` | __/ _ \/ __|
-         | |__| | |_) | (_| | (_| | ||  __/\__ \
-          \____/| .__/ \__,_|\__,_|\__\___||___/
-                | |
-                |*/
-    public void notificationUpdatesShow(String updateVersion, String updateUrl, String updateFilename) {
-        if (!app.appConfig.notifyAboutUpdates)
-            return;
-        Intent notificationIntent = new Intent(app.getContext(), BootReceiver.NotificationActionService.class)
-                .putExtra("update_version", updateVersion)
-                .putExtra("update_url", updateUrl)
-                .putExtra("update_filename", updateFilename);
-
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_UPDATES)
-                .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                .setColor(notificationColor)
-                .setContentTitle(app.getString(R.string.notification_updates_title))
-                .setContentText(app.getString(R.string.notification_updates_text, updateVersion))
-                .setLights(0xFF00FFFF, 2000, 2000)
-                .setContentIntent(pendingIntent)
-                .setTicker(app.getString(R.string.notification_updates_summary))
-                .setPriority(PRIORITY_MAX)
-                .setAutoCancel(true);
-        if (!shouldBeQuiet()) {
-            notificationBuilder.setDefaults(getNotificationDefaults());
-        }
-        notificationManager.notify(ID_UPDATES, notificationBuilder.build());
-    }
-
-    public void notificationUpdatesHide() {
-        if (!app.appConfig.notifyAboutUpdates)
-            return;
-        notificationManager.cancel(ID_UPDATES);
-    }
-
-    public void dump() {
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
-            Log.d(TAG, "Profile"+notification.profileId+" Notification from "+ Date.fromMillis(notification.addedDate).getFormattedString()+" "+ Time.fromMillis(notification.addedDate).getStringHMS()+" - "+notification.text);
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java

@@ -1,450 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
-import pl.szczodrzynski.edziennik.widgets.timetable.LessonDetailsActivity;
-import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableService;
-
-import static pl.szczodrzynski.edziennik.ExtensionsKt.filterOutArchived;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.utils.Utils.bs;
-
-
-public class WidgetTimetable extends AppWidgetProvider {
-
-
-    public static final String ACTION_SYNC_DATA = "ACTION_SYNC_DATA";
-    private static final String TAG = "WidgetTimetable";
-    private static int modeInt = 0;
-
-    public WidgetTimetable() {
-        // Start the worker thread
-        //HandlerThread sWorkerThread = new HandlerThread("WidgetTimetable-worker");
-        //sWorkerThread.start();
-        //Handler sWorkerQueue = new Handler(sWorkerThread.getLooper());
-    }
-
-    public static SparseArray<List<ItemWidgetTimetableModel>> timetables = null;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (ACTION_SYNC_DATA.equals(intent.getAction())) {
-            EdziennikTask.Companion.sync().enqueue(context);
-        }
-        super.onReceive(context, intent);
-    }
-
-    public static PendingIntent getPendingSelfIntent(Context context, String action) {
-        Intent intent = new Intent(context, WidgetTimetable.class);
-        intent.setAction(action);
-        return getPendingSelfIntent(context, intent);
-    }
-    public static PendingIntent getPendingSelfIntent(Context context, Intent intent) {
-        return PendingIntent.getBroadcast(context, 0, intent, 0);
-    }
-
-    public static Bitmap drawableToBitmap (Drawable drawable) {
-
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable)drawable).getBitmap();
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return bitmap;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        ComponentName thisWidget = new ComponentName(context, WidgetTimetable.class);
-
-        timetables = new SparseArray<>();
-        //timetables.clear();
-
-        App app = (App)context.getApplicationContext();
-
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        // There may be multiple widgets active, so update all of them
-        for (int appWidgetId : allWidgetIds) {
-
-            //d(TAG, "thr "+Thread.currentThread().getName());
-
-            WidgetConfig widgetConfig = app.appConfig.widgetTimetableConfigs.get(appWidgetId);
-            if (widgetConfig == null) {
-                widgetConfig = new WidgetConfig(app.profileFirstId());
-                app.appConfig.widgetTimetableConfigs.put(appWidgetId, widgetConfig);
-                app.appConfig.savePending = true;
-            }
-
-            RemoteViews views;
-            if (widgetConfig.bigStyle) {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark_big : R.layout.widget_timetable_big);
-            }
-            else {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark : R.layout.widget_timetable);
-            }
-
-            PorterDuff.Mode mode = PorterDuff.Mode.DST_IN;
-            /*if (widgetConfig.darkTheme) {
-                switch (modeInt) {
-                    case 0:
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                    case 1:
-                        mode = PorterDuff.Mode.DST_ATOP;
-                        d(TAG, "DST_ATOP");
-                        break;
-                    case 2:
-                        mode = PorterDuff.Mode.DST_IN;
-                        d(TAG, "DST_IN");
-                        break;
-                    case 3:
-                        mode = PorterDuff.Mode.DST_OUT;
-                        d(TAG, "DST_OUT");
-                        break;
-                    case 4:
-                        mode = PorterDuff.Mode.DST_OVER;
-                        d(TAG, "DST_OVER");
-                        break;
-                    case 5:
-                        mode = PorterDuff.Mode.LIGHTEN;
-                        d(TAG, "LIGHTEN");
-                        break;
-                    case 6:
-                        mode = PorterDuff.Mode.MULTIPLY;
-                        d(TAG, "MULTIPLY");
-                        break;
-                    case 7:
-                        mode = PorterDuff.Mode.OVERLAY;
-                        d(TAG, "OVERLAY");
-                        break;
-                    case 8:
-                        mode = PorterDuff.Mode.SCREEN;
-                        d(TAG, "SCREEN");
-                        break;
-                    case 9:
-                        mode = PorterDuff.Mode.SRC_ATOP;
-                        d(TAG, "SRC_ATOP");
-                        break;
-                    case 10:
-                        mode = PorterDuff.Mode.SRC_IN;
-                        d(TAG, "SRC_IN");
-                        break;
-                    case 11:
-                        mode = PorterDuff.Mode.SRC_OUT;
-                        d(TAG, "SRC_OUT");
-                        break;
-                    case 12:
-                        mode = PorterDuff.Mode.SRC_OVER;
-                        d(TAG, "SRC_OVER");
-                        break;
-                    case 13:
-                        mode = PorterDuff.Mode.XOR;
-                        d(TAG, "XOR");
-                        break;
-                    default:
-                        modeInt = 0;
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                }
-            }*/
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                // this code seems to crash the launcher on >= P
-                float transparency = widgetConfig.opacity;  //0...1
-                long colorFilter = 0x01000000L * (long) (255f * transparency);
-                try {
-                    final Method[] declaredMethods = Class.forName("android.widget.RemoteViews").getDeclaredMethods();
-                    final int len = declaredMethods.length;
-                    if (len > 0) {
-                        for (int m = 0; m < len; m++) {
-                            final Method method = declaredMethods[m];
-                            if (method.getName().equals("setDrawableParameters")) {
-                                method.setAccessible(true);
-                                method.invoke(views, R.id.widgetTimetableListView, true, -1, (int) colorFilter, mode, -1);
-                                method.invoke(views, R.id.widgetTimetableHeader, true, -1, (int) colorFilter, mode, -1);
-                                break;
-                            }
-                        }
-                    }
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            Intent refreshIntent = new Intent(context, WidgetTimetable.class);
-            refreshIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-            refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
-            PendingIntent pendingRefreshIntent = PendingIntent.getBroadcast(context,
-                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, pendingRefreshIntent);
-
-            views.setOnClickPendingIntent(R.id.widgetTimetableSync, WidgetTimetable.getPendingSelfIntent(context, ACTION_SYNC_DATA));
-
-            views.setImageViewBitmap(R.id.widgetTimetableRefresh, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            views.setImageViewBitmap(R.id.widgetTimetableSync, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            boolean unified = widgetConfig.profileId == -1;
-
-            List<Profile> profileList = new ArrayList<>();
-            if (unified) {
-                profileList = app.db.profileDao().getAllNow();
-                filterOutArchived(profileList);
-            }
-            else {
-                Profile profile = app.db.profileDao().getFullByIdNow(widgetConfig.profileId);
-                if (profile != null) {
-                    profileList.add(profile);
-                }
-            }
-
-            //d(TAG, "Profiles: "+ Arrays.toString(profileList.toArray()));
-
-            if (profileList == null || profileList.size() == 0) {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_profile_doesnt_exist));
-            }
-            else {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-                //Register profile;
-
-                long bellSyncDiffMillis = 0;
-                if (app.appConfig.bellSyncDiff != null) {
-                    bellSyncDiffMillis = app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000;
-                    bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier;
-                    bellSyncDiffMillis *= -1;
-                }
-
-                List<ItemWidgetTimetableModel> lessonList = new ArrayList<>();
-
-                Time syncedNow = Time.fromMillis(Time.getNow().getInMillis() + bellSyncDiffMillis);
-
-                Date today = Date.getToday();
-
-                int openProfileId = -1;
-                Date displayingDate = null;
-                int displayingWeekDay = 0;
-                if (unified) {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.widget_timetable_title_unified));
-                }
-                else {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, profileList.get(0).getName());
-                    openProfileId = profileList.get(0).getId();
-                }
-
-                List<LessonFull> lessons = app.db.lessonDao().getAllWeekNow(unified ? -1 : openProfileId, today.clone().stepForward(0, 0, -today.getWeekDay()), today);
-
-                int scrollPos = 0;
-
-                for (Profile profile: profileList) {
-                    Date profileDisplayingDate = HomeFragment.findDateWithLessons(profile.getId(), lessons, syncedNow, 1);
-                    int profileDisplayingWeekDay = profileDisplayingDate.getWeekDay();
-                    int dayDiff = Date.diffDays(profileDisplayingDate, Date.getToday());
-
-                    //d(TAG, "For profile "+profile.name+" displayingDate is "+profileDisplayingDate.getStringY_m_d());
-                    if (displayingDate == null || profileDisplayingDate.getValue() < displayingDate.getValue()) {
-                        displayingDate = profileDisplayingDate;
-                        displayingWeekDay = profileDisplayingWeekDay;
-                        //d(TAG, "Setting as global dd");
-                        if (dayDiff == 0) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_today_format, Week.getFullDayName(displayingWeekDay)));
-                        } else if (dayDiff == 1) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_tomorrow_format, Week.getFullDayName(displayingWeekDay)));
-                        } else {
-                            views.setTextViewText(R.id.widgetTimetableTitle, Week.getFullDayName(displayingWeekDay) + " " + profileDisplayingDate.getStringDm());
-                        }
-                    }
-                }
-
-                for (Profile profile: profileList) {
-                    int pos = 0;
-
-                    List<EventFull> events = app.db.eventDao().getAllByDateNow(profile.getId(), displayingDate);
-                    if (events == null)
-                        events = new ArrayList<>();
-
-                    if (unified) {
-                        ItemWidgetTimetableModel separator = new ItemWidgetTimetableModel();
-                        separator.profileId = profile.getId();
-                        separator.bigStyle = widgetConfig.bigStyle;
-                        separator.darkTheme = widgetConfig.darkTheme;
-                        separator.separatorProfileName = profile.getName();
-                        lessonList.add(separator);
-                    }
-
-                    for (LessonFull lesson : lessons) {
-                        //d(TAG, "Profile "+profile.id+" Lesson profileId "+lesson.profileId+" weekDay "+lesson.weekDay+", "+lesson);
-                        if (profile.getId() != lesson.profileId || displayingWeekDay != lesson.weekDay)
-                            continue;
-                        //d(TAG, "Not skipped");
-                        ItemWidgetTimetableModel model = new ItemWidgetTimetableModel();
-
-                        model.bigStyle = widgetConfig.bigStyle;
-                        model.darkTheme = widgetConfig.darkTheme;
-
-                        model.profileId = profile.getId();
-
-                        model.lessonDate = displayingDate;
-                        model.startTime = lesson.startTime;
-                        model.endTime = lesson.endTime;
-
-                        model.lessonPassed = (syncedNow.getValue() > lesson.endTime.getValue()) && displayingWeekDay == Week.getTodayWeekDay();
-                        model.lessonCurrent = (Time.inRange(lesson.startTime, lesson.endTime, syncedNow)) && displayingWeekDay == Week.getTodayWeekDay();
-
-                        if (model.lessonCurrent) {
-                            scrollPos = pos;
-                        } else if (model.lessonPassed) {
-                            scrollPos = pos + 1;
-                        }
-                        pos++;
-
-                        model.subjectName = bs(lesson.subjectLongName);
-                        model.classroomName = lesson.classroomName;
-
-                        model.bellSyncDiffMillis = bellSyncDiffMillis;
-
-                        if (lesson.changeId != 0) {
-                            if (lesson.changeType == LessonChange.TYPE_CHANGE) {
-                                model.lessonChange = true;
-                                if (lesson.changedClassroomName()) {
-                                    model.newClassroomName = lesson.changeClassroomName;
-                                }
-
-                                if (lesson.changedSubjectLongName()) {
-                                    model.newSubjectName = lesson.changeSubjectLongName;
-                                }
-                            }
-                            if (lesson.changeType == LessonChange.TYPE_CANCELLED) {
-                                model.lessonCancelled = true;
-                            }
-                        }
-
-                        for (EventFull event : events) {
-                            if (event.startTime == null)
-                                continue;
-                            if (event.eventDate.getValue() == displayingDate.getValue()
-                                    && event.startTime.getValue() == lesson.startTime.getValue()) {
-                                model.eventColors.add(event.type == TYPE_HOMEWORK ? ItemWidgetTimetableModel.EVENT_COLOR_HOMEWORK : event.getColor());
-                            }
-                        }
-
-                        lessonList.add(model);
-                    }
-                }
-
-                if (lessonList.size() == 0) {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_no_lessons));
-                    appWidgetManager.updateAppWidget(appWidgetId, views);
-                }
-                else {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-
-                    timetables.put(appWidgetId, lessonList);
-                    //WidgetTimetableListProvider.widgetsLessons.put(appWidgetId, lessons);
-                    //views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    Intent listIntent = new Intent(context, WidgetTimetableService.class);
-                    listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-                    listIntent.setData(Uri.parse(listIntent.toUri(Intent.URI_INTENT_SCHEME)));
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent);
-
-                    // template to handle the click listener for each item
-                    Intent intentTemplate = new Intent(context, LessonDetailsActivity.class);
-                    // Old activities shouldn't be in the history stack
-                    intentTemplate.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                    PendingIntent pendingIntentTimetable = PendingIntent.getActivity(context,
-                            0,
-                            intentTemplate,
-                            0);
-                    views.setPendingIntentTemplate(R.id.widgetTimetableListView, pendingIntentTimetable);
-
-                    Intent openIntent = new Intent(context, MainActivity.class);
-                    openIntent.setAction("android.intent.action.MAIN");
-                    if (!unified) {
-                        openIntent.putExtra("profileId", openProfileId);
-                        openIntent.putExtra("timetableDate", displayingDate.getValue());
-                    }
-                    openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE);
-                    PendingIntent pendingOpenIntent = PendingIntent.getActivity(context,
-                            appWidgetId, openIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-                    views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent);
-
-                    if (!unified)
-                        views.setScrollPosition(R.id.widgetTimetableListView, scrollPos);
-                }
-            }
-
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView);
-        }
-        //modeInt++;
-    }
-
-    @Override
-    public void onEnabled(Context context) {
-        // Enter relevant functionality for when the first widget is created
-    }
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        App app = (App) context.getApplicationContext();
-        for (int appWidgetId: appWidgetIds) {
-            app.appConfig.widgetTimetableConfigs.remove(appWidgetId);
-        }
-        app.saveConfig("widgetTimetableConfigs");
-    }
-}
-

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/DataNotifications.kt

@@ -1,210 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2
-
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.models.Data
-import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.*
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ANNOUNCEMENT
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_EVENT
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_GRADE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_NOTICE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class DataNotifications(val data: Data) {
-    companion object {
-        private const val TAG = "DataNotifications"
-    }
-
-    val app = data.app
-    val profileId = data.profile?.id ?: -1
-    val profileName = data.profile?.name ?: ""
-    val profile = data.profile
-    val loginStore = data.loginStore
-
-    init { run {
-        if (profile == null) {
-            return@run
-        }
-
-        for (change in app.db.lessonChangeDao().getNotNotifiedNow(profileId)) {
-            val text = app.getString(R.string.notification_lesson_change_format, change.changeTypeStr(app), if (change.lessonDate == null) "" else change.lessonDate!!.formattedString, change.subjectLongName)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_TIMETABLE_LESSON_CHANGE),
-                    text = text,
-                    type = TYPE_TIMETABLE_LESSON_CHANGE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_TIMETABLE,
-                    addedDate = change.addedDate
-            ).addExtra("timetableDate", change.lessonDate?.value?.toLong())
-        }
-
-        for (event in app.db.eventDao().getNotNotifiedNow(profileId)) {
-            val text = if (event.type == Event.TYPE_HOMEWORK)
-                app.getString(
-                        if (event.subjectLongName.isNullOrEmpty())
-                            R.string.notification_homework_no_subject_format
-                        else
-                            R.string.notification_homework_format,
-                        event.subjectLongName,
-                        event.eventDate.formattedString
-                )
-            else
-                app.getString(
-                        if (event.subjectLongName.isNullOrEmpty())
-                            R.string.notification_event_no_subject_format
-                        else
-                            R.string.notification_event_format,
-                        event.typeName,
-                        event.eventDate.formattedString,
-                        event.subjectLongName
-                )
-            val type = if (event.type == Event.TYPE_HOMEWORK) TYPE_NEW_HOMEWORK else TYPE_NEW_EVENT
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(type),
-                    text = text,
-                    type = type,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = if (event.type == Event.TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA,
-                    addedDate = event.addedDate
-            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
-        }
-
-        val today = Date.getToday()
-        val todayValue = today.value
-        profile.currentSemester = profile.dateToSemester(today)
-
-        for (grade in app.db.gradeDao().getNotNotifiedNow(profileId)) {
-            val gradeName = when (grade.type) {
-                TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name)
-                TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name)
-                TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name)
-                TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name)
-                else -> grade.name
-            }
-            val text = app.getString(R.string.notification_grade_format, gradeName, grade.subjectLongName)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_GRADE),
-                    text = text,
-                    type = TYPE_NEW_GRADE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_GRADES,
-                    addedDate = grade.addedDate
-            ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId)
-        }
-
-        for (notice in app.db.noticeDao().getNotNotifiedNow(profileId)) {
-            val noticeTypeStr = if (notice.type == Notice.TYPE_POSITIVE) app.getString(R.string.notification_notice_praise) else if (notice.type == Notice.TYPE_NEGATIVE) app.getString(R.string.notification_notice_warning) else app.getString(R.string.notification_notice_new)
-            val text = app.getString(R.string.notification_notice_format, noticeTypeStr, notice.teacherFullName, Date.fromMillis(notice.addedDate).formattedString)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_NOTICE),
-                    text = text,
-                    type = TYPE_NEW_NOTICE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_BEHAVIOUR,
-                    addedDate = notice.addedDate
-            ).addExtra("noticeId", notice.id)
-        }
-
-        for (attendance in app.db.attendanceDao().getNotNotifiedNow(profileId)) {
-            var attendanceTypeStr = app.getString(R.string.notification_type_attendance)
-            when (attendance.type) {
-                Attendance.TYPE_ABSENT -> attendanceTypeStr = app.getString(R.string.notification_absence)
-                Attendance.TYPE_ABSENT_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_absence_excused)
-                Attendance.TYPE_BELATED -> attendanceTypeStr = app.getString(R.string.notification_belated)
-                Attendance.TYPE_BELATED_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_belated_excused)
-                Attendance.TYPE_RELEASED -> attendanceTypeStr = app.getString(R.string.notification_release)
-            }
-            val text = app.getString(
-                    if (attendance.subjectLongName.isNullOrEmpty())
-                        R.string.notification_attendance_no_lesson_format
-                    else
-                        R.string.notification_attendance_format,
-                    attendanceTypeStr,
-                    attendance.subjectLongName,
-                    attendance.lessonDate.formattedString
-            )
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_ATTENDANCE),
-                    text = text,
-                    type = TYPE_NEW_ATTENDANCE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_ATTENDANCE,
-                    addedDate = attendance.addedDate
-            ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId)
-        }
-
-        for (announcement in app.db.announcementDao().getNotNotifiedNow(profileId)) {
-            val text = app.context.getString(R.string.notification_announcement_format, announcement.subject)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_ANNOUNCEMENT),
-                    text = text,
-                    type = TYPE_NEW_ANNOUNCEMENT,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_ANNOUNCEMENTS,
-                    addedDate = announcement.addedDate
-            ).addExtra("announcementId", announcement.id)
-        }
-
-        for (message in app.db.messageDao().getReceivedNotNotifiedNow(profileId)) {
-            val text = app.context.getString(R.string.notification_message_format, message.senderFullName, message.subject)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_MESSAGE),
-                    text = text,
-                    type = TYPE_NEW_MESSAGE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_MESSAGES,
-                    addedDate = message.addedDate
-            ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id)
-        }
-
-        val luckyNumbers = app.db.luckyNumberDao().getNotNotifiedNow(profileId)
-        luckyNumbers?.removeAll { it.date < today }
-        luckyNumbers?.forEach { luckyNumber ->
-            val text = when {
-                luckyNumber.date.value == todayValue -> // LN for today
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_format else R.string.notification_lucky_number_format, luckyNumber.number)
-                luckyNumber.date.value == todayValue + 1 -> // LN for tomorrow
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_tomorrow_format else R.string.notification_lucky_number_tomorrow_format, luckyNumber.number)
-                else -> // LN for later
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_later_format else R.string.notification_lucky_number_later_format, luckyNumber.date.formattedString, luckyNumber.number)
-            }
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_LUCKY_NUMBER),
-                    text = text,
-                    type = TYPE_LUCKY_NUMBER,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_HOME,
-                    addedDate = luckyNumber.addedDate
-            )
-        }
-
-        data.db.metadataDao().setAllNotified(profileId, true)
-    }}
-}

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

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-6.
- */
-
-package pl.szczodrzynski.edziennik.api.v2
-
-object Regexes {
-    val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
-        """<div.*?>\n*\s*(.+?)\s*\n*(?:<.*?)??</div>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_COLOR by lazy {
-        """background-color:([#A-Fa-f0-9]+);""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_CATEGORY by lazy {
-        """>&nbsp;(.+?):</span>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_CLASS_AVERAGE by lazy {
-        """Średnia ocen:.*<strong>([0-9]*\.?[0-9]*)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_ADDED_DATE by lazy {
-        """Wpisano:.*<strong>.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_COUNT_TO_AVG by lazy {
-        """Liczona do średniej:.*?<strong>nie<br/?></strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_GRADES_DETAILS by lazy {
-        """<strong.*?>(.+?)</strong>.*?<sup>.+?</sup>.*?<small>\((.+?)\)</small>.*?<span>.*?Wartość oceny:.*?<strong>([0-9.]+)</strong>.*?Wpisał\(a\):.*?<strong>(.+?)</strong>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-
-    val MOBIDZIENNIK_EVENT_TYPE by lazy {
-        """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_LUCKY_NUMBER by lazy {
-        """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*</a>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_CLASS_CALENDAR by lazy {
-        """events: (.+),$""".toRegex(RegexOption.MULTILINE)
-    }
-
-
-
-    val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
-        """<input type="hidden".+?name="([A-z0-9_]+)?".+?value="([A-z0-9_+-/=]+)?".+?>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val IDZIENNIK_LOGIN_ERROR by lazy {
-        """id="spanErrorMessage">(.*?)</""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME by lazy {
-        """Imię i nazwisko:.+?">(.+?)</div>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val IDZIENNIK_LOGIN_FIRST_IS_PARENT by lazy {
-        """id="ctl00_CzyRodzic" value="([01])" />""".toRegex()
-    }
-    val IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR by lazy {
-        """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9/]+)<""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
-        """<select.*?name="ctl00\${"$"}dxComboUczniowie".*?</select>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-    val IDZIENNIK_LOGIN_FIRST_STUDENT by lazy {
-        """<option.*?value="([0-9]+)"\sdata-id-ucznia="([A-z0-9]+?)".*?>(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)</option>""".toRegex(RegexOption.DOT_MATCHES_ALL)
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/ServerSync.kt

@@ -1,179 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2
-
-import pl.szczodrzynski.edziennik.App.APP_URL
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.models.Data
-import pl.szczodrzynski.edziennik.data.api.AppError.CODE_APP_SERVER_ERROR
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_SHARED_EVENT
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_SHARED_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_SERVER_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.network.ServerRequest
-
-class ServerSync(val data: Data, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "ServerSync"
-    }
-
-    val app = data.app
-    val profileId = data.profile?.id ?: -1
-    val profileName = data.profile?.name ?: ""
-    val profile = data.profile
-    val loginStore = data.loginStore
-
-    private fun getUsernameId(): String {
-        if (loginStore.data == null) {
-            return "NO_LOGIN_STORE"
-        }
-        if (profile?.studentData == null) {
-            return "NO_STUDENT_STORE"
-        }
-        return when (data.loginStore.type) {
-            LoginStore.LOGIN_TYPE_MOBIDZIENNIK -> loginStore.getLoginData("serverName", "MOBI_UN") + ":" + loginStore.getLoginData("username", "MOBI_UN") + ":" + profile.getStudentData("studentId", -1)
-            LoginStore.LOGIN_TYPE_LIBRUS -> profile.getStudentData("schoolName", "LIBRUS_UN") + ":" + profile.getStudentData("accountLogin", "LIBRUS_LOGIN_UN")
-            LoginStore.LOGIN_TYPE_IUCZNIOWIE -> loginStore.getLoginData("schoolName", "IUCZNIOWIE_UN") + ":" + loginStore.getLoginData("username", "IUCZNIOWIE_UN") + ":" + profile.getStudentData("registerId", -1)
-            LoginStore.LOGIN_TYPE_VULCAN -> profile.getStudentData("schoolName", "VULCAN_UN") + ":" + profile.getStudentData("studentId", -1)
-            LoginStore.LOGIN_TYPE_DEMO -> loginStore.getLoginData("serverName", "DEMO_UN") + ":" + loginStore.getLoginData("username", "DEMO_UN") + ":" + profile.getStudentData("studentId", -1)
-            else -> "TYPE_UNKNOWN"
-        }
-    }
-
-    init { run {
-        if (profile?.registration != Profile.REGISTRATION_ENABLED) {
-            onSuccess()
-            return@run
-        }
-
-        val request = ServerRequest(
-                app,
-                app.requestScheme+APP_URL+"main.php?sync",
-                "Edziennik2/REG",
-                profile,
-                data.loginStore.type,
-                getUsernameId()
-        )
-
-        if (profile.empty) {
-            request.setBodyParameter("first_run", "true")
-        }
-
-        var hasNotifications = true
-        if (app.appConfig.webPushEnabled) {
-            data.notifications
-                    .filterNot { it.posted }
-                    .let {
-                        if (it.isEmpty()) {
-                            hasNotifications = false
-                            null
-                        }
-                        else
-                            it
-                    }?.forEachIndexed { index, notification ->
-                        if (notification.type != TYPE_NEW_SHARED_EVENT
-                                && notification.type != TYPE_SERVER_MESSAGE
-                                && notification.type != TYPE_NEW_SHARED_HOMEWORK) {
-                            request.setBodyParameter("notify[$index][type]", notification.type.toString())
-                            request.setBodyParameter("notify[$index][title]", notification.title)
-                            request.setBodyParameter("notify[$index][text]", notification.text)
-                        }
-                    }
-        }
-
-        if ((!app.appConfig.webPushEnabled || !hasNotifications) && !profile.enableSharedEvents) {
-            onSuccess()
-            return@run
-        }
-
-        val result = request.runSync()
-
-        if (result == null) {
-            data.error(ApiError(TAG, CODE_APP_SERVER_ERROR)
-                    .setCritical(false))
-            onSuccess()
-            return@run
-        }
-        var apiResponse = result.toString()
-        if (result.getString("success") != "true") {
-            data.error(ApiError(TAG, CODE_APP_SERVER_ERROR)
-                    .setCritical(false))
-            onSuccess()
-            return@run
-        }
-        // HERE PROCESS ALL THE RECEIVED EVENTS
-        // add them to the profile and create appropriate notifications
-        result.getJsonArray("events")?.forEach { jEventEl ->
-            val event = jEventEl.asJsonObject
-            val teamCode = event.getString("team")
-
-            // get the target Team from teamCode
-            val team = app.db.teamDao().getByCodeNow(profile.id, teamCode)
-            if (team != null) {
-
-                // create the event from Json. Add the missing teamId and !!profileId!!
-                val eventObject = app.gson.fromJson(event.toString(), Event::class.java)
-                // proguard. disable for Event.class
-                if (eventObject.eventDate == null) {
-                    apiResponse += "\n\nEventDate == null\n$event"
-                }
-                eventObject.profileId = profileId
-                eventObject.teamId = team.id
-                eventObject.addedManually = true
-
-                if (eventObject.sharedBy == getUsernameId()) {
-                    eventObject.sharedBy = "self"
-                    eventObject.sharedByName = profile.studentNameLong
-                }
-
-                val typeObject = app.db.eventTypeDao().getByIdNow(profileId, eventObject.type)
-
-                app.db.eventDao().add(eventObject)
-
-                val metadata = Metadata(
-                        profileId,
-                        if (eventObject.type == TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
-                        eventObject.id,
-                        profile.empty,
-                        true,
-                        event.getLong("addedDate") ?: 0
-                )
-
-                val metadataId = app.db.metadataDao().add(metadata)
-
-                // notify if the event is new and not first sync
-                if (metadataId != -1L && !profile.empty) {
-                    val text = app.getString(
-                            R.string.notification_shared_event_format,
-                            eventObject.sharedByName,
-                            if (typeObject != null) typeObject.name else "wydarzenie",
-                            if (eventObject.eventDate == null) "???" else eventObject.eventDate.formattedString,
-                            eventObject.topic
-                    )
-                    val type = if (eventObject.type == TYPE_HOMEWORK) TYPE_NEW_SHARED_HOMEWORK else TYPE_NEW_SHARED_EVENT
-                    data.notifications += Notification(
-                            title = app.getNotificationTitle(type),
-                            text = text,
-                            type = type,
-                            profileId = profileId,
-                            profileName = profileName,
-                            viewId = if (eventObject.type == TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA,
-                            addedDate = metadata.addedDate
-                    ).addExtra("eventId", eventObject.id).addExtra("eventDate", eventObject.eventDate.value.toLong())
-                }
-            }
-        }
-
-        onSuccess()
-    }}
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskAllFinishedEvent.kt

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-class ApiTaskAllFinishedEvent

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskErrorEvent.kt

@@ -1,9 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-
-class ApiTaskErrorEvent(val error: ApiError)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskFinishedEvent.kt

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-class ApiTaskFinishedEvent(val profileId: Int)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/ApiTaskStartedEvent.kt

@@ -1,9 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events
-
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class ApiTaskStartedEvent(val profileId: Int, val profile: Profile? = null)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/FirstLoginFinishedEvent.kt

@@ -1,6 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.events
-
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-data class FirstLoginFinishedEvent(val profileList: List<Profile>, val loginStore: LoginStore)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/ServiceCloseRequest.kt

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-1.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events.requests
-
-class ServiceCloseRequest

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/requests/TaskCancelRequest.kt

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-1.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.events.requests
-
-class TaskCancelRequest(val taskId: Int)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/EdziennikTask.kt

@@ -1,92 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.events.task
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.idziennik.Idziennik
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.api.v2.librus.Librus
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.Mobidziennik
-import pl.szczodrzynski.edziennik.api.v2.template.Template
-import pl.szczodrzynski.edziennik.api.v2.vulcan.Vulcan
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-
-open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
-    companion object {
-        private const val TAG = "EdziennikTask"
-
-        fun firstLogin(loginStore: LoginStore) = EdziennikTask(-1, FirstLoginRequest(loginStore))
-        fun sync() = EdziennikTask(-1, SyncRequest())
-        fun syncProfile(profileId: Int, viewIds: List<Pair<Int, Int>>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, arguments))
-        fun syncProfileList(profileList: List<Int>) = EdziennikTask(-1, SyncProfileListRequest(profileList))
-        fun messageGet(profileId: Int, messageId: Int) = EdziennikTask(profileId, MessageGetRequest(messageId))
-        fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest())
-    }
-
-    private lateinit var loginStore: LoginStore
-
-    override fun prepare(app: App) {
-        if (request is FirstLoginRequest) {
-            // get the requested profile and login store
-            this.profile = null
-            loginStore = request.loginStore
-            // save the profile ID and name as the current task's
-            taskName = app.getString(R.string.edziennik_notification_api_first_login_title)
-        }
-        else {
-            // get the requested profile and login store
-            val profile = app.db.profileDao().getByIdNow(profileId)
-            this.profile = profile
-            if (profile == null || !profile.syncEnabled) {
-                return
-            }
-            val loginStore = app.db.loginStoreDao().getByIdNow(profile.loginStoreId) ?: return
-            this.loginStore = loginStore
-            // save the profile ID and name as the current task's
-            taskName = app.getString(R.string.edziennik_notification_api_sync_title_format, profile.name)
-        }
-    }
-
-    private var edziennikInterface: EdziennikInterface? = null
-
-    internal fun run(app: App, taskCallback: EdziennikCallback) {
-        edziennikInterface = when (loginStore.type) {
-            LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
-            else -> null
-        }
-        if (edziennikInterface == null) {
-            return
-        }
-
-        when (request) {
-            is SyncProfileRequest -> edziennikInterface?.sync(
-                    featureIds = request.viewIds?.flatMap { Features.getIdsByView(it.first, it.second) } ?: Features.getAllIds(),
-                    viewId = request.viewIds?.get(0)?.first,
-                    arguments = request.arguments)
-            is MessageGetRequest -> edziennikInterface?.getMessage(request.messageId)
-            is FirstLoginRequest -> edziennikInterface?.firstLogin()
-            is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead()
-        }
-    }
-
-    override fun cancel() {
-        edziennikInterface?.cancel()
-    }
-
-    override fun toString(): String {
-        return "EdziennikTask(profileId=$profileId, request=$request, edziennikInterface=$edziennikInterface)"
-    }
-
-    data class FirstLoginRequest(val loginStore: LoginStore)
-    class SyncRequest
-    data class SyncProfileRequest(val viewIds: List<Pair<Int, Int>>? = null, val arguments: JsonObject? = null)
-    data class SyncProfileListRequest(val profileList: List<Int>)
-    data class MessageGetRequest(val messageId: Int)
-    class AnnouncementsReadRequest
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/NotifyTask.kt

@@ -1,89 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.events.task
-
-import android.app.PendingIntent
-import android.content.Intent
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.Notifier.ID_NOTIFICATIONS
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.utils.models.Notification
-import kotlin.math.min
-
-class NotifyTask : IApiTask(-1) {
-    override fun prepare(app: App) {
-        taskName = app.getString(R.string.edziennik_notification_api_notify_title)
-    }
-
-    override fun cancel() {
-
-    }
-
-    fun run(app: App, taskCallback: EdziennikCallback) {
-        val list = app.db.notificationDao().getNotPostedNow()
-        val notificationList = list.subList(0, min(15, list.size))
-
-        var unreadCount = list.size
-
-        for (notification in notificationList) {
-            val intent = Intent(app, MainActivity::class.java)
-            notification.fillIntent(intent)
-            val pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0)
-            val notificationBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
-                    // title, text, type, date
-                    .setContentTitle(notification.title)
-                    .setContentText(notification.text)
-                    .setSubText(Notification.stringType(app, notification.type))
-                    .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, Notification.stringType(app, notification.type)))
-                    // icon, color, lights, priority
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(app.notifier.notificationColor)
-                    .setLights(-0xff0001, 2000, 2000)
-                    .setPriority(app.notifier.notificationPriority)
-                    // channel, group, style
-                    .setChannelId(app.notifier.notificationGroup)
-                    .setGroup(app.notifier.notificationGroup)
-                    .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
-                    .setStyle(NotificationCompat.BigTextStyle().bigText(notification.text))
-                    // intent, auto cancel
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true)
-            if (!app.notifier.shouldBeQuiet()) {
-                notificationBuilder.setDefaults(app.notifier.notificationDefaults)
-            }
-            app.notifier.notificationManager.notify(notification.id, notificationBuilder.build())
-        }
-
-        if (notificationList.isNotEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val intent = Intent(app, MainActivity::class.java)
-            intent.action = "android.intent.action.MAIN"
-            intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS)
-            val pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS,
-                    intent, 0)
-
-            val groupBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(app.notifier.notificationColor)
-                    .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount))
-                    .setGroupSummary(true)
-                    .setAutoCancel(true)
-                    .setChannelId(app.notifier.notificationGroup)
-                    .setGroup(app.notifier.notificationGroup)
-                    .setLights(-0xff0001, 2000, 2000)
-                    .setPriority(app.notifier.notificationPriority)
-                    .setContentIntent(pendingIntent)
-                    .setStyle(NotificationCompat.BigTextStyle())
-            if (!app.notifier.shouldBeQuiet()) {
-                groupBuilder.setDefaults(app.notifier.notificationDefaults)
-            }
-            app.notifier.notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build())
-        }
-
-        app.db.notificationDao().setAllPosted()
-
-        taskCallback.onCompleted()
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/Idziennik.kt

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.api.v2.idziennik
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikData
-import pl.szczodrzynski.edziennik.api.v2.idziennik.firstlogin.IdziennikFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLogin
-import pl.szczodrzynski.edziennik.api.v2.idziennikLoginMethods
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.prepare
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Idziennik"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataIdziennik
-
-    init {
-        data = DataIdziennik(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Idziennik.callback)
-            satisfyLoginMethods()
-        }
-    }
-
-    private fun completed() {
-        data.saveData()
-        data.notifyAndSyncEvents {
-            callback.onCompleted()
-        }
-    }
-
-    /*    _______ _                     _                  _ _   _
-         |__   __| |              /\   | |                (_) | | |
-            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
-            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
-            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
-            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
-                                           __/ |
-                                          |__*/
-    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
-        data.arguments = arguments
-        data.prepare(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        IdziennikLogin(data) {
-            IdziennikData(data) {
-                completed()
-            }
-        }
-    }
-
-    override fun getMessage(messageId: Int) {
-
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-
-    }
-
-    override fun firstLogin() {
-        IdziennikFirstLogin(data) {
-            completed()
-        }
-    }
-
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-    }
-
-    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
-        return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
-            override fun onError(apiError: ApiError) {
-                when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebExams.kt

@@ -1,114 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebExams(override val data: DataIdziennik,
-                         val onSuccess: () -> Unit) : IdziennikWeb(data) {
-    companion object {
-        private const val TAG = "IdziennikWebExams"
-    }
-
-    private var examsYear = Date.getToday().year
-    private var examsMonth = Date.getToday().month
-    private var examsMonthsChecked = 0
-    private var examsNextMonthChecked = false // TO DO temporary // no more // idk
-
-    init {
-        getExams()
-    }
-
-    private fun getExams() {
-        val param = JsonObject()
-        param.addProperty("strona", 1)
-        param.addProperty("iloscNaStrone", "99")
-        param.addProperty("iloscRekordow", -1)
-        param.addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu")
-        param.addProperty("kierunekSort", 0)
-        param.addProperty("maxIloscZaznaczonych", 0)
-        param.addProperty("panelFiltrow", 0)
-
-        webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf(
-                "idP" to data.registerId,
-                "rok" to examsYear,
-                "miesiac" to examsMonth,
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jExamEl in json.getAsJsonArray("ListK")) {
-                val jExam = jExamEl.asJsonObject
-                // jExam
-                val eventId = jExam.get("_recordId").asLong
-                val rSubject = data.getSubject(jExam.get("przedmiot").asString, -1, "")
-                val rTeacher = data.getTeacherByLastFirst(jExam.get("wpisal").asString)
-                val examDate = Date.fromY_m_d(jExam.get("data").asString)
-                val lessonObject = Lesson.getByWeekDayAndSubject(data.lessonList, examDate.weekDay, rSubject.id)
-                val examTime = lessonObject?.startTime
-
-                val eventType = if (jExam.get("rodzaj").asString == "sprawdzian/praca klasowa") Event.TYPE_EXAM else Event.TYPE_SHORT_QUIZ
-                val eventObject = Event(
-                        profileId,
-                        eventId,
-                        examDate,
-                        examTime,
-                        jExam.get("zakres").asString,
-                        -1,
-                        eventType,
-                        false,
-                        rTeacher.id,
-                        rSubject.id,
-                        data.teamClass?.id ?: -1
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_EVENT,
-                        eventObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false,
-                        System.currentTimeMillis()
-                ))
-            }
-
-            if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) {
-                examsMonthsChecked++
-                examsMonth--
-                if (examsMonth < 1) {
-                    examsMonth = 12
-                    examsYear--
-                }
-                getExams()
-            } else if (!examsNextMonthChecked /* get also one month forward */) {
-                val showDate = Date.getToday().stepForward(0, 1, 0)
-                examsYear = showDate.year
-                examsMonth = showDate.month
-                examsNextMonthChecked = true
-                getExams()
-            } else {
-                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
-                onSuccess()
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebProposedGrades.kt

@@ -1,108 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_MISSING_GRADES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.utils.Utils.getWordGradeValue
-
-class IdziennikWebProposedGrades(override val data: DataIdziennik,
-                         val onSuccess: () -> Unit) : IdziennikWeb(data) {
-    companion object {
-        private const val TAG = "IdziennikWebProposedGrades"
-    }
-
-    init {
-        webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            val jSubjects = json.getAsJsonArray("Przedmioty")
-            for (jSubjectEl in jSubjects) {
-                val jSubject = jSubjectEl.getAsJsonObject()
-                // jSubject
-                val rSubject = data.getSubject(jSubject.get("Przedmiot").getAsString(), -1, jSubject.get("Przedmiot").getAsString())
-                val semester1Proposed = jSubject.get("OcenaSem1").getAsString()
-                val semester2Proposed = jSubject.get("OcenaSem2").getAsString()
-                val semester1Value = getWordGradeValue(semester1Proposed)
-                val semester2Value = getWordGradeValue(semester2Proposed)
-                val semester1Id = rSubject.id * -100 - 1
-                val semester2Id = rSubject.id * -100 - 2
-
-                if (semester1Proposed != "") {
-                    val gradeObject = Grade(
-                            profileId,
-                            semester1Id,
-                            "",
-                            -1,
-                            "",
-                            semester1Value.toString(),
-                            semester1Value.toFloat(),
-                            0f,
-                            1,
-                            -1,
-                            rSubject.id)
-
-                    gradeObject.type = TYPE_SEMESTER1_PROPOSED
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile?.empty ?: false,
-                            profile?.empty ?: false,
-                            System.currentTimeMillis()
-                    ))
-                }
-
-                if (semester2Proposed != "") {
-                    val gradeObject = Grade(
-                            profileId,
-                            semester2Id,
-                            "",
-                            -1,
-                            "",
-                            semester2Value.toString(),
-                            semester2Value.toFloat(),
-                            0f,
-                            2,
-                            -1,
-                            rSubject.id)
-
-                    gradeObject.type = TYPE_YEAR_PROPOSED
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile?.empty ?: false,
-                            profile?.empty ?: false,
-                            System.currentTimeMillis()
-                    ))
-                }
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
-            onSuccess()
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebTimetable.kt

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CANCELLED
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CHANGE
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class IdziennikWebTimetable(override val data: DataIdziennik,
-                        val onSuccess: () -> Unit) : IdziennikWeb(data) {
-    companion object {
-        private const val TAG = "IdziennikWebTimetable"
-    }
-
-    init {
-        val weekStart = Week.getWeekStart()
-        if (Date.getToday().weekDay > 4) {
-            weekStart.stepForward(0, 0, 7)
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_TIMETABLE, mapOf(
-                "idPozDziennika" to data.registerId,
-                "pidRokSzkolny" to data.schoolYearId,
-                "data" to weekStart.stringY_m_d+"T10:00:00.000Z"
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEach { range ->
-                val lessonRange = LessonRange(
-                        profileId,
-                        range.getInt("LiczbaP") ?: return@forEach,
-                        range.getString("Poczatek")?.let { Time.fromH_m(it) } ?: return@forEach,
-                        range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEach
-                )
-                data.lessonRanges[lessonRange.lessonNumber] = lessonRange
-            }
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { lesson ->
-                val subject = data.getSubject(
-                        lesson.getString("Nazwa") ?: return@forEach,
-                        lesson.getLong("Id"),
-                        lesson.getString("Skrot") ?: ""
-                )
-                val teacher = data.getTeacherByFDotLast(lesson.getString("Nauczyciel") ?: return@forEach)
-                val weekDay = lesson.getInt("DzienTygodnia")?.minus(1) ?: return@forEach
-                val lessonRange = data.lessonRanges[lesson.getInt("Godzina")?.plus(1) ?: return@forEach]
-
-                val lessonObject = Lesson(
-                        profileId,
-                        weekDay,
-                        lessonRange.startTime,
-                        lessonRange.endTime
-                ).apply {
-                    subjectId = subject.id
-                    teacherId = teacher.id
-                    teamId = data.teamClass?.id ?: -1
-                    classroomName = lesson.getString("NazwaSali") ?: ""
-                }
-
-                data.lessonList.add(lessonObject)
-
-                val type = lesson.getInt("TypZastepstwa") ?: -1
-                if (type != -1) {
-                    // we have a lesson change to process
-                    val lessonChangeObject = LessonChange(
-                            profileId,
-                            weekStart.clone().stepForward(0, 0, weekDay),
-                            lessonObject.startTime,
-                            lessonObject.endTime
-                    )
-
-                    lessonChangeObject.teamId = lessonObject.teamId
-                    lessonChangeObject.teacherId = lessonObject.teacherId
-                    lessonChangeObject.subjectId = lessonObject.subjectId
-                    lessonChangeObject.classroomName = lessonObject.classroomName
-                    when (type) {
-                        0 -> lessonChangeObject.type = TYPE_CANCELLED
-                        1, 2, 3, 4, 5 -> {
-                            lessonChangeObject.type = TYPE_CHANGE
-                            val newTeacher = lesson.getString("NauZastepujacy")
-                            val newSubject = lesson.getString("PrzedmiotZastepujacy")
-                            if (newTeacher != null) {
-                                lessonChangeObject.teacherId = data.getTeacherByFDotLast(newTeacher).id
-                            }
-                            if (newSubject != null) {
-                                lessonChangeObject.subjectId = data.getSubject(newSubject, null, "").id
-                            }
-                        }
-                    }
-
-                    data.lessonChangeList.add(lessonChangeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            lessonChangeObject.id,
-                            profile?.empty ?: false,
-                            profile?.empty ?: false,
-                            System.currentTimeMillis()
-                    ))
-                }
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
-            onSuccess()
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/firstlogin/IdziennikFirstLogin.kt

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
- */
-
-package pl.szczodrzynski.edziennik.api.v2.idziennik.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.api.v2.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_SETTINGS
-import pl.szczodrzynski.edziennik.api.v2.Regexes
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.idziennik.login.IdziennikLoginWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.swapFirstLastName
-
-class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikFirstLogin"
-    }
-
-    private val web = IdziennikWeb(data)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        IdziennikLoginWeb(data) {
-            web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text ->
-                //val accounts = json.getJsonArray("accounts")
-
-                val isParent = Regexes.IDZIENNIK_LOGIN_FIRST_IS_PARENT.find(text)?.get(1) != "0"
-                val accountNameLong = if (isParent)
-                    Regexes.IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME.find(text)?.get(1)?.swapFirstLastName()?.fixName()
-                else
-                    null
-
-                var schoolYearName: String? = null
-                val schoolYear = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
-                    schoolYearName = it[2]
-                    it[1].toIntOrNull()
-                } ?: run {
-                    data.error(ApiError(TAG, ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR)
-                            .withApiResponse(text))
-                    return@webGet
-                }
-
-                Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
-                        .toMutableList()
-                        .reversed()
-                        .forEach { match ->
-                            val registerId = match[1].toIntOrNull() ?: return@forEach
-                            val studentId = match[2]
-                            val firstName = match[3]
-                            val lastName = match[4]
-                            val className = match[5] + " " + match[6]
-
-                            val profile = Profile()
-                            profile.studentNameLong = "$firstName $lastName".fixName()
-                            profile.studentNameShort = "$firstName ${lastName[0]}.".fixName()
-                            profile.accountNameLong = accountNameLong
-                            profile.studentClassName = className
-                            profile.studentSchoolYear = schoolYearName
-                            profile.name = profile.studentNameLong
-                            profile.subname = data.webUsername
-                            profile.empty = true
-                            profile.putStudentData("studentId", studentId)
-                            profile.putStudentData("registerId", registerId)
-                            profile.putStudentData("schoolYearId", schoolYear)
-                            profileList.add(profile)
-                        }
-
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
-                onSuccess()
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/interfaces/EdziennikInterface.kt

@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-29.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.interfaces
-
-import com.google.gson.JsonObject
-
-interface EdziennikInterface {
-    fun sync(featureIds: List<Int>, viewId: Int? = null, arguments: JsonObject? = null)
-    fun getMessage(messageId: Int)
-    fun markAllAnnouncementsAsRead()
-    fun firstLogin()
-    fun cancel()
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt

@@ -1,191 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-21.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusData
-import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
-import pl.szczodrzynski.edziennik.api.v2.librus.firstlogin.LibrusFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLogin
-import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginApi
-import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginSynergia
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Librus"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataLibrus
-
-    init {
-        data = DataLibrus(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Librus.callback)
-            satisfyLoginMethods()
-        }
-    }
-
-    private fun completed() {
-        data.saveData()
-        data.notifyAndSyncEvents {
-            callback.onCompleted()
-        }
-    }
-
-    /*    _______ _                     _                  _ _   _
-         |__   __| |              /\   | |                (_) | | |
-            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
-            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
-            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
-            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
-                                           __/ |
-                                          |__*/
-    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
-        data.arguments = arguments
-        data.prepare(librusLoginMethods, LibrusFeatures, featureIds, viewId)
-        login()
-    }
-
-    private fun login() {
-        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        LibrusLogin(data) {
-            data()
-        }
-    }
-
-    private fun data() {
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        LibrusData(data) {
-            completed()
-        }
-    }
-
-    override fun getMessage(messageId: Int) {
-
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-        LibrusLoginApi(data) {
-            LibrusLoginSynergia(data) {
-                LibrusSynergiaMarkAllAnnouncementsAsRead(data) {
-                    completed()
-                }
-            }
-        }
-    }
-
-    override fun firstLogin() {
-        LibrusFirstLogin(data) {
-            completed()
-        }
-    }
-
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-    }
-
-    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
-        return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
-            override fun onError(apiError: ApiError) {
-                if (apiError.errorCode in internalErrorList) {
-                    // finish immediately if the same error occurs twice during the same sync
-                    callback.onError(apiError)
-                    return
-                }
-                internalErrorList.add(apiError.errorCode)
-                when (apiError.errorCode) {
-                    ERROR_LIBRUS_PORTAL_ACCESS_DENIED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_PORTAL)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_PORTAL)
-                        data.targetLoginMethodIds.sort()
-                        data.portalTokenExpiryTime = 0
-                        login()
-                    }
-                    ERROR_LIBRUS_API_ACCESS_DENIED,
-                    ERROR_LIBRUS_API_TOKEN_EXPIRED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_API)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_API)
-                        data.targetLoginMethodIds.sort()
-                        data.apiTokenExpiryTime = 0
-                        login()
-                    }
-                    ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_SYNERGIA)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_SYNERGIA)
-                        data.targetLoginMethodIds.sort()
-                        data.synergiaSessionIdExpiryTime = 0
-                        login()
-                    }
-                    ERROR_LIBRUS_MESSAGES_ACCESS_DENIED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_LIBRUS_MESSAGES)
-                        data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_MESSAGES)
-                        data.targetLoginMethodIds.sort()
-                        data.messagesSessionIdExpiryTime = 0
-                        login()
-                    }
-                    ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE,
-                    ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING,
-                    ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED,
-                    ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED -> {
-                        login()
-                    }
-                    ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH,
-                    ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED,
-                    ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID -> {
-                        data.portalRefreshToken = null
-                        login()
-                    }
-                    ERROR_LOGIN_LIBRUS_SYNERGIA_TOKEN_INVALID,
-                    ERROR_LOGIN_LIBRUS_SYNERGIA_NO_TOKEN,
-                    ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID -> {
-                        login()
-                    }
-                    ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID -> {
-                        login()
-                    }
-                    // TODO PORTAL CAPTCHA
-                    ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC -> {
-                        loginStore.putLoginData("timetableNotPublic", true)
-                        data()
-                    }
-                    ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE,
-                    ERROR_LIBRUS_API_NOTES_NOT_ACTIVE -> {
-                        data()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}

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

@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-5.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.librus.*
-import pl.szczodrzynski.edziennik.api.v2.librus.data.api.*
-import pl.szczodrzynski.edziennik.api.v2.librus.data.messages.LibrusMessagesGetList
-import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaHomework
-import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaInfo
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "LibrusEndpoints"
-    }
-
-    init {
-        nextEndpoint(onSuccess)
-    }
-
-    private fun nextEndpoint(onSuccess: () -> Unit) {
-        if (data.targetEndpointIds.isEmpty()) {
-            onSuccess()
-            return
-        }
-        if (data.cancelled) {
-            onSuccess()
-            return
-        }
-        useEndpoint(data.targetEndpointIds.removeAt(0)) {
-            data.progress(data.progressStep)
-            nextEndpoint(onSuccess)
-        }
-    }
-
-    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
-        Utils.d(TAG, "Using endpoint $endpointId")
-        when (endpointId) {
-            /**
-             * API
-             */
-            ENDPOINT_LIBRUS_API_ME -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                LibrusApiMe(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_SCHOOLS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_school_info)
-                LibrusApiSchools(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_CLASSES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_classes)
-                LibrusApiClasses(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_teams)
-                LibrusApiVirtualClasses(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_UNITS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_units)
-                LibrusApiUnits(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_USERS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
-                LibrusApiUsers(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_SUBJECTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_subjects)
-                LibrusApiSubjects(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_CLASSROOMS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_classrooms)
-                LibrusApiClassrooms(data, onSuccess)
-            }
-            // TODO push config
-            ENDPOINT_LIBRUS_API_TIMETABLES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                LibrusApiTimetables(data, onSuccess)
-            }
-
-            ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                LibrusApiGrades(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_NORMAL_GC -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
-                LibrusApiGradeCategories(data, onSuccess)
-            }
-            // TODO grades
-
-            ENDPOINT_LIBRUS_API_EVENT_TYPES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_event_types)
-                LibrusApiEventTypes(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_EVENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_events)
-                LibrusApiEvents(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                LibrusApiHomework(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                LibrusApiLuckyNumber(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_NOTICE_TYPES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notice_types)
-                LibrusApiNoticeTypes(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                LibrusApiNotices(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance_types)
-                LibrusApiAttendanceTypes(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_ATTENDANCES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                LibrusApiAttendances(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
-                LibrusApiAnnouncements(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_PT_MEETINGS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings)
-                LibrusApiPtMeetings(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types)
-                LibrusApiTeacherFreeDayTypes(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days)
-                LibrusApiTeacherFreeDays(data, onSuccess)
-            }
-
-            /**
-             * SYNERGIA
-             */
-            ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                LibrusSynergiaHomework(data, onSuccess)
-            }
-            ENDPOINT_LIBRUS_SYNERGIA_INFO -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                LibrusSynergiaInfo(data, onSuccess)
-            }
-
-            /**
-             * MESSAGES
-             */
-            ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, onSuccess = onSuccess)
-            }
-            ENDPOINT_LIBRUS_MESSAGES_SENT -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                LibrusMessagesGetList(data, type = Message.TYPE_SENT, onSuccess = onSuccess)
-            }
-
-            else -> onSuccess()
-        }
-    }
-}

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

@@ -1,135 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-24
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data
-
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.body.MediaTypeUtils
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import org.jsoup.parser.Parser
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.io.StringWriter
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.OutputKeys
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-
-open class LibrusMessages(open val data: DataLibrus) {
-    companion object {
-        private const val TAG = "LibrusMessages"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun messagesGet(tag: String, endpoint: String, method: Int = POST,
-                    parameters: Map<String, Any>? = null, onSuccess: (doc: Document) -> Unit) {
-
-        d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$endpoint")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text.isNullOrEmpty()) {
-                    data.error(ApiError(LibrusSynergia.TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                // TODO: Finish error handling
-
-                if ("error" in text) {
-                    when ("<type>(.*)</type>".toRegex().find(text)?.get(1)) {
-                        "eAccessDeny" -> data.error(ApiError(tag, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED)
-                                .withResponse(response)
-                                .withApiResponse(text))
-                    }
-                }
-
-                try {
-                    val doc = Jsoup.parse(text, "", Parser.xmlParser())
-                    onSuccess(doc)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(text))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("DZIENNIKSID")
-                        .value(data.messagesSessionId!!)
-                        .domain("wiadomosci.librus.pl")
-                        .secure().httpOnly().build()
-        ))
-
-
-        val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-        val doc = docBuilder.newDocument()
-        val serviceElement = doc.createElement("service")
-        val headerElement = doc.createElement("header")
-        val dataElement = doc.createElement("data")
-        for ((key, value) in parameters.orEmpty()) {
-            val element = doc.createElement(key)
-            element.appendChild(doc.createTextNode(value.toString()))
-            dataElement.appendChild(element)
-        }
-        serviceElement.appendChild(headerElement)
-        serviceElement.appendChild(dataElement)
-        doc.appendChild(serviceElement)
-        val transformer = TransformerFactory.newInstance().newTransformer()
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
-        val stringWriter = StringWriter()
-        transformer.transform(DOMSource(doc), StreamResult(stringWriter))
-        val requestXml = stringWriter.toString()
-
-        /*val requestXml = xml("service") {
-            "header" { }
-            "data" {
-                for ((key, value) in parameters.orEmpty()) {
-                    key {
-                        -value.toString()
-                    }
-                }
-            }
-        }.toString(PrintOptions(
-                singleLineTextElements = true,
-                useSelfClosingTags = true
-        ))*/
-
-        Request.builder()
-                .url("$LIBRUS_MESSAGES_URL/$endpoint")
-                .userAgent(SYNERGIA_USER_AGENT)
-                .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML)
-                .apply {
-                    when (method) {
-                        GET -> get()
-                        POST -> post()
-                    }
-                }
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}

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

@@ -1,97 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.librus.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class LibrusApiGrades(override val data: DataLibrus,
-                      val onSuccess: () -> Unit) : LibrusApi(data) {
-    companion object {
-        const val TAG = "LibrusApiGrades"
-    }
-
-    init {
-        apiGet(TAG, "Grades") { json ->
-            val grades = json.getJsonArray("Grades").asJsonObjectList()
-
-            grades?.forEach { grade ->
-                val id = grade.getLong("Id") ?: return@forEach
-                val categoryId = grade.getJsonObject("Category")?.getLong("Id") ?: -1
-                val name = grade.getString("Grade") ?: ""
-                val semester = grade.getInt("Semester") ?: return@forEach
-                val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: -1
-                val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: -1
-                val addedDate = Date.fromIso(grade.getString("AddDate"))
-
-                val category = data.gradeCategories.singleOrNull { it.categoryId == categoryId }
-                val categoryName = category?.text ?: ""
-                val color = category?.color ?: -1
-                var weight = category?.weight ?: 0f
-                val value = Utils.getGradeValue(name)
-
-
-                if (name == "-" || name == "+"
-                        || name.equals("np", ignoreCase = true)
-                        || name.equals("bz", ignoreCase = true)) {
-                    weight = 0f
-                }
-
-                val gradeObject = Grade(
-                        profileId,
-                        id,
-                        categoryName,
-                        color,
-                        "",
-                        name,
-                        value,
-                        weight,
-                        semester,
-                        teacherId,
-                        subjectId
-                )
-
-                when {
-                    grade.getBoolean("IsConstituent") ?: false ->
-                        gradeObject.type = Grade.TYPE_NORMAL
-                    grade.getBoolean("IsSemester") ?: false -> // semester final
-                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER2_FINAL
-                    grade.getBoolean("IsSemesterProposition") ?: false -> // semester proposed
-                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_PROPOSED else Grade.TYPE_SEMESTER2_PROPOSED
-                    grade.getBoolean("IsFinal") ?: false -> // year final
-                        gradeObject.type = Grade.TYPE_YEAR_FINAL
-                    grade.getBoolean("IsFinalProposition") ?: false -> // year final
-                        gradeObject.type = Grade.TYPE_YEAR_PROPOSED
-                }
-
-                grade.getJsonObject("Improvement")?.also {
-                    val historicalId = it.getLong("Id")
-                    data.gradeList.firstOrNull { grade -> grade.id == historicalId }?.also { grade ->
-                        grade.parentId = gradeObject.id
-                        if (grade.name == "nb") grade.weight = 0f
-                    }
-                    gradeObject.isImprovement = true
-                }
-
-                data.gradeList.add(gradeObject)
-                data.metadataList.add(
-                        Metadata(
-                                profileId,
-                                Metadata.TYPE_GRADE,
-                                id,
-                                profile?.empty ?: false,
-                                profile?.empty ?: false,
-                                addedDate
-                        ))
-            }
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADES, SYNC_ALWAYS)
-            onSuccess()
-        }
-    }
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-24.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType
-
-class LibrusApiNoticeTypes(override val data: DataLibrus,
-                               val onSuccess: () -> Unit) : LibrusApi(data) {
-    companion object {
-        const val TAG = "LibrusApiNoticeTypes"
-    }
-
-    init {
-        apiGet(TAG, "Notes/Categories") { json ->
-            val noticeTypes = json.getJsonArray("Categories").asJsonObjectList()
-
-            noticeTypes?.forEach { noticeType ->
-                val id = noticeType.getLong("Id") ?: return@forEach
-                val name = noticeType.getString("CategoryName") ?: ""
-
-                data.noticeTypes.put(id, NoticeType(profileId, id, name))
-            }
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICE_TYPES, 4*DAY)
-            onSuccess()
-        }
-    }
-}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-4.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.api
-
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-
-class LibrusApiTemplate(override val data: DataLibrus,
-                        val onSuccess: () -> Unit) : LibrusApi(data) {
-    companion object {
-        const val TAG = "LibrusApi"
-    }
-
-    init {
-        /*apiGet(TAG, "") { json ->
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_, SYNC_ALWAYS)
-            onSuccess()
-        }*/
-    }
-}

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-23.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_USERS
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
-
-class LibrusApiUsers(override val data: DataLibrus,
-                        val onSuccess: () -> Unit) : LibrusApi(data) {
-    companion object {
-        const val TAG = "LibrusApiUsers"
-    }
-
-    init {
-        apiGet(TAG, "Users") { json ->
-            val users = json.getJsonArray("Users").asJsonObjectList()
-
-            users?.forEach { user ->
-                val id = user.getLong("Id") ?: return@forEach
-                val firstName = user.getString("FirstName")?.fixWhiteSpaces() ?: ""
-                val lastName = user.getString("LastName")?.fixWhiteSpaces() ?: ""
-
-                data.teacherList.put(id, Teacher(profileId, id, firstName, lastName))
-            }
-
-            data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4*DAY)
-            onSuccess()
-        }
-    }
-}

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

@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-24
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
-
-import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.api.v2.ERROR_NOT_IMPLEMENTED
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED
-import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
-import pl.szczodrzynski.edziennik.singleOrNull
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int = Message.TYPE_RECEIVED,
-                            archived: Boolean = false, val onSuccess: () -> Unit) : LibrusMessages(data) {
-    companion object {
-        const val TAG = "LibrusMessagesGetList"
-    }
-
-    init {
-        val endpoint = when (type) {
-            Message.TYPE_RECEIVED -> "Inbox/action/GetList"
-            Message.TYPE_SENT -> "Outbox/action/GetList"
-            else -> null
-        }
-
-        if (endpoint != null) {
-            messagesGet(TAG, endpoint, parameters = mapOf(
-                    "archive" to if (archived) 1 else 0
-            )) { doc ->
-                doc.select("GetList data").firstOrNull()?.children()?.forEach { element ->
-                    val id = element.select("messageId").text().toLong()
-                    val subject = element.select("topic").text().trim()
-                    val readDateText = element.select("readDate").text().trim()
-                    val readDate = when (readDateText.isNotBlank()) {
-                        true -> Date.fromIso(readDateText)
-                        else -> 0
-                    }
-                    val sentDate = Date.fromIso(element.select("sendDate").text().trim())
-                    var senderId: Long = -1
-                    var receiverId: Long = -1
-
-                    when (type) {
-                        Message.TYPE_RECEIVED -> {
-                            val senderFirstName = element.select("senderFirstName").text().trim()
-                            val senderLastName = element.select("senderLastName").text().trim()
-                            senderId = data.teacherList.singleOrNull {
-                                it.name == senderFirstName && it.surname == senderLastName
-                            }?.id ?: -1
-                        }
-
-                        Message.TYPE_SENT -> {
-                            val receiverFirstName = element.select("receiverFirstName").text().trim()
-                            val receiverLastName = element.select("receiverLastName").text().trim()
-                            receiverId = data.teacherList.singleOrNull {
-                                it.name == receiverFirstName && it.surname == receiverLastName
-                            }?.id ?: {
-                                val teacherObject = Teacher(
-                                        profileId,
-                                        -1 * Utils.crc16("$receiverFirstName $receiverLastName".toByteArray()).toLong(),
-                                        receiverFirstName,
-                                        receiverLastName
-                                )
-                                data.teacherList.put(teacherObject.id, teacherObject)
-                                teacherObject.id
-                            }.invoke()
-                        }
-                    }
-
-                    val notified = when (type) {
-                        Message.TYPE_SENT -> true
-                        else -> readDate > 0 || profile?.empty ?: false
-                    }
-
-                    val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            null,
-                            type,
-                            senderId,
-                            -1
-                    )
-
-                    val messageRecipientObject = MessageRecipient(
-                            profileId,
-                            receiverId,
-                            -1,
-                            readDate,
-                            id
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.messageRecipientList.add(messageRecipientObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            notified,
-                            notified,
-                            sentDate
-                    ))
-                }
-
-                when (type) {
-                    Message.TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS)
-                    Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
-                }
-                onSuccess()
-            }
-        } else {
-            data.error(TAG, ERROR_NOT_IMPLEMENTED)
-            onSuccess()
-        }
-    }
-}

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

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-25
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
-
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-
-class LibrusMessagesTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) {
-    companion object {
-        const val TAG = "LibrusMessages"
-    }
-
-    init {
-        /* messagesGet(TAG, "") { doc ->
-
-            data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_, SYNC_ALWAYS)
-            onSuccess()
-        } */
-    }
-}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-26
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
-
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
-
-class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
-    companion object {
-        const val TAG = "LibrusSynergiaMarkAllAnnouncementsAsRead"
-    }
-
-    init {
-        synergiaGet(TAG, "ogloszenia") {
-            onSuccess()
-        }
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-23
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.data.synergia
-
-import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusSynergia
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-
-class LibrusSynergiaTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) {
-    companion object {
-        const val TAG = "LibrusSynergia"
-    }
-
-    init {
-        /* synergiaGet(TAG, "") { text ->
-            val doc = Jsoup.parse(text)
-
-            data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_, SYNC_ALWAYS)
-            onSuccess()
-        } */
-    }
-}

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

@@ -1,92 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.librus.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.api.v2.FAKE_LIBRUS_ACCOUNTS
-import pl.szczodrzynski.edziennik.api.v2.LIBRUS_ACCOUNTS_URL
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_MODE_LIBRUS_EMAIL
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusPortal
-import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginApi
-import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginPortal
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_DISCONNECTED
-import pl.szczodrzynski.edziennik.data.api.AppError.CODE_SYNERGIA_NOT_ACTIVATED
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "LibrusFirstLogin"
-    }
-
-    private val portal = LibrusPortal(data)
-    private val api = LibrusApi(data)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        if (data.loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL) {
-            // email login: use Portal for account list
-            LibrusLoginPortal(data) {
-                portal.portalGet(TAG, if (data.fakeLogin) FAKE_LIBRUS_ACCOUNTS else LIBRUS_ACCOUNTS_URL) { json, response ->
-                    val accounts = json.getJsonArray("accounts")
-
-                    if (accounts == null || accounts.size() < 1) {
-                        data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
-                                .withResponse(response)
-                                .withApiResponse(json))
-                        return@portalGet
-                    }
-                    val accountDataTime = json.getLong("lastModification")
-
-                    for (accountEl in accounts) {
-                        val account = accountEl.asJsonObject
-
-                        val state = account.getString("state")
-                        when (state) {
-                            "requiring_an_action" -> CODE_LIBRUS_DISCONNECTED
-                            "need-activation" -> CODE_SYNERGIA_NOT_ACTIVATED
-                            else -> null
-                        }?.let { errorCode ->
-                            data.error(ApiError(TAG, errorCode)
-                                    .withApiResponse(json)
-                                    .withResponse(response))
-                            return@portalGet
-                        }
-
-                        val id = account.getInt("id") ?: continue
-                        val login = account.getString("login") ?: continue
-                        val token = account.getString("accessToken") ?: continue
-                        val tokenTime = (accountDataTime ?: 0) + DAY
-                        val name = account.getString("studentName")?.fixName() ?: ""
-
-                        val profile = Profile()
-                        profile.studentNameLong = name
-                        profile.studentNameShort = name.getShortName()
-                        profile.name = profile.studentNameLong
-                        profile.subname = data.portalEmail
-                        profile.empty = true
-                        profile.putStudentData("accountId", id)
-                        profile.putStudentData("accountLogin", login)
-                        profile.putStudentData("accountToken", token)
-                        profile.putStudentData("accountTokenTime", tokenTime)
-                        profileList.add(profile)
-                    }
-
-                    EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
-                    onSuccess()
-                }
-            }
-        }
-        else {
-            // synergia or JST login: use Api for account info
-            LibrusLoginApi(data) {
-                api.apiGet(TAG, "Me") { json ->
-
-                }
-            }
-        }
-    }
-}

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

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-20.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.librus.login
-
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.getUnixDate
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "LoginLibrusMessages"
-    }
-
-    init { run {
-        if (data.profile == null) {
-            data.error(ApiError(TAG, ERROR_PROFILE_MISSING))
-            return@run
-        }
-
-        if (data.isMessagesLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(data.messagesSessionId!!)
-                            .domain("wiadomosci.librus.pl")
-                            .secure().httpOnly().build()
-            ))
-            onSuccess()
-        }
-        else {
-            data.app.cookieJar.clearForDomain("wiadomosci.librus.pl")
-            if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_SYNERGIA)) {
-                loginWithSynergia()
-            }
-            else if (data.apiLogin != null && data.apiPassword != null && false) {
-                loginWithCredentials()
-            }
-            else {
-                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
-            }
-        }
-    }}
-
-    /**
-     * XML (Flash messages website) login method. Uses a Synergia login and password.
-     */
-    private fun loginWithCredentials() {
-
-    }
-
-    /**
-     * A login method using the Synergia website (/wiadomosci2 Auto Login).
-     */
-    private fun loginWithSynergia(url: String = "https://synergia.librus.pl/wiadomosci2") {
-        d(TAG, "Request: Librus/Login/Messages - $url")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                val location = response?.headers()?.get("Location")
-                when {
-                    location?.contains("MultiDomainLogon") == true -> loginWithSynergia(location)
-                    location?.contains("AutoLogon") == true -> {
-                        var sessionId = data.app.cookieJar.getCookie("wiadomosci.librus.pl", "DZIENNIKSID")
-                        sessionId = sessionId?.replace("-MAINT", "")
-                        if (sessionId == null) {
-                            data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID)
-                                    .withResponse(response)
-                                    .withApiResponse(text))
-                            return
-                        }
-                        data.messagesSessionId = sessionId
-                        data.messagesSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */
-                        onSuccess()
-                    }
-
-                    text?.contains("eAccessDeny") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text)
-                    text?.contains("stop.png") == true -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text)
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url(url)
-                .userAgent(SYNERGIA_USER_AGENT)
-                .get()
-                .callback(callback)
-                .withClient(data.app.httpLazy)
-                .build()
-                .enqueue()
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/Mobidziennik.kt

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-5.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikData
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.firstlogin.MobidziennikFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLogin
-import pl.szczodrzynski.edziennik.api.v2.mobidziennikLoginMethods
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.prepare
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Mobidziennik"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataMobidziennik
-
-    init {
-        data = DataMobidziennik(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Mobidziennik.callback)
-            satisfyLoginMethods()
-        }
-    }
-
-    private fun completed() {
-        data.saveData()
-        data.notifyAndSyncEvents {
-            callback.onCompleted()
-        }
-    }
-
-    /*    _______ _                     _                  _ _   _
-         |__   __| |              /\   | |                (_) | | |
-            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
-            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
-            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
-            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
-                                           __/ |
-                                          |__*/
-    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
-        data.arguments = arguments
-        data.prepare(mobidziennikLoginMethods, MobidziennikFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        MobidziennikLogin(data) {
-            MobidziennikData(data) {
-                completed()
-            }
-        }
-    }
-
-    override fun getMessage(messageId: Int) {
-
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-
-    }
-
-    override fun firstLogin() {
-        MobidziennikFirstLogin(data) {
-            completed()
-        }
-    }
-
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-    }
-
-    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
-        return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
-            override fun onError(apiError: ApiError) {
-                when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikData.kt

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-5.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.*
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api.MobidziennikApi
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebCalendar
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebGrades
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebMessagesAll
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web.MobidziennikWebMessagesInbox
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "MobidziennikData"
-    }
-
-    init {
-        nextEndpoint(onSuccess)
-    }
-
-    private fun nextEndpoint(onSuccess: () -> Unit) {
-        if (data.targetEndpointIds.isEmpty()) {
-            onSuccess()
-            return
-        }
-        if (data.cancelled) {
-            onSuccess()
-            return
-        }
-        useEndpoint(data.targetEndpointIds.removeAt(0)) {
-            data.progress(data.progressStep)
-            nextEndpoint(onSuccess)
-        }
-    }
-
-    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
-        Utils.d(TAG, "Using endpoint $endpointId")
-        when (endpointId) {
-            ENDPOINT_MOBIDZIENNIK_API_MAIN -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_data)
-                MobidziennikApi(data, onSuccess)
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                MobidziennikWebMessagesInbox(data) { onSuccess() }
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages)
-                MobidziennikWebMessagesAll(data) { onSuccess() }
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_calendar)
-                MobidziennikWebCalendar(data) { onSuccess() }
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                MobidziennikWebGrades(data) { onSuccess() }
-            }/*
-            ENDPOINT_MOBIDZIENNIK_WEB_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_behaviour)
-                MobidziennikWebNotices(data) { onSuccess() }
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                MobidziennikWebAttendance(data) { onSuccess() }
-            }
-            ENDPOINT_MOBIDZIENNIK_WEB_MANUALS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                MobidziennikWebManuals(data) { onSuccess() }
-            }*/
-            else -> onSuccess()
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikWeb.kt

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-5.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data
-
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
-import pl.szczodrzynski.edziennik.api.v2.*
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-open class MobidziennikWeb(open val data: DataMobidziennik) {
-    companion object {
-        private const val TAG = "MobidziennikWeb"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun webGet(tag: String, endpoint: String, method: Int = GET, payload: List<Pair<String, String>>? = null, onSuccess: (text: String) -> Unit) {
-        val url = "https://${data.loginServerName}.mobidziennik.pl$endpoint"
-
-        d(tag, "Request: Mobidziennik/Web - $url")
-
-        if (data.webSessionKey == null) {
-            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY)
-            return
-        }
-        if (data.webSessionValue == null) {
-            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE)
-            return
-        }
-        if (data.webServerId == null) {
-            data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID)
-            return
-        }
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text.isNullOrEmpty()) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-                if (text == "Nie jestes zalogowany"
-                        || text.contains("przypomnij_haslo_email")) {
-                    data.error(ApiError(TAG, ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(text)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_MOBIDZIENNIK_WEB_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(text))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name(data.webSessionKey!!)
-                        .value(data.webSessionValue!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build(),
-                Cookie.Builder()
-                        .name("SERVERID")
-                        .value(data.webServerId!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build()
-        ))
-
-        Request.builder()
-                .url(url)
-                .userAgent(MOBIDZIENNIK_USER_AGENT)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTimetable.kt

@@ -1,199 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-11.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
-
-import pl.szczodrzynski.edziennik.App.profileId
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
-import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.singleOrNull
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
-    init {
-        val lessons = rows.filterNot { it.isEmpty() }.map { it.split("|") }
-
-        val dataStart = Date.getToday()
-        val dataEnd = dataStart.clone().stepForward(0, 0, 7 + (6 - dataStart.weekDay))
-
-        data.toRemove.add(DataRemoveModel.Timetable.between(dataStart.clone(), dataEnd))
-
-        val dataDays = mutableListOf<Int>()
-        while (dataStart <= dataEnd) {
-            dataDays += dataStart.value
-            dataStart.stepForward(0, 0, 1)
-        }
-
-        for (lesson in lessons) {
-            val date = Date.fromYmd(lesson[2])
-            val startTime = Time.fromYmdHm(lesson[3])
-            val endTime = Time.fromYmdHm(lesson[4])
-            val id = date.combineWith(startTime) / 6L * 10L + (lesson.joinToString("|").hashCode() and 0xFFFF)
-
-            dataDays.remove(date.value)
-
-            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5] }?.id ?: -1
-            val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.id ?: -1
-            val teamId = data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.id ?: -1
-            val classroom = lesson[11]
-
-            Lesson(data.profileId, id).also {
-                when (lesson[1]) {
-                    "plan_lekcji", "lekcja" -> {
-                        it.type = Lesson.TYPE_NORMAL
-                        it.date = date
-                        it.startTime = startTime
-                        it.endTime = endTime
-                        it.subjectId = subjectId
-                        it.teacherId = teacherId
-                        it.teamId = teamId
-                        it.classroom = classroom
-                    }
-                    "lekcja_odwolana" -> {
-                        it.type = Lesson.TYPE_CANCELLED
-                        it.date = date
-                        it.startTime = startTime
-                        it.endTime = endTime
-                        it.oldSubjectId = subjectId
-                        //it.oldTeacherId = teacherId
-                        it.oldTeamId = teamId
-                        //it.oldClassroom = classroom
-                    }
-                    "zastepstwo" -> {
-                        it.type = Lesson.TYPE_CHANGE
-                        it.date = date
-                        it.startTime = startTime
-                        it.endTime = endTime
-                        it.subjectId = subjectId
-                        it.teacherId = teacherId
-                        it.teamId = teamId
-                        it.classroom = classroom
-                    }
-                }
-
-                if (it.type != Lesson.TYPE_NORMAL) {
-                    data.metadataList.add(
-                            Metadata(
-                                    data.profileId,
-                                    Metadata.TYPE_LESSON_CHANGE,
-                                    it.id,
-                                    data.profile?.empty ?: false,
-                                    data.profile?.empty ?: false,
-                                    System.currentTimeMillis()
-                            ))
-                }
-                data.lessonNewList += it
-            }
-        }
-
-        for (day in dataDays) {
-            val lessonDate = Date.fromValue(day)
-            data.lessonNewList += Lesson(profileId, lessonDate.value.toLong()).apply {
-                type = Lesson.TYPE_NO_LESSONS
-                date = lessonDate
-            }
-        }
-
-        /*for (lessonStr in rows) {
-            if (lessonStr.isNotEmpty()) {
-                val lesson = lessonStr.split("|")
-
-                if (lesson[0].toInt() != data.studentId)
-                    continue
-
-                if (lesson[1] == "plan_lekcji" || lesson[1] == "lekcja") {
-                    val lessonObject = Lesson(data.profileId, lesson[2], lesson[3], lesson[4])
-
-                    data.subjectList.singleOrNull { it.longName == lesson[5] }?.let {
-                        lessonObject.subjectId = it.id
-                    }
-                    data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.let {
-                        lessonObject.teacherId = it.id
-                    }
-                    data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.let {
-                        lessonObject.teamId = it.id
-                    }
-                    lessonObject.classroomName = lesson[11]
-                    data.lessonList.add(lessonObject)
-                }
-            }
-        }
-
-        // searching for all changes
-        for (lessonStr in rows) {
-            if (lessonStr.isNotEmpty()) {
-                val lesson = lessonStr.split("|")
-
-                if (lesson[0].toInt() != data.studentId)
-                    continue
-
-                if (lesson[1] == "zastepstwo" || lesson[1] == "lekcja_odwolana") {
-                    val lessonChange = LessonChange(data.profileId, lesson[2], lesson[3], lesson[4])
-
-                    data.subjectList.singleOrNull { it.longName == lesson[5] }?.let {
-                        lessonChange.subjectId = it.id
-                    }
-                    data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.let {
-                        lessonChange.teacherId = it.id
-                    }
-                    data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.let {
-                        lessonChange.teamId = it.id
-                    }
-
-                    if (lesson[1] == "zastepstwo") {
-                        lessonChange.type = LessonChange.TYPE_CHANGE
-                    }
-                    else if (lesson[1] == "lekcja_odwolana") {
-                        lessonChange.type = LessonChange.TYPE_CANCELLED
-                    }
-                    else if (lesson[1] == "lekcja") {
-                        lessonChange.type = LessonChange.TYPE_ADDED
-                    }
-                    lessonChange.classroomName = lesson[11]
-
-                    val originalLesson = lessonChange.getOriginalLesson(data.lessonList)
-
-                    if (lessonChange.type == LessonChange.TYPE_ADDED) {
-                        if (originalLesson == null) {
-                            // original lesson doesn't exist, save a new addition
-                            // TODO
-                            *//*if (!RegisterLessonChange.existsAddition(app.profile, registerLessonChange)) {
-                            app.profile.timetable.addLessonAddition(registerLessonChange);
-                        }*//*
-                        } else {
-                            // original lesson exists, so we need to compare them
-                            if (!lessonChange.matches(originalLesson)) {
-                                // the lessons are different, so it's probably a lesson change
-                                // ahhh this damn API
-                                lessonChange.type = LessonChange.TYPE_CHANGE
-                            }
-                        }
-
-                    }
-                    if (lessonChange.type != LessonChange.TYPE_ADDED) {
-                        // it's not a lesson addition
-                        data.lessonChangeList.add(lessonChange)
-                        data.metadataList.add(
-                                Metadata(
-                                        data.profileId,
-                                        Metadata.TYPE_LESSON_CHANGE,
-                                        lessonChange.id,
-                                        data.profile?.empty ?: false,
-                                        data.profile?.empty ?: false,
-                                        System.currentTimeMillis()
-                                ))
-                        if (originalLesson == null) {
-                            // there is no original lesson, so we have to add one in order to change it
-                            data.lessonList.add(Lesson.fromLessonChange(lessonChange))
-                        }
-                    }
-                }
-            }
-        }*/
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebNotices.kt

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-11.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
-
-import com.google.gson.JsonParser
-import pl.szczodrzynski.edziennik.api.v2.Regexes
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-import java.util.*
-
-class MobidziennikWebNotices(override val data: DataMobidziennik,
-                              val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
-    companion object {
-        private const val TAG = "MobidziennikWebNotices"
-    }
-
-    init {
-        // TODO this does no longer work: Mobidziennik changed their mobile page in 2019.09
-        data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
-        onSuccess()
-        /*webGet(TAG, "/mobile/zachowanie") { text ->
-            MobidziennikLuckyNumberExtractor(data, text)
-
-            data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
-            onSuccess()
-        }*/
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/firstlogin/MobidziennikFirstLogin.kt

@@ -1,60 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.login.MobidziennikLoginWeb
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "MobidziennikFirstLogin"
-    }
-
-    private val web = MobidziennikWeb(data)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        MobidziennikLoginWeb(data) {
-            web.webGet(TAG, "/api/zrzutbazy") { text ->
-                val tables = text.split("T@B#LA")
-
-                val accountNameLong = run {
-                    tables[0]
-                            .split("\n")
-                            .map { it.split("|") }
-                            .singleOrNull { it.getOrNull(1) != "*" }
-                            ?.let {
-                                "${it[4]} ${it[5]}".fixName()
-                            }
-                }
-
-                tables[8].split("\n").forEach { student ->
-                    if (student.isEmpty())
-                        return@forEach
-                    val student1 = student.split("|")
-                    if (student1.size == 2)
-                        return@forEach
-
-                    val today = Date.getToday()
-                    val profile = Profile()
-                    profile.studentNameLong = "${student1[2]} ${student1[4]}".fixName()
-                    profile.studentNameShort = "${student1[2]} ${student1[4][0]}.".fixName()
-                    profile.accountNameLong = if (accountNameLong == profile.studentNameLong) null else accountNameLong
-                    profile.studentSchoolYear = "${today.year}/${today.year+1}"
-                    profile.name = profile.studentNameLong
-                    profile.subname = data.loginUsername
-                    profile.empty = true
-                    profile.putStudentData("studentId", student1[0].toInt())
-                    profileList.add(profile)
-                }
-
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
-                onSuccess()
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/ApiError.kt

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-9-28.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.models
-
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import pl.szczodrzynski.edziennik.data.api.AppError
-
-class ApiError(val tag: String, val errorCode: Int) {
-    var profileId: Int? = null
-    var throwable: Throwable? = null
-    var apiResponse: String? = null
-    var request: Request? = null
-    var response: Response? = null
-    var isCritical = true
-
-    fun withThrowable(throwable: Throwable?): ApiError {
-        this.throwable = throwable
-        return this
-    }
-    fun withApiResponse(apiResponse: String?): ApiError {
-        this.apiResponse = apiResponse
-        return this
-    }
-    fun withApiResponse(apiResponse: JsonObject?): ApiError {
-        this.apiResponse = apiResponse?.toString()
-        return this
-    }
-    fun withRequest(request: Request?): ApiError {
-        this.request = request
-        return this
-    }
-    fun withResponse(response: Response?): ApiError {
-        this.response = response
-        this.request = response?.request()
-        return this
-    }
-
-    fun setCritical(isCritical: Boolean): ApiError {
-        this.isCritical = isCritical
-        return this
-    }
-
-    fun toAppError(): AppError {
-        return AppError(
-                tag,
-                -1,
-                errorCode, response, throwable, apiResponse
-        )
-    }
-
-    override fun toString(): String {
-        return "ApiError(tag='$tag', errorCode=$errorCode, profileId=$profileId, throwable=$throwable, apiResponse=$apiResponse, request=$request, response=$response, isCritical=$isCritical)"
-    }
-
-
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataRemoveModel.kt

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-2.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.models
-
-import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeDao
-import pl.szczodrzynski.edziennik.data.db.modules.timetable.TimetableDao
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-open class DataRemoveModel {
-    class Timetable(private val dateFrom: Date?, private val dateTo: Date?) : DataRemoveModel() {
-        companion object {
-            fun from(dateFrom: Date) = Timetable(dateFrom, null)
-            fun to(dateTo: Date) = Timetable(null, dateTo)
-            fun between(dateFrom: Date, dateTo: Date) = Timetable(dateFrom, dateTo)
-        }
-        fun commit(profileId: Int, dao: TimetableDao) {
-            if (dateFrom != null && dateTo != null) {
-                dao.clearBetweenDates(profileId, dateFrom, dateTo)
-            }
-            else {
-                dateFrom?.let { dateFrom -> dao.clearFromDate(profileId, dateFrom) }
-                dateTo?.let { dateTo -> dao.clearToDate(profileId, dateTo) }
-            }
-        }
-    }
-    class Grades(val all: Boolean, val semester: Int?) : DataRemoveModel() {
-        companion object {
-            fun all() = Grades(true, null)
-            fun semester(semester: Int) = Grades(false, semester)
-        }
-        fun commit(profileId: Int, dao: GradeDao) {
-            if (all) {
-                dao.clear(profileId)
-            }
-            semester?.let { dao.clearForSemester(profileId, it) }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-5.
- */
-
-package pl.szczodrzynski.edziennik.api.v2.template.data
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
-import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_API_SAMPLE
-import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE
-import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
-import pl.szczodrzynski.edziennik.api.v2.template.data.api.TemplateApiSample
-import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample
-import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample2
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class TemplateData(val data: DataTemplate, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "TemplateData"
-    }
-
-    init {
-        nextEndpoint(onSuccess)
-    }
-
-    private fun nextEndpoint(onSuccess: () -> Unit) {
-        if (data.targetEndpointIds.isEmpty()) {
-            onSuccess()
-            return
-        }
-        if (data.cancelled) {
-            onSuccess()
-            return
-        }
-        useEndpoint(data.targetEndpointIds.removeAt(0)) {
-            data.progress(data.progressStep)
-            nextEndpoint(onSuccess)
-        }
-    }
-
-    private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) {
-        Utils.d(TAG, "Using endpoint $endpointId")
-        when (endpointId) {
-            ENDPOINT_TEMPLATE_WEB_SAMPLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                TemplateWebSample(data) { onSuccess() }
-            }
-            ENDPOINT_TEMPLATE_WEB_SAMPLE_2 -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_school_info)
-                TemplateWebSample2(data) { onSuccess() }
-            }
-            ENDPOINT_TEMPLATE_API_SAMPLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                TemplateApiSample(data) { onSuccess() }
-            }
-            else -> onSuccess()
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/Vulcan.kt

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
- */
-
-package pl.szczodrzynski.edziennik.api.v2.vulcan
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.prepare
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanData
-import pl.szczodrzynski.edziennik.api.v2.vulcan.firstlogin.VulcanFirstLogin
-import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLogin
-import pl.szczodrzynski.edziennik.api.v2.vulcanLoginMethods
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Vulcan"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataVulcan
-
-    init {
-        data = DataVulcan(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Vulcan.callback)
-            satisfyLoginMethods()
-        }
-    }
-
-    private fun completed() {
-        data.saveData()
-        data.notifyAndSyncEvents {
-            callback.onCompleted()
-        }
-    }
-
-    /*    _______ _                     _                  _ _   _
-         |__   __| |              /\   | |                (_) | | |
-            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
-            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
-            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
-            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
-                                           __/ |
-                                          |__*/
-    override fun sync(featureIds: List<Int>, viewId: Int?, arguments: JsonObject?) {
-        data.arguments = arguments
-        data.prepare(vulcanLoginMethods, VulcanFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        VulcanLogin(data) {
-            VulcanData(data) {
-                completed()
-            }
-        }
-    }
-
-    override fun getMessage(messageId: Int) {
-
-    }
-
-    override fun markAllAnnouncementsAsRead() {
-
-    }
-
-    override fun firstLogin() {
-        VulcanFirstLogin(data) {
-            completed()
-        }
-    }
-
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-    }
-
-    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
-        return object : EdziennikCallback {
-            override fun onCompleted() {
-                callback.onCompleted()
-            }
-
-            override fun onProgress(step: Float) {
-                callback.onProgress(step)
-            }
-
-            override fun onStartProgress(stringRes: Int) {
-                callback.onStartProgress(stringRes)
-            }
-
-            override fun onError(apiError: ApiError) {
-                when (apiError.errorCode) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
-                    }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesInbox.kt

@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-01
- */
-
-package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_RECEIVED
-import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
-    companion object {
-        const val TAG = "VulcanApiMessagesInbox"
-    }
-
-    init {
-        data.profile?.also { profile ->
-
-            val startDate: String = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
-                else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
-            }
-            val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data").asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-
-                    val senderLoginId = message.getString("NadawcaId") ?: return@forEach
-                    val senderId = data.teacherList
-                            .singleOrNull { it.loginId == senderLoginId }?.id ?: return@forEach
-
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-                    val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-
-                    val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            body,
-                            TYPE_RECEIVED,
-                            senderId,
-                            -1
-                    )
-
-                    val messageRecipientObject = MessageRecipient(
-                            profileId,
-                            -1,
-                            -1,
-                            readDate,
-                            id
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.messageRecipientList.add(messageRecipientObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            readDate > 0,
-                            readDate > 0,
-                            sentDate
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS)
-                onSuccess()
-            }
-        } ?: onSuccess()
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesSent.kt

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-5
- */
-
-package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
-    companion object {
-        const val TAG = "VulcanApiMessagesSent"
-    }
-
-    init {
-        data.profile?.also { profile ->
-            val startDate: String = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
-                else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
-            }
-            val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-                    val readBy = message.getInt("Przeczytane") ?: 0
-                    val unreadBy = message.getInt("Nieprzeczytane") ?: 0
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
-
-                    val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            body,
-                            TYPE_SENT,
-                            -1,
-                            -1
-                    )
-
-                    message.getJsonArray("Adresaci")?.asJsonObjectList()
-                            ?.forEachIndexed { _, recipient ->
-
-                                val recipientLoginId = recipient.getString("LoginId")
-                                        ?: return@forEachIndexed
-                                val recipientId = data.teacherList.singleOrNull { it.loginId == recipientLoginId }?.id
-                                        ?: return@forEachIndexed
-
-                                val readDate: Long = when (readBy) {
-                                    0 -> 0
-                                    else -> when (unreadBy) {
-                                        0 -> 1
-                                        else -> -1
-                                    }
-                                }
-
-                                val messageRecipientObject = MessageRecipient(
-                                        profileId,
-                                        recipientId,
-                                        -1,
-                                        readDate,
-                                        id
-                                )
-
-                                data.messageRecipientList.add(messageRecipientObject)
-                            }
-
-                    data.messageList.add(messageObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            true,
-                            true,
-                            sentDate
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_SENT, 1 * DAY, DRAWER_ITEM_MESSAGES)
-                onSuccess()
-            }
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiProposedGrades.kt

@@ -1,81 +0,0 @@
-package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.HOUR
-import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS
-import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_GRADES_SUMMARY
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class VulcanApiProposedGrades(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
-    companion object {
-        const val TAG = "VulcanApiProposedGrades"
-    }
-
-    init { data.profile?.also { profile ->
-
-        apiGet(TAG, VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS, parameters = mapOf(
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
-        )) { json, _ ->
-            val grades = json.getJsonObject("Data")
-
-            grades.getJsonArray("OcenyPrzewidywane")?.let {
-                processGradeList(it, isFinal = false)
-            }
-
-            grades.getJsonArray("OcenyKlasyfikacyjne")?.let {
-                processGradeList(it, isFinal = true)
-            }
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR)
-            onSuccess()
-        }
-    } ?: onSuccess()}
-
-    private fun processGradeList(grades: JsonArray, isFinal: Boolean) {
-        grades.asJsonObjectList()?.forEach { grade ->
-            val name = grade.get("Wpis").asString
-            val value = Utils.getGradeValue(name)
-            val subjectId = grade.get("IdPrzedmiot").asLong
-
-            val id = subjectId * -100 - data.studentSemesterNumber
-
-            val color = Utils.getVulcanGradeColor(name)
-
-            val gradeObject = Grade(
-                    profileId,
-                    id,
-                    "",
-                    color,
-                    "",
-                    name,
-                    value,
-                    0f,
-                    data.studentSemesterNumber,
-                    -1,
-                    subjectId
-            )
-            if (data.studentSemesterNumber == 1) {
-                gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER1_PROPOSED
-            } else {
-                gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER2_FINAL else Grade.TYPE_SEMESTER2_PROPOSED
-            }
-            data.gradeList.add(gradeObject)
-            data.metadataList.add(Metadata(
-                    profileId,
-                    Metadata.TYPE_GRADE,
-                    gradeObject.id,
-                    data.profile?.empty ?: false,
-                    data.profile?.empty ?: false,
-                    System.currentTimeMillis()
-            ))
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTemplate.kt

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
-
-class VulcanApiTemplate(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
-    companion object {
-        const val TAG = "VulcanApi"
-    }
-
-    init {
-        /* data.profile?.also { profile ->
-            apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
-                onSuccess()
-            }
-        } */
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/firstlogin/VulcanFirstLogin.kt

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.api.v2.vulcan.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_STUDENT_LIST
-import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLoginApi
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
-    companion object {
-        const val TAG = "VulcanFirstLogin"
-    }
-
-    private val api = VulcanApi(data)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        VulcanLoginApi(data) {
-            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response ->
-                val students = json.getJsonArray("Data")
-
-                if (students == null || students.size() < 1) {
-                    data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
-                            .withResponse(response)
-                            .withApiResponse(json))
-                    return@apiGet
-                }
-
-                students.forEach { studentEl ->
-                    val student = studentEl.asJsonObject
-
-                    val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach
-                    val schoolName = "${data.symbol}_$schoolSymbol"
-                    val studentId = student.getInt("Id") ?: return@forEach
-                    val studentLoginId = student.getInt("UzytkownikLoginId") ?: return@forEach
-                    val studentClassId = student.getInt("IdOddzial") ?: return@forEach
-                    val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@forEach)
-                    val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@forEach
-                    val studentFirstName = student.getString("Imie") ?: ""
-                    val studentLastName = student.getString("Nazwisko") ?: ""
-                    val studentNameLong = "$studentFirstName $studentLastName".fixName()
-                    val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
-
-                    val userLogin = student.getString("UzytkownikLogin") ?: ""
-                    val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@forEach
-                    val currentSemesterEndDate = (student.getLong("OkresDataDo")
-                            ?: return@forEach) + 86400
-                    val studentSemesterNumber = student.getInt("OkresNumer") ?: return@forEach
-
-                    val newProfile = Profile()
-                    newProfile.empty = true
-
-                    val isParent = student.getString("UzytkownikRola") == "opiekun"
-                    val userName = if (isParent)
-                        student.getString("UzytkownikNazwa")?.swapFirstLastName()?.fixName()
-                    else
-                        null
-                    newProfile.accountNameLong = userName
-                    newProfile.studentClassName = studentClassName
-                    val today = Date.getToday()
-                    newProfile.studentSchoolYear = "${today.year}/${today.year+1}"
-
-                    newProfile.putStudentData("studentId", studentId)
-                    newProfile.putStudentData("studentLoginId", studentLoginId)
-                    newProfile.putStudentData("studentClassId", studentClassId)
-                    newProfile.putStudentData("studentSemesterId", studentSemesterId)
-                    newProfile.putStudentData("schoolSymbol", schoolSymbol)
-                    newProfile.putStudentData("schoolName", schoolName)
-                    newProfile.putStudentData("currentSemesterEndDate", currentSemesterEndDate)
-                    newProfile.putStudentData("studentSemesterNumber", studentSemesterNumber)
-
-                    when (studentSemesterNumber) {
-                        1 -> {
-                            newProfile.dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            newProfile.dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                        2 -> {
-                            newProfile.dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            newProfile.dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                    }
-
-                    newProfile.studentNameLong = studentNameLong
-                    newProfile.studentNameShort = studentNameShort
-                    newProfile.name = studentNameLong
-                    newProfile.subname = userLogin
-
-                    profileList.add(newProfile)
-                }
-
-                EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore))
-                onSuccess()
-            }
-        }
-    }
-}

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

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+interface AbstractConfig {
+    fun set(key: String, value: String?)
+}

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

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import com.google.gson.JsonObject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+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.data.api.szkolny.response.Update
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import kotlin.coroutines.CoroutineContext
+
+class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
+    companion object {
+        const val DATA_VERSION = 12
+    }
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    val values: HashMap<String, String?> = hashMapOf()
+
+    val ui by lazy { ConfigUI(this) }
+    val sync by lazy { ConfigSync(this) }
+    val timetable by lazy { ConfigTimetable(this) }
+    val grades by lazy { ConfigGrades(this) }
+
+    private var mDataVersion: Int? = null
+    var dataVersion: Int
+        get() { mDataVersion = mDataVersion ?: values.get("dataVersion", 0); return mDataVersion ?: 0 }
+        set(value) { set("dataVersion", value); mDataVersion = value }
+
+    private var mHash: String? = null
+    var hash: String
+        get() { mHash = mHash ?: values.get("hash", ""); return mHash ?: "" }
+        set(value) { set("hash", value); mHash = value }
+
+    private var mLastProfileId: Int? = null
+    var lastProfileId: Int
+        get() { mLastProfileId = mLastProfileId ?: values.get("lastProfileId", 0); return mLastProfileId ?: 0 }
+        set(value) { set("lastProfileId", value); mLastProfileId = value }
+
+    private var mUpdatesChannel: String? = null
+    var updatesChannel: String
+        get() { mUpdatesChannel = mUpdatesChannel ?: values.get("updatesChannel", "release"); return mUpdatesChannel ?: "release" }
+        set(value) { set("updatesChannel", value); mUpdatesChannel = value }
+    private var mUpdate: Update? = null
+    var update: Update?
+        get() { mUpdate = mUpdate ?: values.get("update", null as Update?); return mUpdate ?: null as Update? }
+        set(value) { set("update", value); mUpdate = value }
+
+    private var mAppVersion: Int? = null
+    var appVersion: Int
+        get() { mAppVersion = mAppVersion ?: values.get("appVersion", BuildConfig.VERSION_CODE); return mAppVersion ?: BuildConfig.VERSION_CODE }
+        set(value) { set("appVersion", value); mAppVersion = value }
+
+    private var mLoginFinished: Boolean? = null
+    var loginFinished: Boolean
+        get() { mLoginFinished = mLoginFinished ?: values.get("loginFinished", false); return mLoginFinished ?: false }
+        set(value) { set("loginFinished", value); mLoginFinished = value }
+
+    private var mPrivacyPolicyAccepted: Boolean? = null
+    var privacyPolicyAccepted: Boolean
+        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 mDevModePassword: String? = null
+    var devModePassword: String?
+        get() { mDevModePassword = mDevModePassword ?: values.get("devModePassword", null as String?); return mDevModePassword }
+        set(value) { set("devModePassword", value); mDevModePassword = value }
+
+    private var mAppInstalledTime: Long? = null
+    var appInstalledTime: Long
+        get() { mAppInstalledTime = mAppInstalledTime ?: values.get("appInstalledTime", 0L); return mAppInstalledTime ?: 0L }
+        set(value) { set("appInstalledTime", value); mAppInstalledTime = value }
+
+    private var mAppRateSnackbarTime: Long? = null
+    var appRateSnackbarTime: Long
+        get() { mAppRateSnackbarTime = mAppRateSnackbarTime ?: values.get("appRateSnackbarTime", 0L); return mAppRateSnackbarTime ?: 0L }
+        set(value) { set("appRateSnackbarTime", value); mAppRateSnackbarTime = value }
+
+    private var mRunSync: Boolean? = null
+    var runSync: Boolean
+        get() { mRunSync = mRunSync ?: values.get("runSync", false); return mRunSync ?: false }
+        set(value) { set("runSync", value); mRunSync = value }
+
+    private var mWidgetConfigs: JsonObject? = null
+    var widgetConfigs: JsonObject
+        get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() }
+        set(value) { set("widgetConfigs", value); mWidgetConfigs = value }
+
+    private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
+    private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
+    init {
+        rawEntries.toHashMap(-1, values)
+    }
+    fun migrate(app: App) {
+        if (dataVersion < DATA_VERSION)
+            ConfigMigration(app, this)
+    }
+    fun getFor(profileId: Int): ProfileConfig {
+        return profileConfigs[profileId] ?: ProfileConfig(db, profileId, db.configDao().getAllNow(profileId)).also {
+            profileConfigs[profileId] = it
+        }
+    }
+    fun forProfile() = getFor(App.profileId)
+
+    fun setProfile(profileId: Int) {
+    }
+
+    override fun set(key: String, value: String?) {
+        values[key] = value
+        launch {
+            db.configDao().add(ConfigEntry(-1, key, value))
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.utils.managers.GradesManager
+
+class ConfigGrades(private val config: Config) {
+    private var mOrderBy: Int? = null
+    var orderBy: Int
+        get() { mOrderBy = mOrderBy ?: config.values.get("gradesOrderBy", 0); return mOrderBy ?: GradesManager.ORDER_BY_DATE_DESC }
+        set(value) { config.set("gradesOrderBy", value); mOrderBy = value }
+}

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

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+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
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class ConfigSync(private val config: Config) {
+    private var mDontShowAppManagerDialog: Boolean? = null
+    var dontShowAppManagerDialog: Boolean
+        get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false }
+        set(value) { config.set("dontShowAppManagerDialog", value); mDontShowAppManagerDialog = value }
+
+    private var mSyncEnabled: Boolean? = null
+    var enabled: Boolean
+        get() { mSyncEnabled = mSyncEnabled ?: config.values.get("syncEnabled", true); return mSyncEnabled ?: true }
+        set(value) { config.set("syncEnabled", value); mSyncEnabled = value }
+
+    private var mWebPushEnabled: Boolean? = null
+    var webPushEnabled: Boolean
+        get() { mWebPushEnabled = mWebPushEnabled ?: config.values.get("webPushEnabled", true); return mWebPushEnabled ?: true }
+        set(value) { config.set("webPushEnabled", value); mWebPushEnabled = value }
+
+    private var mSyncOnlyWifi: Boolean? = null
+    var onlyWifi: Boolean
+        get() { mSyncOnlyWifi = mSyncOnlyWifi ?: config.values.get("syncOnlyWifi", false); return mSyncOnlyWifi ?: notifyAboutUpdates }
+        set(value) { config.set("syncOnlyWifi", value); mSyncOnlyWifi = value }
+
+    private var mSyncInterval: Int? = null
+    var interval: Int
+        get() { mSyncInterval = mSyncInterval ?: config.values.get("syncInterval", 60*60); return mSyncInterval ?: 60*60 }
+        set(value) { config.set("syncInterval", value); mSyncInterval = value }
+
+    private var mNotifyAboutUpdates: Boolean? = null
+    var notifyAboutUpdates: Boolean
+        get() { mNotifyAboutUpdates = mNotifyAboutUpdates ?: config.values.get("notifyAboutUpdates", true); return mNotifyAboutUpdates ?: true }
+        set(value) { config.set("notifyAboutUpdates", value); mNotifyAboutUpdates = value }
+
+    private var mLastAppSync: Long? = null
+    var lastAppSync: Long
+        get() { mLastAppSync = mLastAppSync ?: config.values.get("lastAppSync", 0L); return mLastAppSync ?: 0L }
+        set(value) { config.set("lastAppSync", value); mLastAppSync = value }
+
+    /*     ____        _      _     _
+          / __ \      (_)    | |   | |
+         | |  | |_   _ _  ___| |_  | |__   ___  _   _ _ __ ___
+         | |  | | | | | |/ _ \ __| | '_ \ / _ \| | | | '__/ __|
+         | |__| | |_| | |  __/ |_  | | | | (_) | |_| | |  \__ \
+          \___\_\\__,_|_|\___|\__| |_| |_|\___/ \__,_|_|  |__*/
+    private var mQuietHoursEnabled: Boolean? = null
+    var quietHoursEnabled: Boolean
+        get() { mQuietHoursEnabled = mQuietHoursEnabled ?: config.values.get("quietHoursEnabled", false); return mQuietHoursEnabled ?: false }
+        set(value) { config.set("quietHoursEnabled", value); mQuietHoursEnabled = value }
+
+    private var mQuietHoursStart: Time? = null
+    var quietHoursStart: Time?
+        get() { mQuietHoursStart = mQuietHoursStart ?: config.values.get("quietHoursStart", null as Time?); return mQuietHoursStart }
+        set(value) { config.set("quietHoursStart", value); mQuietHoursStart = value }
+
+    private var mQuietHoursEnd: Time? = null
+    var quietHoursEnd: Time?
+        get() { mQuietHoursEnd = mQuietHoursEnd ?: config.values.get("quietHoursEnd", null as Time?); return mQuietHoursEnd }
+        set(value) { config.set("quietHoursEnd", value); mQuietHoursEnd = value }
+
+    private var mQuietDuringLessons: Boolean? = null
+    var quietDuringLessons: Boolean
+        get() { mQuietDuringLessons = mQuietDuringLessons ?: config.values.get("quietDuringLessons", false); return mQuietDuringLessons ?: false }
+        set(value) { config.set("quietDuringLessons", value); mQuietDuringLessons = value }
+
+    /*    ______ _____ __  __   _______    _
+         |  ____/ ____|  \/  | |__   __|  | |
+         | |__ | |    | \  / |    | | ___ | | _____ _ __  ___
+         |  __|| |    | |\/| |    | |/ _ \| |/ / _ \ '_ \/ __|
+         | |   | |____| |  | |    | | (_) |   <  __/ | | \__ \
+         |_|    \_____|_|  |_|    |_|\___/|_|\_\___|_| |_|__*/
+    private var mTokenApp: String? = null
+    var tokenApp: String?
+        get() { mTokenApp = mTokenApp ?: config.values.get("tokenApp", null as String?); return mTokenApp }
+        set(value) { config.set("tokenApp", value); mTokenApp = value }
+    private var mTokenMobidziennik: String? = null
+    var tokenMobidziennik: String?
+        get() { mTokenMobidziennik = mTokenMobidziennik ?: config.values.get("tokenMobidziennik", null as String?); return mTokenMobidziennik }
+        set(value) { config.set("tokenMobidziennik", value); mTokenMobidziennik = value }
+    private var mTokenLibrus: String? = null
+    var tokenLibrus: String?
+        get() { mTokenLibrus = mTokenLibrus ?: config.values.get("tokenLibrus", null as String?); return mTokenLibrus }
+        set(value) { config.set("tokenLibrus", value); mTokenLibrus = value }
+    private var mTokenVulcan: String? = null
+    var tokenVulcan: String?
+        get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
+        set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
+
+    private var mTokenMobidziennikList: List<Int>? = null
+    var tokenMobidziennikList: List<Int>
+        get() { mTokenMobidziennikList = mTokenMobidziennikList ?: config.values.getIntList("tokenMobidziennikList", listOf()); return mTokenMobidziennikList ?: listOf() }
+        set(value) { config.set("tokenMobidziennikList", value); mTokenMobidziennikList = value }
+    private var mTokenLibrusList: List<Int>? = null
+    var tokenLibrusList: List<Int>
+        get() { mTokenLibrusList = mTokenLibrusList ?: config.values.getIntList("tokenLibrusList", listOf()); return mTokenLibrusList ?: listOf() }
+        set(value) { config.set("tokenLibrusList", value); mTokenLibrusList = value }
+    private var mTokenVulcanList: List<Int>? = null
+    var tokenVulcanList: List<Int>
+        get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
+        set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class ConfigTimetable(private val config: Config) {
+    private var mBellSyncMultiplier: Int? = null
+    var bellSyncMultiplier: Int
+        get() { mBellSyncMultiplier = mBellSyncMultiplier ?: config.values.get("bellSyncMultiplier", 0); return mBellSyncMultiplier ?: 0 }
+        set(value) { config.set("bellSyncMultiplier", value); mBellSyncMultiplier = value }
+
+    private var mBellSyncDiff: Time? = null
+    var bellSyncDiff: Time?
+        get() { mBellSyncDiff = mBellSyncDiff ?: config.values.get("bellSyncDiff", null as Time?); return mBellSyncDiff }
+        set(value) { config.set("bellSyncDiff", value); mBellSyncDiff = value }
+
+    private var mCountInSeconds: Boolean? = null
+    var countInSeconds: Boolean
+        get() { mCountInSeconds = mCountInSeconds ?: config.values.get("countInSeconds", false); return mCountInSeconds ?: false }
+        set(value) { config.set("countInSeconds", value); mCountInSeconds = value }
+}

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+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 ConfigUI(private val config: Config) {
+    private var mTheme: Int? = null
+    var theme: Int
+        get() { mTheme = mTheme ?: config.values.get("theme", 1); return mTheme ?: 1 }
+        set(value) { config.set("theme", value); mTheme = value }
+
+    private var mLanguage: String? = null
+    var language: String?
+        get() { mLanguage = mLanguage ?: config.values.get("language", null as String?); return mLanguage }
+        set(value) { config.set("language", value); mLanguage = value }
+
+    private var mHeaderBackground: String? = null
+    var headerBackground: String?
+        get() { mHeaderBackground = mHeaderBackground ?: config.values.get("headerBg", null as String?); return mHeaderBackground }
+        set(value) { config.set("headerBg", value); mHeaderBackground = value }
+
+    private var mAppBackground: String? = null
+    var appBackground: String?
+        get() { mAppBackground = mAppBackground ?: config.values.get("appBg", null as String?); return mAppBackground }
+        set(value) { config.set("appBg", value); mAppBackground = value }
+
+    private var mMiniMenuVisible: Boolean? = null
+    var miniMenuVisible: Boolean
+        get() { mMiniMenuVisible = mMiniMenuVisible ?: config.values.get("miniMenuVisible", false); return mMiniMenuVisible ?: false }
+        set(value) { config.set("miniMenuVisible", value); mMiniMenuVisible = value }
+
+    private var mMiniMenuButtons: List<Int>? = null
+    var miniMenuButtons: List<Int>
+        get() { mMiniMenuButtons = mMiniMenuButtons ?: config.values.getIntList("miniMenuButtons", listOf()); return mMiniMenuButtons ?: listOf() }
+        set(value) { config.set("miniMenuButtons", value); mMiniMenuButtons = value }
+
+    private var mOpenDrawerOnBackPressed: Boolean? = null
+    var openDrawerOnBackPressed: Boolean
+        get() { mOpenDrawerOnBackPressed = mOpenDrawerOnBackPressed ?: config.values.get("openDrawerOnBackPressed", false); return mOpenDrawerOnBackPressed ?: false }
+        set(value) { config.set("openDrawerOnBackPressed", value); mOpenDrawerOnBackPressed = value }
+
+    private var mSnowfall: Boolean? = null
+    var snowfall: Boolean
+        get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false }
+        set(value) { config.set("snowfall", value); mSnowfall = value }
+
+    private var mBottomSheetOpened: Boolean? = null
+    var bottomSheetOpened: Boolean
+        get() { mBottomSheetOpened = mBottomSheetOpened ?: config.values.get("bottomSheetOpened", false); return mBottomSheetOpened ?: false }
+        set(value) { config.set("bottomSheetOpened", value); mBottomSheetOpened = value }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.config.db.ConfigEntry
+import pl.szczodrzynski.edziennik.config.utils.ProfileConfigMigration
+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.data.db.AppDb
+import kotlin.coroutines.CoroutineContext
+
+class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEntry>) : CoroutineScope, AbstractConfig {
+    companion object {
+        const val DATA_VERSION = 2
+    }
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    val values: HashMap<String, String?> = hashMapOf()
+
+    val grades by lazy { ProfileConfigGrades(this) }
+    val ui by lazy { ProfileConfigUI(this) }
+    val sync by lazy { ProfileConfigSync(this) }
+    /*
+    val timetable by lazy { ConfigTimetable(this) }
+    val grades by lazy { ConfigGrades(this) }*/
+
+    private var mDataVersion: Int? = null
+    var dataVersion: Int
+        get() { mDataVersion = mDataVersion ?: values.get("dataVersion", 0); return mDataVersion ?: 0 }
+        set(value) { set("dataVersion", value); mDataVersion = value }
+
+    private var mHash: String? = null
+    var hash: String
+        get() { mHash = mHash ?: values.get("hash", ""); return mHash ?: "" }
+        set(value) { set("hash", value); mHash = value }
+
+    init {
+        rawEntries.toHashMap(profileId, values)
+        if (dataVersion < DATA_VERSION)
+            ProfileConfigMigration(this)
+    }
+
+    override fun set(key: String, value: String?) {
+        values[key] = value
+        launch {
+            db.configDao().add(ConfigEntry(profileId, key, value))
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.getFloat
+import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED
+import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES
+
+class ProfileConfigGrades(private val config: ProfileConfig) {
+    private var mColorMode: Int? = null
+    var colorMode: Int
+        get() { mColorMode = mColorMode ?: config.values.get("gradesColorMode", COLOR_MODE_WEIGHTED); return mColorMode ?: COLOR_MODE_WEIGHTED }
+        set(value) { config.set("gradesColorMode", value); mColorMode = value }
+
+    private var mYearAverageMode: Int? = null
+    var yearAverageMode: Int
+        get() { mYearAverageMode = mYearAverageMode ?: config.values.get("yearAverageMode", YEAR_ALL_GRADES); return mYearAverageMode ?: YEAR_ALL_GRADES }
+        set(value) { config.set("yearAverageMode", value); mYearAverageMode = value }
+
+    private var mHideImproved: Boolean? = null
+    var hideImproved: Boolean
+        get() { mHideImproved = mHideImproved ?: config.values.get("hideImproved", false); return mHideImproved ?: false }
+        set(value) { config.set("hideImproved", value); mHideImproved = value }
+
+    private var mAverageWithoutWeight: Boolean? = null
+    var averageWithoutWeight: Boolean
+        get() { mAverageWithoutWeight = mAverageWithoutWeight ?: config.values.get("averageWithoutWeight", true); return mAverageWithoutWeight ?: true }
+        set(value) { config.set("averageWithoutWeight", value); mAverageWithoutWeight = value }
+
+    private var mPlusValue: Float? = null
+    var plusValue: Float?
+        get() { mPlusValue = mPlusValue ?: config.values.getFloat("plusValue"); return mPlusValue }
+        set(value) { config.set("plusValue", value); mPlusValue = value }
+    private var mMinusValue: Float? = null
+    var minusValue: Float?
+        get() { mMinusValue = mMinusValue ?: config.values.getFloat("minusValue"); return mMinusValue }
+        set(value) { config.set("minusValue", value); mMinusValue = value }
+
+    private var mDontCountEnabled: Boolean? = null
+    var dontCountEnabled: Boolean
+        get() { mDontCountEnabled = mDontCountEnabled ?: config.values.get("dontCountEnabled", false); return mDontCountEnabled ?: false }
+        set(value) { config.set("dontCountEnabled", value); mDontCountEnabled = value }
+    
+    private var mDontCountGrades: List<String>? = null
+    var dontCountGrades: List<String>
+        get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }
+        set(value) { config.set("dontCountGrades", value); mDontCountGrades = value }
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+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() }
+        set(value) { config.set("notificationFilter", value); mNotificationFilter = value }
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-19.
+ */
+
+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
+
+class ProfileConfigUI(private val config: ProfileConfig) {
+    private var mAgendaViewType: Int? = null
+    var agendaViewType: Int
+        get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: AGENDA_DEFAULT }
+        set(value) { config.set("agendaViewType", value); mAgendaViewType = value }
+
+    private var mHomeCards: List<HomeCardModel>? = null
+    var homeCards: List<HomeCardModel>
+        get() { mHomeCards = mHomeCards ?: config.values.get("homeCards", listOf(), HomeCardModel::class.java); return mHomeCards ?: listOf() }
+        set(value) { config.set("homeCards", value); mHomeCards = value }
+}

app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+package pl.szczodrzynski.edziennik.config.db
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface ConfigDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun add(entry: ConfigEntry)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addAll(list: List<ConfigEntry>)
+
+    @Query("SELECT * FROM config WHERE profileId = -1")
+    fun getAllNow(): List<ConfigEntry>
+
+    @Query("SELECT * FROM config WHERE profileId = :profileId")
+    fun getAllNow(profileId: Int): List<ConfigEntry>
+
+    @Query("DELETE FROM config WHERE profileId = :profileId")
+    fun clear(profileId: Int)
+}

app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigEntry.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-26.
+ */
+
+package pl.szczodrzynski.edziennik.config.db
+
+import androidx.room.Entity
+
+@Entity(tableName = "config", primaryKeys = ["profileId", "key"])
+data class ConfigEntry(
+        val profileId: Int = -1,
+        val key: String,
+        val value: String?
+)

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

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-19.
+ */
+
+package pl.szczodrzynski.edziennik.config.utils
+
+import android.content.SharedPreferences
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.config.Config
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
+import pl.szczodrzynski.edziennik.utils.models.Time
+import kotlin.math.abs
+
+class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
+    init { config.apply {
+        val s = "app.appConfig"
+        if (dataVersion < 1) {
+            ui.theme = p.getString("$s.appTheme", null)?.toIntOrNull() ?: 1
+            sync.enabled = p.getString("$s.registerSyncEnabled", null)?.toBoolean() ?: true
+            sync.interval = p.getString("$s.registerSyncInterval", null)?.toIntOrNull() ?: 3600
+            val oldButtons = p.getString("$s.miniDrawerButtonIds", null)?.let { str ->
+                str.replace("[\\[\\]]*".toRegex(), "")
+                        .split(",\\s?".toRegex())
+                        .mapNotNull { it.toIntOrNull() }
+            }
+            ui.miniMenuButtons = oldButtons ?: listOf(
+                    MainActivity.DRAWER_ITEM_HOME,
+                    MainActivity.DRAWER_ITEM_TIMETABLE,
+                    MainActivity.DRAWER_ITEM_AGENDA,
+                    MainActivity.DRAWER_ITEM_GRADES,
+                    MainActivity.DRAWER_ITEM_MESSAGES,
+                    MainActivity.DRAWER_ITEM_HOMEWORK,
+                    MainActivity.DRAWER_ITEM_SETTINGS
+            )
+            dataVersion = 1
+        }
+        if (dataVersion < 2) {
+            devModePassword = p.getString("$s.devModePassword", null).fix()
+            sync.tokenApp = p.getString("$s.fcmToken", null).fix()
+            timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0
+            appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0
+            timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false
+            ui.headerBackground = p.getString("$s.headerBackground", null).fix()
+            ui.appBackground = p.getString("$s.appBackground", null).fix()
+            ui.language = p.getString("$s.language", null).fix()
+            appVersion = p.getString("$s.lastAppVersion", null)?.toIntOrNull() ?: BuildConfig.VERSION_CODE
+            appInstalledTime = p.getString("$s.appInstalledTime", null)?.toLongOrNull() ?: 0
+            grades.orderBy = p.getString("$s.gradesOrderBy", null)?.toIntOrNull() ?: 0
+            sync.quietDuringLessons = p.getString("$s.quietDuringLessons", null)?.toBoolean() ?: false
+            ui.miniMenuVisible = p.getString("$s.miniDrawerVisible", null)?.toBoolean() ?: false
+            loginFinished = p.getString("$s.loginFinished", null)?.toBoolean() ?: false
+            sync.onlyWifi = p.getString("$s.registerSyncOnlyWifi", null)?.toBoolean() ?: false
+            sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true
+            timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) }
+
+            val startMillis = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0
+            val endMillis = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0
+            if (startMillis > 0) {
+                try {
+                    sync.quietHoursStart = Time.fromMillis(abs(startMillis))
+                    sync.quietHoursEnd = Time.fromMillis(abs(endMillis))
+                    sync.quietHoursEnabled = true
+                }
+                catch (_: Exception) {}
+            }
+            else {
+                sync.quietHoursEnabled = false
+                sync.quietHoursStart = null
+                sync.quietHoursEnd = null
+            }
+
+            sync.tokenMobidziennikList = listOf()
+            sync.tokenVulcanList = listOf()
+            sync.tokenLibrusList = listOf()
+            val tokens = p.getString("$s.fcmTokens", null)?.let { Gson().fromJson<Map<Int, Pair<String, List<Int>>>>(it, object: TypeToken<Map<Int, Pair<String, List<Int>>>>(){}.type) }
+            tokens?.forEach {
+                val token = it.value.first
+                when (it.key) {
+                    LOGIN_TYPE_MOBIDZIENNIK -> sync.tokenMobidziennik = token
+                    LOGIN_TYPE_VULCAN -> sync.tokenVulcan = token
+                    LOGIN_TYPE_LIBRUS -> sync.tokenLibrus = token
+                }
+            }
+            dataVersion = 2
+        }
+    }}
+
+    private fun String?.fix(): String? {
+        return this?.replace("\"", "")?.let { if (it == "null") null else it }
+    }
+}

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

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+package pl.szczodrzynski.edziennik.config.utils
+
+import com.google.gson.*
+import com.google.gson.reflect.TypeToken
+import pl.szczodrzynski.edziennik.config.AbstractConfig
+import pl.szczodrzynski.edziennik.config.db.ConfigEntry
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+private val gson = Gson()
+
+fun AbstractConfig.set(key: String, value: Int) {
+    set(key, value.toString())
+}
+fun AbstractConfig.set(key: String, value: Boolean) {
+    set(key, value.toString())
+}
+fun AbstractConfig.set(key: String, value: Long) {
+    set(key, value.toString())
+}
+fun AbstractConfig.set(key: String, value: Float) {
+    set(key, value.toString())
+}
+fun AbstractConfig.set(key: String, value: Date?) {
+    set(key, value?.stringY_m_d)
+}
+fun AbstractConfig.set(key: String, value: Time?) {
+    set(key, value?.stringValue)
+}
+fun AbstractConfig.set(key: String, value: JsonElement?) {
+    set(key, value?.toString())
+}
+fun AbstractConfig.set(key: String, value: List<Any>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
+fun AbstractConfig.set(key: String, value: Any?) {
+    set(key, value?.let { gson.toJson(it) })
+}
+fun AbstractConfig.setStringList(key: String, value: List<String>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
+fun AbstractConfig.setIntList(key: String, value: List<Int>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
+fun AbstractConfig.setLongList(key: String, value: List<Long>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
+
+fun HashMap<String, String?>.get(key: String, default: String?): String? {
+    return this[key] ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Boolean): Boolean {
+    return this[key]?.toBoolean() ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Int): Int {
+    return this[key]?.toIntOrNull() ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Long): Long {
+    return this[key]?.toLongOrNull() ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Float): Float {
+    return this[key]?.toFloatOrNull() ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Date?): Date? {
+    return this[key]?.let { Date.fromY_m_d(it) } ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: Time?): Time? {
+    return this[key]?.let { Time.fromHms(it) } ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: JsonObject?): JsonObject? {
+    return this[key]?.let { JsonParser().parse(it)?.asJsonObject } ?: default
+}
+fun HashMap<String, String?>.get(key: String, default: JsonArray?): JsonArray? {
+    return this[key]?.let { JsonParser().parse(it)?.asJsonArray } ?: default
+}
+inline fun <reified T> HashMap<String, String?>.get(key: String, default: T?): T? {
+    return this[key]?.let { Gson().fromJson(it, T::class.java) } ?: default
+}
+/* !!! cannot use mutable list here - modifying it will not update the DB */
+fun <T> HashMap<String, String?>.get(key: String, default: List<T>?, classOfT: Class<T>): List<T>? {
+    return this[key]?.let { ConfigGsonUtils().deserializeList<T>(gson, it, classOfT) } ?: default
+}
+fun HashMap<String, String?>.getStringList(key: String, default: List<String>?): List<String>? {
+    return this[key]?.let { gson.fromJson<List<String>>(it, object: TypeToken<List<String>>(){}.type) } ?: default
+}
+fun HashMap<String, String?>.getIntList(key: String, default: List<Int>?): List<Int>? {
+    return this[key]?.let { gson.fromJson<List<Int>>(it, object: TypeToken<List<Int>>(){}.type) } ?: default
+}
+fun HashMap<String, String?>.getLongList(key: String, default: List<Long>?): List<Long>? {
+    return this[key]?.let { gson.fromJson<List<Long>>(it, object: TypeToken<List<Long>>(){}.type) } ?: default
+}
+
+fun HashMap<String, String?>.getFloat(key: String): Float? {
+    return this[key]?.toFloatOrNull()
+}
+
+fun List<ConfigEntry>.toHashMap(profileId: Int, map: HashMap<String, String?>) {
+    map.clear()
+    forEach {
+        if (it.profileId == profileId)
+            map[it.key] = it.value
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-2.
+ */
+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.utils.models.Time
+
+class ConfigGsonUtils {
+    fun <T> deserializeList(gson: Gson, str: String?, classOfT: Class<T>): List<T> {
+        val json = JsonParser().parse(str)
+        val list: MutableList<T> = mutableListOf()
+        if (!json.isJsonArray)
+            return list
+
+        json.asJsonArray.forEach { e ->
+            when (classOfT) {
+                String::class.java -> {
+                    list += e.asString as T
+                }
+                HomeCardModel::class.java -> {
+                    val o = e.asJsonObject
+                    list += HomeCardModel(
+                            o.getInt("profileId", 0),
+                            o.getInt("cardId", 0)
+                    ) as T
+                }
+                Time::class.java -> {
+                    val o = e.asJsonObject
+                    list += Time(
+                            o.getInt("hour", 0),
+                            o.getInt("minute", 0),
+                            o.getInt("second", 0)
+                    ) as T
+                }
+            }
+        }
+
+        return list
+    }
+}

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-27.
+ */
+
+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.utils.managers.GradesManager.Companion.ORDER_BY_DATE_DESC
+import pl.szczodrzynski.edziennik.utils.models.Time
+import kotlin.math.abs
+
+class ConfigMigration(app: App, config: Config) {
+    init { config.apply {
+
+        val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE)
+        if (p.contains("app.appConfig.appTheme")) {
+            // migrate appConfig from app version 3.x and lower.
+            // Updates dataVersion to level 2.
+            AppConfigMigrationV3(p, config)
+        }
+
+        if (dataVersion < 2) {
+            appVersion = BuildConfig.VERSION_CODE
+            loginFinished = false
+            ui.language = null
+            ui.theme = 1
+            ui.appBackground = null
+            ui.headerBackground = null
+            ui.miniMenuVisible = false
+            ui.miniMenuButtons = listOf(
+                    MainActivity.DRAWER_ITEM_HOME,
+                    MainActivity.DRAWER_ITEM_TIMETABLE,
+                    MainActivity.DRAWER_ITEM_AGENDA,
+                    MainActivity.DRAWER_ITEM_GRADES,
+                    MainActivity.DRAWER_ITEM_MESSAGES,
+                    MainActivity.DRAWER_ITEM_HOMEWORK,
+                    MainActivity.DRAWER_ITEM_SETTINGS
+            )
+            sync.enabled = true
+            sync.interval = 1*HOUR.toInt()
+            sync.notifyAboutUpdates = true
+            sync.onlyWifi = false
+            sync.quietHoursEnabled = false
+            sync.quietHoursStart = null
+            sync.quietHoursEnd = null
+            sync.quietDuringLessons = false
+            sync.tokenApp = null
+            sync.tokenMobidziennik = null
+            sync.tokenMobidziennikList = listOf()
+            sync.tokenLibrus = null
+            sync.tokenLibrusList = listOf()
+            sync.tokenVulcan = null
+            sync.tokenVulcanList = listOf()
+            timetable.bellSyncMultiplier = 0
+            timetable.bellSyncDiff = null
+            timetable.countInSeconds = false
+            grades.orderBy = ORDER_BY_DATE_DESC
+
+            dataVersion = 2
+        }
+
+        if (dataVersion < 3) {
+            update = null
+            privacyPolicyAccepted = false
+            debugMode = false
+            devModePassword = null
+            appInstalledTime = 0L
+            appRateSnackbarTime = 0L
+
+            dataVersion = 3
+        }
+
+        if (dataVersion < 10) {
+            ui.openDrawerOnBackPressed = false
+            ui.snowfall = false
+            ui.bottomSheetOpened = false
+            sync.dontShowAppManagerDialog = false
+            sync.webPushEnabled = true
+            sync.lastAppSync = 0L
+
+
+            dataVersion = 10
+        }
+
+        if (dataVersion < 11) {
+            val startMillis = config.values.get("quietHoursStart", 0L)
+            val endMillis = config.values.get("quietHoursEnd", 0L)
+            if (startMillis > 0) {
+                try {
+                    sync.quietHoursStart = Time.fromMillis(abs(startMillis))
+                    sync.quietHoursEnd = Time.fromMillis(abs(endMillis))
+                    sync.quietHoursEnabled = true
+                }
+                catch (_: Exception) {}
+            }
+            else {
+                sync.quietHoursEnabled = false
+                sync.quietHoursStart = null
+                sync.quietHoursEnd = null
+            }
+
+            dataVersion = 11
+        }
+    }}
+}

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-1.
+ */
+
+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.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED
+import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES
+
+class ProfileConfigMigration(config: ProfileConfig) {
+    init { config.apply {
+
+        if (dataVersion < 1) {
+            grades.colorMode = COLOR_MODE_WEIGHTED
+            grades.yearAverageMode = YEAR_ALL_GRADES
+            grades.hideImproved = false
+            grades.averageWithoutWeight = true
+            grades.plusValue = null
+            grades.minusValue = null
+            grades.dontCountEnabled = false
+            grades.dontCountGrades = listOf()
+            ui.agendaViewType = AGENDA_DEFAULT
+            // no migration for ui.homeCards
+
+            dataVersion = 1
+        }
+
+        if (dataVersion < 2) {
+            sync.notificationFilter = sync.notificationFilter + Notification.TYPE_TEACHER_ABSENCE
+
+            dataVersion = 2
+        }
+    }}
+}

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

@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-9-28.
  */
 
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api
 
 import android.app.Service
 import android.content.Context
@@ -12,15 +12,17 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.events.*
-import pl.szczodrzynski.edziennik.api.v2.events.requests.ServiceCloseRequest
-import pl.szczodrzynski.edziennik.api.v2.events.requests.TaskCancelRequest
-import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
-import pl.szczodrzynski.edziennik.api.v2.events.task.ErrorReportTask
-import pl.szczodrzynski.edziennik.api.v2.events.task.IApiTask
-import pl.szczodrzynski.edziennik.api.v2.events.task.NotifyTask
-import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.events.*
+import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest
+import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+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.utils.Utils.d
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -28,7 +30,7 @@ import kotlin.math.roundToInt
 class ApiService : Service() {
     companion object {
         const val TAG = "ApiService"
-        const val NOTIFICATION_API_CHANNEL_ID = "pl.szczodrzynski.edziennik.GET_DATA"
+        const val NOTIFICATION_API_CHANNEL_ID = "pl.szczodrzynski.edziennik.SYNC"
         fun start(context: Context) {
             context.startService(Intent(context, ApiService::class.java))
         }
@@ -36,29 +38,34 @@ class ApiService : Service() {
             context.startService(Intent(context, ApiService::class.java))
             EventBus.getDefault().postSticky(request)
         }
+
+        var lastEventTime = System.currentTimeMillis()
+        var taskCancelTries = 0
     }
 
     private val app by lazy { applicationContext as App }
 
-    private val finishingTaskQueue = mutableListOf(
-            NotifyTask(),
-            ErrorReportTask()
-    )
+    private val syncingProfiles = mutableListOf<Profile>()
+
+    private var szkolnyTaskFinished = false
+    private val allTaskRequestList = mutableListOf<Any>()
     private val taskQueue = mutableListOf<IApiTask>()
     private val errorList = mutableListOf<ApiError>()
 
     private var serviceClosed = false
+        set(value) { field = value; notification.serviceClosed = value }
     private var taskCancelled = false
     private var taskIsRunning = false
     private var taskRunning: IApiTask? = null // for debug purposes
     private var taskRunningId = -1
+    private var taskStartTime = 0L
     private var taskMaximumId = 0
 
     private var taskProfileId = -1
     private var taskProgress = -1f
     private var taskProgressText: String? = null
 
-    private val notification by lazy { EdziennikNotification(this) }
+    private val notification by lazy { EdziennikNotification(app) }
 
     /*    ______    _     _                  _ _       _____      _ _ _                _
          |  ____|  | |   (_)                (_) |     / ____|    | | | |              | |
@@ -68,33 +75,33 @@ class ApiService : Service() {
          |______\__,_/___|_|\___|_| |_|_| |_|_|_|\_\  \_____\__,_|_|_|_.__/ \__,_|\___|_|\*/
     private val taskCallback = object : EdziennikCallback {
         override fun onCompleted() {
-            d(TAG, "Task $taskRunningId (profile $taskProfileId) - $taskProgressText - finished")
-            //if (!taskCancelled) {
-                EventBus.getDefault().post(ApiTaskFinishedEvent(taskProfileId))
-            //}
-            taskIsRunning = false
-            taskRunningId = -1
-            taskRunning = null
-            taskProfileId = -1
-            taskProgress = -1f
-            taskProgressText = null
+            lastEventTime = System.currentTimeMillis()
+            d(TAG, "Task $taskRunningId (profile $taskProfileId) finished in ${System.currentTimeMillis()-taskStartTime}")
+            EventBus.getDefault().postSticky(ApiTaskFinishedEvent(taskProfileId))
+            clearTask()
 
             notification.setIdle().post()
             runTask()
         }
 
         override fun onError(apiError: ApiError) {
+            lastEventTime = System.currentTimeMillis()
             d(TAG, "Task $taskRunningId threw an error - $apiError")
             apiError.profileId = taskProfileId
-            EventBus.getDefault().post(ApiTaskErrorEvent(apiError))
-            errorList.add(apiError)
-            apiError.throwable?.printStackTrace()
+
+            if (app.userActionManager.requiresUserAction(apiError)) {
+                app.userActionManager.sendToUser(apiError)
+            }
+            else {
+                EventBus.getDefault().postSticky(ApiTaskErrorEvent(apiError))
+                errorList.add(apiError)
+                apiError.throwable?.printStackTrace()
+            }
+
             if (apiError.isCritical) {
                 taskRunning?.cancel()
                 notification.setCriticalError().post()
-                taskRunning = null
-                taskIsRunning = false
-                taskRunningId = -1
+                clearTask()
                 runTask()
             }
             else {
@@ -103,6 +110,7 @@ class ApiService : Service() {
         }
 
         override fun onProgress(step: Float) {
+            lastEventTime = System.currentTimeMillis()
             if (step <= 0)
                 return
             if (taskProgress < 0)
@@ -115,6 +123,7 @@ class ApiService : Service() {
         }
 
         override fun onStartProgress(stringRes: Int) {
+            lastEventTime = System.currentTimeMillis()
             taskProgressText = getString(stringRes)
             d(TAG, "Task $taskRunningId progress: $taskProgressText")
             EventBus.getDefault().post(ApiTaskProgressEvent(taskProfileId, taskProgress, taskProgressText))
@@ -129,15 +138,23 @@ class ApiService : Service() {
             | | (_| \__ \   <  |  __/>  <  __/ (__| |_| | |_| | (_) | | | |
             |_|\__,_|___/_|\_\  \___/_/\_\___|\___|\__,_|\__|_|\___/|_| |*/
     private fun runTask() {
+        checkIfTaskFrozen()
         if (taskIsRunning)
             return
-        if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && finishingTaskQueue.isEmpty())) {
-            serviceClosed = false
+        if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && szkolnyTaskFinished)) {
             allCompleted()
             return
         }
 
-        val task = if (taskQueue.isEmpty()) finishingTaskQueue.removeAt(0) else taskQueue.removeAt(0)
+        lastEventTime = System.currentTimeMillis()
+
+        val task = if (taskQueue.isNotEmpty()) {
+            taskQueue.removeAt(0)
+        } else {
+            szkolnyTaskFinished = true
+            SzkolnyTask(app, syncingProfiles)
+        }
+
         task.taskId = ++taskMaximumId
         task.prepare(app)
         taskIsRunning = true
@@ -147,7 +164,7 @@ class ApiService : Service() {
         taskProgress = -1f
         taskProgressText = task.taskName
 
-        d(TAG, "Executing task $taskRunningId ($taskProgressText) - $task")
+        d(TAG, "Executing task $taskRunningId - ${task::class.java.name}")
 
         // update the notification
         notification.setCurrentTask(taskRunningId, taskProgressText).post()
@@ -155,19 +172,65 @@ class ApiService : Service() {
         // post an event
         EventBus.getDefault().post(ApiTaskStartedEvent(taskProfileId, task.profile))
 
+        task.profile?.let { syncingProfiles.add(it) }
+
+        taskStartTime = System.currentTimeMillis()
         try {
             when (task) {
                 is EdziennikTask -> task.run(app, taskCallback)
-                is NotifyTask -> task.run(app, taskCallback)
                 is ErrorReportTask -> task.run(app, taskCallback, notification, errorList)
+                is SzkolnyTask -> task.run(taskCallback)
             }
         } catch (e: Exception) {
-            taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e))
+            taskCallback.onError(e.toApiError(TAG))
         }
     }
 
+    /**
+     * Check if a task is inactive for more than 30 seconds.
+     * If the user tries to cancel a task with no success at least three times,
+     * consider it frozen as well.
+     *
+     * This usually means it is broken and won't become active again.
+     * This method cancels the task and removes any pointers to it.
+     */
+    private fun checkIfTaskFrozen(): Boolean {
+        if (System.currentTimeMillis() - lastEventTime > 30*1000
+                || taskCancelTries >= 3) {
+            val time = System.currentTimeMillis() - lastEventTime
+            d(TAG, "!!! Task $taskRunningId froze for $time ms. $taskRunning")
+            clearTask()
+            return true
+        }
+        return false
+    }
+
+    /**
+     * Stops the service if the current task is frozen/broken.
+     */
+    private fun stopIfTaskFrozen() {
+        if (checkIfTaskFrozen()) {
+            allCompleted()
+        }
+    }
+
+    /**
+     * Remove any task descriptors or pointers from the service.
+     */
+    private fun clearTask() {
+        taskIsRunning = false
+        taskRunningId = -1
+        taskRunning = null
+        taskProfileId = -1
+        taskProgress = -1f
+        taskProgressText = null
+        taskCancelled = false
+        taskCancelTries = 0
+    }
+
     private fun allCompleted() {
-        EventBus.getDefault().post(ApiTaskAllFinishedEvent())
+        serviceClosed = true
+        EventBus.getDefault().postSticky(ApiTaskAllFinishedEvent())
         stopSelf()
     }
 
@@ -182,6 +245,13 @@ class ApiService : Service() {
         EventBus.getDefault().removeStickyEvent(task)
         d(TAG, task.toString())
 
+        if (task is EdziennikTask) {
+            // fix for duplicated tasks, thank you EventBus
+            if (task.request in allTaskRequestList)
+                return
+            allTaskRequestList += task.request
+        }
+
         if (task is EdziennikTask) {
             when (task.request) {
                 is EdziennikTask.SyncRequest -> app.db.profileDao().idsForSyncNow.forEach {
@@ -211,8 +281,10 @@ class ApiService : Service() {
         EventBus.getDefault().removeStickyEvent(request)
         d(TAG, request.toString())
 
+        taskCancelTries++
         taskCancelled = true
         taskRunning?.cancel()
+        stopIfTaskFrozen()
     }
     @Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
     fun onServiceCloseRequest(request: ServiceCloseRequest) {
@@ -222,7 +294,7 @@ class ApiService : Service() {
         serviceClosed = true
         taskCancelled = true
         taskRunning?.cancel()
-        stopSelf()
+        allCompleted()
     }
 
     /*     _____                 _                                     _     _
@@ -239,11 +311,13 @@ class ApiService : Service() {
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         d(TAG, "Foreground service onStartCommand")
-        startForeground(EdziennikNotification.NOTIFICATION_ID, notification.notification)
+        startForeground(app.notificationChannelsManager.sync.id, notification.notification)
         return START_NOT_STICKY
     }
 
     override fun onDestroy() {
+        d(TAG, "Service destroyed")
+        serviceClosed = true
         EventBus.getDefault().unregister(this)
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/AppError.java

@@ -1,320 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.util.Log;
-
-import com.google.gson.JsonObject;
-
-import java.io.InterruptedIOException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-
-import javax.net.ssl.SSLException;
-
-import im.wangchao.mhttp.Request;
-import im.wangchao.mhttp.Response;
-import pl.szczodrzynski.edziennik.R;
-
-
-public class AppError {
-    public static final int CODE_OTHER = 0;
-    public static final int CODE_OK = 1;
-    public static final int CODE_NO_INTERNET = 10;
-    public static final int CODE_SSL_ERROR = 13;
-    public static final int CODE_ARCHIVED = 5;
-    public static final int CODE_MAINTENANCE = 6;
-    public static final int CODE_LOGIN_ERROR = 7;
-    public static final int CODE_ACCOUNT_MISMATCH = 8;
-    public static final int CODE_APP_SERVER_ERROR = 9;
-    public static final int CODE_MULTIACCOUNT_SETUP = 12;
-    public static final int CODE_TIMEOUT = 11;
-    public static final int CODE_PROFILE_NOT_FOUND = 14;
-    public static final int CODE_ATTACHMENT_NOT_AVAILABLE = 28;
-    // user's fault
-    public static final int CODE_INVALID_LOGIN = 2;
-    public static final int CODE_INVALID_SERVER_ADDRESS = 21;
-    public static final int CODE_INVALID_SCHOOL_NAME = 22;
-    public static final int CODE_INVALID_DEVICE = 23;
-    public static final int CODE_OLD_PASSWORD = 4;
-    public static final int CODE_INVALID_TOKEN = 24;
-    public static final int CODE_EXPIRED_TOKEN = 27;
-    public static final int CODE_INVALID_SYMBOL = 25;
-    public static final int CODE_INVALID_PIN = 26;
-    public static final int CODE_LIBRUS_NOT_ACTIVATED = 29;
-    public static final int CODE_SYNERGIA_NOT_ACTIVATED = 32;
-    public static final int CODE_LIBRUS_DISCONNECTED = 31;
-    public static final int CODE_PROFILE_ARCHIVED = 30;
-
-
-    public static final int CODE_INTERNAL_MISSING_DATA = 100;
-    // internal errors - not for user's information.
-    // these error codes are processed in API main classes
-
-    public String TAG;
-    public int line;
-    public int errorCode;
-    public String errorText;
-    public Response response;
-    public Request request;
-    public Throwable throwable;
-    public String apiResponse;
-
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, Request request, Throwable throwable, String apiResponse) {
-        this.TAG = TAG;
-        this.line = line;
-        this.errorCode = errorCode;
-        this.errorText = errorText;
-        this.response = response;
-        this.request = request;
-        this.throwable = throwable;
-        this.apiResponse = apiResponse;
-    }
-
-    public AppError(String TAG, int line, int errorCode) {
-        this(TAG, line, errorCode, null, null, null, null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, Throwable throwable, String apiResponse) {
-        this(TAG, line, errorCode, null, null, null, throwable, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, null, null, throwable, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, Response response, String apiResponse) {
-        this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, String apiResponse) {
-        this(TAG, line, errorCode, errorText, null, null, null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText, JsonObject apiResponse) {
-        this(TAG, line, errorCode, errorText, null, null, null, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, String errorText) {
-        this(TAG, line, errorCode, errorText, null, null, null, null);
-    }
-    public AppError(String TAG, int line, int errorCode, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, null, null, null, apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse == null ? null : apiResponse.toString());
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, String apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, String apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse);
-    }
-    public AppError(String TAG, int line, int errorCode, Response response, JsonObject apiResponse) {
-        this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString());
-    }
-
-    public String getDetails(Context context) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(stringErrorCode(context, errorCode, errorText)).append("\n");
-        sb.append("(").append(stringErrorType(errorCode)).append("#").append(errorCode).append(")\n");
-        sb.append("at ").append(TAG).append(":").append(line).append("\n");
-        sb.append("\n");
-        if (throwable == null)
-            sb.append("Throwable is null");
-        else
-            sb.append(Log.getStackTraceString(throwable));
-        sb.append("\n");
-        sb.append(Build.MANUFACTURER).append(" ").append(Build.BRAND).append(" ").append(Build.MODEL).append(" ").append(Build.DEVICE).append("\n");
-
-        return sb.toString();
-    }
-
-    public interface GetApiResponseCallback {
-        void onSuccess(String apiResponse);
-    }
-    /**
-     *
-     * @param context a Context
-     * @param apiResponseCallback a callback executed on a worker thread
-     */
-    public void getApiResponse(Context context, GetApiResponseCallback apiResponseCallback) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Request:\n");
-        if (request != null) {
-            sb.append(request.method()).append(" ").append(request.url().toString()).append("\n");
-            sb.append(request.headers().toString()).append("\n");
-            sb.append("\n");
-            sb.append(request.bodyToString()).append("\n\n");
-        }
-        else
-            sb.append("null\n\n");
-
-        if (apiResponse == null && response != null)
-            apiResponse = response.parserErrorBody;
-
-        sb.append("Response:\n");
-        if (response != null) {
-            sb.append(response.code()).append(" ").append(response.message()).append("\n");
-            sb.append(response.headers().toString()).append("\n");
-            sb.append("\n");
-            if (apiResponse == null) {
-                if (Thread.currentThread().getName().equals("main")) {
-                    AsyncTask.execute(() -> {
-                        if (response.raw().body() != null) {
-                            try {
-                                sb.append(response.raw().body().string());
-                            } catch (Exception e) {
-                                sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e));
-                            }
-                        }
-                        else {
-                            sb.append("null");
-                        }
-                        apiResponseCallback.onSuccess(sb.toString());
-                    });
-                }
-                else {
-                    if (response.raw().body() != null) {
-                        try {
-                            sb.append(response.raw().body().string());
-                        } catch (Exception e) {
-                            sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e));
-                        }
-                    }
-                    else {
-                        sb.append("null");
-                    }
-                    apiResponseCallback.onSuccess(sb.toString());
-                }
-                return;
-            }
-        }
-        else
-            sb.append("null\n\n");
-
-        sb.append("API Response:\n");
-        if (apiResponse != null) {
-            sb.append(apiResponse).append("\n\n");
-        }
-        else {
-            sb.append("null\n\n");
-        }
-
-        apiResponseCallback.onSuccess(sb.toString());
-    }
-
-    public AppError changeIfCodeOther() {
-        if (errorCode != CODE_OTHER && errorCode != CODE_MAINTENANCE)
-            return this;
-        if (throwable instanceof UnknownHostException)
-            errorCode = CODE_NO_INTERNET;
-        else if (throwable instanceof SSLException)
-            errorCode = CODE_SSL_ERROR;
-        else if (throwable instanceof SocketTimeoutException)
-            errorCode = CODE_TIMEOUT;
-        else if (throwable instanceof InterruptedIOException)
-            errorCode = CODE_NO_INTERNET;
-        else if (response != null &&
-                (response.code() == 424
-                        || response.code() == 400
-                        || response.code() == 401
-                        || response.code() == 500
-                        || response.code() == 503
-                        || response.code() == 404))
-            errorCode = CODE_MAINTENANCE;
-        return this;
-    }
-
-    public String asReadableString(Context context) {
-        return stringErrorCode(context, errorCode, errorText) + (errorCode == CODE_MAINTENANCE && errorText != null && !errorText.isEmpty() ? " ("+errorText+")" : "");
-    }
-
-    public static String stringErrorCode(Context context, int errorCode, String errorText)
-    {
-        switch (errorCode) {
-            case CODE_OK:
-                return context.getString(R.string.sync_error_ok);
-            case CODE_INVALID_LOGIN:
-                return context.getString(R.string.sync_error_invalid_login);
-            case CODE_LOGIN_ERROR:
-                return context.getString(R.string.sync_error_login_error);
-            case CODE_INVALID_DEVICE:
-                return context.getString(R.string.sync_error_invalid_device);
-            case CODE_OLD_PASSWORD:
-                return context.getString(R.string.sync_error_old_password);
-            case CODE_ARCHIVED:
-                return context.getString(R.string.sync_error_archived);
-            case CODE_MAINTENANCE:
-                return context.getString(R.string.sync_error_maintenance);
-            case CODE_NO_INTERNET:
-                return context.getString(R.string.sync_error_no_internet);
-            case CODE_ACCOUNT_MISMATCH:
-                return context.getString(R.string.sync_error_account_mismatch);
-            case CODE_APP_SERVER_ERROR:
-                return context.getString(R.string.sync_error_app_server);
-            case CODE_TIMEOUT:
-                return context.getString(R.string.sync_error_timeout);
-            case CODE_SSL_ERROR:
-                return context.getString(R.string.sync_error_ssl);
-            case CODE_INVALID_SERVER_ADDRESS:
-                return context.getString(R.string.sync_error_invalid_server_address);
-            case CODE_INVALID_SCHOOL_NAME:
-                return context.getString(R.string.sync_error_invalid_school_name);
-            case CODE_PROFILE_NOT_FOUND:
-                return context.getString(R.string.sync_error_profile_not_found);
-            case CODE_INVALID_TOKEN:
-                return context.getString(R.string.sync_error_invalid_token);
-            case CODE_ATTACHMENT_NOT_AVAILABLE:
-                return context.getString(R.string.sync_error_attachment_not_available);
-            case CODE_LIBRUS_NOT_ACTIVATED:
-                return context.getString(R.string.sync_error_librus_not_activated);
-            case CODE_PROFILE_ARCHIVED:
-                return context.getString(R.string.sync_error_profile_archived);
-            case CODE_LIBRUS_DISCONNECTED:
-                return context.getString(R.string.sync_error_librus_disconnected);
-            case CODE_SYNERGIA_NOT_ACTIVATED:
-                return context.getString(R.string.sync_error_synergia_not_activated);
-            default:
-            case CODE_MULTIACCOUNT_SETUP:
-            case CODE_OTHER:
-                return errorText != null ? errorText : context.getString(R.string.sync_error_unknown);
-        }
-    }
-    public static String stringErrorType(int errorCode)
-    {
-        switch (errorCode) {
-            default:
-            case CODE_OTHER: return "CODE_OTHER";
-            case CODE_OK: return "CODE_OK";
-            case CODE_NO_INTERNET: return "CODE_NO_INTERNET";
-            case CODE_SSL_ERROR: return "CODE_SSL_ERROR";
-            case CODE_ARCHIVED: return "CODE_ARCHIVED";
-            case CODE_MAINTENANCE: return "CODE_MAINTENANCE";
-            case CODE_LOGIN_ERROR: return "CODE_LOGIN_ERROR";
-            case CODE_ACCOUNT_MISMATCH: return "CODE_ACCOUNT_MISMATCH";
-            case CODE_APP_SERVER_ERROR: return "CODE_APP_SERVER_ERROR";
-            case CODE_MULTIACCOUNT_SETUP: return "CODE_MULTIACCOUNT_SETUP";
-            case CODE_TIMEOUT: return "CODE_TIMEOUT";
-            case CODE_PROFILE_NOT_FOUND: return "CODE_PROFILE_NOT_FOUND";
-            case CODE_INVALID_LOGIN: return "CODE_INVALID_LOGIN";
-            case CODE_INVALID_SERVER_ADDRESS: return "CODE_INVALID_SERVER_ADDRESS";
-            case CODE_INVALID_SCHOOL_NAME: return "CODE_INVALID_SCHOOL_NAME";
-            case CODE_INVALID_DEVICE: return "CODE_INVALID_DEVICE";
-            case CODE_OLD_PASSWORD: return "CODE_OLD_PASSWORD";
-            case CODE_INVALID_TOKEN: return "CODE_INVALID_TOKEN";
-            case CODE_EXPIRED_TOKEN: return "CODE_EXPIRED_TOKEN";
-            case CODE_INVALID_SYMBOL: return "CODE_INVALID_SYMBOL";
-            case CODE_INVALID_PIN: return "CODE_INVALID_PIN";
-            case CODE_ATTACHMENT_NOT_AVAILABLE: return "CODE_ATTACHMENT_NOT_AVAILABLE";
-            case CODE_LIBRUS_NOT_ACTIVATED: return "CODE_LIBRUS_NOT_ACTIVATED";
-            case CODE_PROFILE_ARCHIVED: return "CODE_PROFILE_ARCHIVED";
-            case CODE_LIBRUS_DISCONNECTED: return "CODE_LIBRUS_DISCONNECTED";
-            case CODE_SYNERGIA_NOT_ACTIVATED: return "CODE_SYNERGIA_NOT_ACTIVATED";
-        }
-    }
-}

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

@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-9-19.
  */
 
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api
 
 import android.os.Build
 import pl.szczodrzynski.edziennik.BuildConfig
@@ -14,17 +14,17 @@ val SYSTEM_USER_AGENT = System.getProperty("http.agent") ?: "Dalvik/2.1.0 Androi
 
 val SERVER_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME} $SYSTEM_USER_AGENT"
 
-const val FAKE_LIBRUS_API = "http://librus.szkolny.eu/api"
-const val FAKE_LIBRUS_PORTAL = "http://librus.szkolny.eu"
-const val FAKE_LIBRUS_AUTHORIZE = "http://librus.szkolny.eu/authorize.php"
-const val FAKE_LIBRUS_LOGIN = "http://librus.szkolny.eu/login_action.php"
-const val FAKE_LIBRUS_TOKEN = "http://librus.szkolny.eu/access_token.php"
+const val FAKE_LIBRUS_API = "https://librus.szkolny.eu/api"
+const val FAKE_LIBRUS_PORTAL = "https://librus.szkolny.eu"
+const val FAKE_LIBRUS_AUTHORIZE = "https://librus.szkolny.eu/authorize.php"
+const val FAKE_LIBRUS_LOGIN = "https://librus.szkolny.eu/login_action.php"
+const val FAKE_LIBRUS_TOKEN = "https://librus.szkolny.eu/access_token.php"
 const val FAKE_LIBRUS_ACCOUNT = "/synergia_accounts_fresh.php?login="
 const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"
 
-val LIBRUS_USER_AGENT = "$SYSTEM_USER_AGENT LibrusMobileApp"
+val LIBRUS_USER_AGENT = "${SYSTEM_USER_AGENT}LibrusMobileApp"
 const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0"
-const val LIBRUS_CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv"
+const val LIBRUS_CLIENT_ID = "6XPsKf10LPz1nxgHQLcvZ1KM48DYzlBAhxipaXY8"
 const val LIBRUS_REDIRECT_URL = "http://localhost/bar"
 const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
 const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
@@ -56,18 +56,28 @@ const val LIBRUS_SYNERGIA_TOKEN_LOGIN_URL = "https://synergia.librus.pl/loguj/to
 const val LIBRUS_MESSAGES_URL = "https://wiadomosci.librus.pl/module"
 const val LIBRUS_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action="
 
+const val LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL = "https://synergia.librus.pl/homework/downloadFile"
+
 const val IDZIENNIK_USER_AGENT = SYNERGIA_USER_AGENT
 const val IDZIENNIK_WEB_URL = "https://iuczniowie.progman.pl/idziennik"
 const val IDZIENNIK_WEB_LOGIN = "login.aspx"
 const val IDZIENNIK_WEB_SETTINGS = "mod_panelRodzica/Ustawienia.aspx"
+const val IDZIENNIK_WEB_HOME = "mod_panelRodzica/StronaGlowna.aspx"
 const val IDZIENNIK_WEB_TIMETABLE = "mod_panelRodzica/plan/WS_Plan.asmx/pobierzPlanZajec"
 const val IDZIENNIK_WEB_GRADES = "mod_panelRodzica/oceny/WS_ocenyUcznia.asmx/pobierzOcenyUcznia"
 const val IDZIENNIK_WEB_MISSING_GRADES = "mod_panelRodzica/brak_ocen/WS_BrakOcenUcznia.asmx/pobierzBrakujaceOcenyUcznia"
 const val IDZIENNIK_WEB_EXAMS = "mod_panelRodzica/sprawdziany/mod_sprawdzianyPanel.asmx/pobierzListe"
+const val IDZIENNIK_WEB_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzPraceDomowe"
 const val IDZIENNIK_WEB_NOTICES = "mod_panelRodzica/uwagi/WS_uwagiUcznia.asmx/pobierzUwagiUcznia"
 const val IDZIENNIK_WEB_ATTENDANCE = "mod_panelRodzica/obecnosci/WS_obecnosciUcznia.asmx/pobierzObecnosciUcznia"
 const val IDZIENNIK_WEB_ANNOUNCEMENTS = "mod_panelRodzica/tabOgl/WS_tablicaOgloszen.asmx/GetOgloszenia"
 const val IDZIENNIK_WEB_MESSAGES_LIST = "mod_komunikator/WS_wiadomosci.asmx/PobierzListeWiadomosci"
+const val IDZIENNIK_WEB_GET_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/PobierzWiadomosc"
+const val IDZIENNIK_WEB_GET_RECIPIENT_LIST = "mod_komunikator/WS_wiadomosci.asmx/pobierzListeOdbiorcowPanelRodzic"
+const val IDZIENNIK_WEB_SEND_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/WyslijWiadomosc"
+const val IDZIENNIK_WEB_GET_ATTACHMENT = "mod_komunikator/Download.ashx"
+const val IDZIENNIK_WEB_GET_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzJednaPraceDomowa"
+const val IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT = "mod_panelRodzica/pracaDomowa.aspx"
 
 val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT
 const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api"
@@ -99,4 +109,9 @@ const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje
 const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane"
 const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane"
 const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
+const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWiadomosc"
 const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
+const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
+const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
+
+const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"

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

@@ -2,28 +2,26 @@
  * Copyright (c) Kuba Szczodrzyński 2019-10-1.
  */
 
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api
 
 import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 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.receivers.SzkolnyReceiver
 import kotlin.math.roundToInt
 
 
-class EdziennikNotification(val context: Context) {
-    companion object {
-        const val NOTIFICATION_ID = 20191001
-    }
-
-    private val notificationManager by lazy { context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
+class EdziennikNotification(val app: App) {
+    private val notificationManager by lazy { app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
 
     private val notificationBuilder: NotificationCompat.Builder by lazy {
-        NotificationCompat.Builder(context, ApiService.NOTIFICATION_API_CHANNEL_ID)
+        NotificationCompat.Builder(app, ApiService.NOTIFICATION_API_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notification)
                 .setPriority(PRIORITY_MIN)
                 .setOngoing(true)
@@ -35,39 +33,42 @@ class EdziennikNotification(val context: Context) {
 
     private var errorCount = 0
     private var criticalErrorCount = 0
+    var serviceClosed = false
 
     private fun cancelPendingIntent(taskId: Int): PendingIntent {
-        val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
-        intent.putExtra("task", "TaskCancelRequest")
-        intent.putExtra("taskId", taskId)
-        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+        val intent = SzkolnyReceiver.getIntent(app, Bundle(
+                "task" to "TaskCancelRequest",
+                "taskId" to taskId
+        ))
+        return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) as PendingIntent
     }
     private val closePendingIntent: PendingIntent
         get() {
-            val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN")
-            intent.putExtra("task", "ServiceCloseRequest")
-            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent
+            val intent = SzkolnyReceiver.getIntent(app, Bundle(
+                    "task" to "ServiceCloseRequest"
+            ))
+            return PendingIntent.getBroadcast(app, 0, intent, 0) as PendingIntent
         }
 
     private fun errorCountText(): String? {
         var result = ""
         if (criticalErrorCount > 0) {
-            result += context.resources.getQuantityString(R.plurals.critical_errors_format, criticalErrorCount, criticalErrorCount)
+            result += app.resources.getQuantityString(R.plurals.critical_errors_format, criticalErrorCount, criticalErrorCount)
         }
         if (criticalErrorCount > 0 && errorCount > 0) {
             result += ", "
         }
         if (errorCount > 0) {
-            result += context.resources.getQuantityString(R.plurals.normal_errors_format, errorCount, errorCount)
+            result += app.resources.getQuantityString(R.plurals.normal_errors_format, errorCount, errorCount)
         }
         return if (result.isEmpty()) null else result
     }
 
     fun setIdle(): EdziennikNotification {
-        notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_title))
+        notificationBuilder.setContentTitle(app.getString(R.string.edziennik_notification_api_title))
         notificationBuilder.setProgress(0, 0, false)
         notificationBuilder.apply {
-            val str = context.getString(R.string.edziennik_notification_api_text)
+            val str = app.getString(R.string.edziennik_notification_api_text)
             setStyle(NotificationCompat.BigTextStyle().bigText(str))
             setContentText(str)
         }
@@ -81,7 +82,7 @@ class EdziennikNotification(val context: Context) {
     }
     fun setCriticalError(): EdziennikNotification {
         criticalErrorCount++
-        notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_error_title))
+        notificationBuilder.setContentTitle(app.getString(R.string.edziennik_notification_api_error_title))
         notificationBuilder.setProgress(0, 0, false)
         notificationBuilder.apply {
             val str = errorCountText()
@@ -118,7 +119,7 @@ class EdziennikNotification(val context: Context) {
         notificationBuilder.addAction(
                 NotificationCompat.Action(
                         R.drawable.ic_notification,
-                        context.getString(R.string.edziennik_notification_api_close),
+                        app.getString(R.string.edziennik_notification_api_close),
                         closePendingIntent
                 ))
         return this
@@ -128,13 +129,15 @@ class EdziennikNotification(val context: Context) {
         notificationBuilder.addAction(
                 NotificationCompat.Action(
                         R.drawable.ic_notification,
-                        context.getString(R.string.edziennik_notification_api_cancel),
+                        app.getString(R.string.edziennik_notification_api_cancel),
                         cancelPendingIntent(taskId)
                 ))
     }
 
     fun post() {
-        notificationManager.notify(NOTIFICATION_ID, notification)
+        if (serviceClosed)
+            return
+        notificationManager.notify(app.notificationChannelsManager.sync.id, notification)
     }
 
-}
+}

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

@@ -1,13 +1,13 @@
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.data.api
 
-import pl.szczodrzynski.edziennik.api.v2.models.Data
-import pl.szczodrzynski.edziennik.api.v2.models.Feature
-import pl.szczodrzynski.edziennik.api.v2.models.LoginMethod
-import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_NEVER
+import pl.szczodrzynski.edziennik.data.api.models.Data
+import pl.szczodrzynski.edziennik.data.api.models.Feature
+import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
+import pl.szczodrzynski.edziennik.data.db.entity.EndpointTimer
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_NEVER
 
-fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featureIds: List<Int>, viewId: Int?) {
+fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featureIds: List<Int>, viewId: Int?, onlyEndpoints: List<Int>?) {
     val data = this
 
     val possibleLoginMethods = data.loginMethods.toMutableList()
@@ -46,13 +46,19 @@ fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featu
             // add all endpoint IDs and required login methods, filtering using timers
             .onEach { feature ->
                 feature.endpointIds.forEach { endpoint ->
+                    if (onlyEndpoints?.contains(endpoint.first) == false)
+                        return@forEach
                     (data.endpointTimers
-                            .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id ?: -1, endpoint.first))
+                            .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id
+                            ?: -1, endpoint.first))
                             .let { timer ->
-                                if (timer.nextSync == SYNC_ALWAYS ||
-                                        (viewId != null && timer.viewId == viewId) ||
-                                        (timer.nextSync != SYNC_NEVER && timer.nextSync < timestamp)) {
-                                    data.targetEndpointIds.add(endpoint.first)
+                                if (
+                                        onlyEndpoints?.contains(endpoint.first) == true ||
+                                        timer.nextSync == SYNC_ALWAYS ||
+                                        viewId != null && timer.viewId == viewId ||
+                                        timer.nextSync != SYNC_NEVER && timer.nextSync < timestamp
+                                ) {
+                                    data.targetEndpointIds[endpoint.first] = timer.lastSync
                                     requiredLoginMethods.add(endpoint.second)
                                 }
                             }
@@ -75,9 +81,37 @@ fun Data.prepare(loginMethods: List<LoginMethod>, features: List<Feature>, featu
     data.targetLoginMethodIds = data.targetLoginMethodIds.toHashSet().toMutableList()
     data.targetLoginMethodIds.sort()
 
-    data.targetEndpointIds = data.targetEndpointIds.toHashSet().toMutableList()
-    data.targetEndpointIds.sort()
+    //data.targetEndpointIds = data.targetEndpointIds.toHashSet().toMutableList()
+    //data.targetEndpointIds.sort()
 
     progressCount = targetLoginMethodIds.size + targetEndpointIds.size
     progressStep = if (progressCount <= 0) 0f else 100f / progressCount.toFloat()
-}
+}
+
+fun Data.prepareFor(loginMethods: List<LoginMethod>, loginMethodId: Int) {
+    val possibleLoginMethods = this.loginMethods.toMutableList()
+
+    loginMethods.forEach {
+        if (it.isPossible(profile, loginStore))
+            possibleLoginMethods += it.loginMethodId
+    }
+
+    targetLoginMethodIds.clear()
+
+    // check the login method for any dependencies
+    var requiredLoginMethod: Int? = loginMethodId
+    while (requiredLoginMethod != LOGIN_METHOD_NOT_NEEDED) {
+        loginMethods.singleOrNull { it.loginMethodId == requiredLoginMethod }?.let {
+            if (requiredLoginMethod != null)
+                targetLoginMethodIds.add(requiredLoginMethod!!)
+            requiredLoginMethod = it.requiredLoginMethod(profile, loginStore)
+        }
+    }
+
+    // sort and distinct every login method
+    targetLoginMethodIds = targetLoginMethodIds.toHashSet().toMutableList()
+    targetLoginMethodIds.sort()
+
+    progressCount = 0
+    progressStep = 0f
+}