[Home] Fix the private variable error.

app/src/main/AndroidManifest.xml

@@ -15,10 +15,14 @@
         android:theme="@style/SplashTheme"
         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"
-            android:label="@string/app_name"
             android:configChanges="orientation|screenSize"
+            android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -29,7 +33,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity"
+            android:name=".ui.modules.messages.MessagesComposeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/messages_compose_title"
             android:theme="@style/AppTheme.Black" />
@@ -39,7 +43,7 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
         <activity
-            android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity"
+            android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
@@ -101,22 +105,18 @@
             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" />
@@ -169,7 +169,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_notifications_info" />
         </receiver>
-
         <receiver
             android:name=".widgets.luckynumber.WidgetLuckyNumber"
             android:label="@string/widget_lucky_number_title">
@@ -188,7 +187,6 @@
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
-
         <receiver android:name=".receivers.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -196,14 +194,7 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <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>
+
         <receiver
             android:name=".sync.FirebaseBroadcastReceiver"
             android:exported="true"
@@ -212,6 +203,23 @@
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </receiver>
+
+        <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"
+            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=".widgets.timetable.WidgetTimetableService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -222,14 +230,6 @@
 
         <service android:name=".Notifier$GetDataRetryService" />
 
-        <receiver
-            android:name=".receivers.SzkolnyReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="pl.szczodrzynski.edziennik.SZKOLNY_MAIN" />
-            </intent-filter>
-        </receiver>
-
         <service android:name=".api.v2.ApiService" />
     </application>
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -244,4 +244,4 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-</manifest>
+</manifest>

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

@@ -31,57 +31,11 @@
 </head>
 <body>
 
-<h3>Wersja 3.1.1, 2019-10-09</h3>
+<h3>Wersja 4.0, 2019-jeszcze-nie-wiem-kiedy</h3>
 <ul>
-    <li>Librus: poprawiona synchronizacja kategorii i kolorów ocen.</li>
-    <li>Zmieniony kolor dolnego paska w ciemnym motywie.</li>
-    <li>Zaktualizowany licznik czasu lekcji.</li>
-</ul>
-
-<h3>Wersja 3.1, 2019-09-29</h3>
-<ul>
-    <li>Poprawiony interfejs zadań domowych.</li>
-    <li>Librus: wyświetlanie komentarzy ocen.</li>
-    <li>Librus: wyświetlanie nieobecności nauczycieli w Terminarzu.</li>
-    <li>Librus: usprawniona synchronizacja ocen.</li>
-    <li>Poprawki angielskiego tłumaczenia.</li>
-</ul>
-
-<h3>Wersja 3.0.3, 2019-09-26</h3>
-<ul>
-    <li>Librus: poprawka kilku błędów synchronizacji.</li>
-    <li>Vulcan: prawidłowe oznaczanie wiadomości jako przeczytana.</li>
-    <li>Vulcan: poprawiona synchronizacja wiadomości i frekwencji.</li>
-    <li>Vulcan: poprawka błędów logowania.</li>
-</ul>
-
-<h3>Wersja 3.0.2, 2019-09-24</h3>
-<ul>
-    <li>Librus: pobieranie Bieżących ocen opisowych.</li>
-    <li>Poprawki UI: kolor ikon paska statusu w jasnym motywie.</li>
-    <li>Poprawka braku skanera QR do przekazywania powiadomień.</li>
-    <li>Poprawka wyboru koloru i daty własnego wydarzenia, które crashowały aplikację.</li>
-</ul>
-
-<h3>Wersja 3.0.1, 2019-09-19</h3>
-<ul>
-    <li>Librus: Poprawa błędu synchronizacji.</li>
-    <li>Poprawki UI związane z paskiem nawigacji.</li>
-    <li>Mobidziennik: Pobieranie ocen w niektórych przedmiotach.</li>
-</ul>
-
-<h3>Wersja 3.0, 2019-09-13</h3>
-<ul>
-    <li><b>Nowy wygląd i sposób nawigacji</b> w całej aplikacji.</li>
-    <li>Menu nawigacji można teraz otworzyć przyciskiem na <b>dolnym pasku</b>. Pociągnięcie w górę tego paska wyświetla <b>menu kontekstowe</b> dotyczące danego widoku.</li>
-    <li>Założyliśmy serwer Discord! <a href="https://discord.gg/n9e8pWr">https://discord.gg/n9e8pWr</a></li>
-    <br>
-    <li>Librus: poprawka powielonych ogłoszeń szkolnych.</li>
-    <li>Naprawiłem błąd nieskończonej synchronizacji w Vulcanie.</li>
-    <li>Naprawiłem crash launchera przy dodaniu widgetu.</li>
-    <li>Naprawiłem częste crashe związane z widokiem kalendarza.</li>
-    <li>Nowe, ładniejsze (choć trochę) motywy kolorów.</li>
-    <li>Dużo drobnych poprawek UI i działania aplikacji.</li>
+    <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>
 </ul>
 
 <!--<i>

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

@@ -2,10 +2,15 @@ package pl.szczodrzynski.edziennik
 
 import android.app.Activity
 import android.app.ActivityManager
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.os.*
+import android.provider.Settings
 import android.view.Gravity
 import android.view.View
 import android.widget.Toast
@@ -64,6 +69,7 @@ import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
+import pl.szczodrzynski.edziennik.utils.appManagerIntentList
 import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.navlib.*
 import pl.szczodrzynski.navlib.SystemBarsUtil.Companion.COLOR_HALF_TRANSPARENT
@@ -582,29 +588,18 @@ class MainActivity : AppCompatActivity() {
                 .setMessage(R.string.app_manager_dialog_text)
                 .setPositiveButton(R.string.ok) { dialog, which ->
                     try {
-                        val intent = Intent()
-                        intent.component = ComponentName(
-                                "com.huawei.systemmanager",
-                                "com.huawei.systemmanager.appcontrol.activity.StartupAppControlActivity"
-                        )
-                        startActivity(intent)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                        try {
-                            val intent = Intent()
-                            intent.component = ComponentName(
-                                    "com.asus.mobilemanager",
-                                    "com.asus.mobilemanager.MainActivity"
-                            )
-                            startActivity(intent)
-                        } catch (e: Exception) {
-                            try {
-                                startActivity(Intent(android.provider.Settings.ACTION_SETTINGS))
-                            } catch (e: Exception) {
-                                e.printStackTrace()
-                                Toast.makeText(this, R.string.app_manager_open_failed, Toast.LENGTH_SHORT).show()
+                        for (intent in appManagerIntentList) {
+                            if (packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
+                                startActivity(intent)
                             }
                         }
+                    } catch (e: Exception) {
+                        try {
+                            startActivity(Intent(Settings.ACTION_SETTINGS))
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                            Toast.makeText(this, R.string.app_manager_open_failed, Toast.LENGTH_SHORT).show()
+                        }
                     }
                 }
                 .setNeutralButton(R.string.dont_ask_again) { dialog, which ->

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

@@ -90,6 +90,7 @@ class ApiService : Service() {
             errorList.add(apiError)
             apiError.throwable?.printStackTrace()
             if (apiError.isCritical) {
+                taskRunning?.cancel()
                 notification.setCriticalError().post()
                 taskRunning = null
                 taskIsRunning = false
@@ -154,10 +155,14 @@ class ApiService : Service() {
         // post an event
         EventBus.getDefault().post(ApiTaskStartedEvent(taskProfileId, task.profile))
 
-        when (task) {
-            is EdziennikTask -> task.run(app, taskCallback)
-            is NotifyTask -> task.run(app, taskCallback)
-            is ErrorReportTask -> task.run(app, taskCallback, notification, errorList)
+        try {
+            when (task) {
+                is EdziennikTask -> task.run(app, taskCallback)
+                is NotifyTask -> task.run(app, taskCallback)
+                is ErrorReportTask -> task.run(app, taskCallback, notification, errorList)
+            }
+        } catch (e: Exception) {
+            taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e))
         }
     }
 

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

@@ -150,6 +150,7 @@ const val ERROR_IDZIENNIK_API_OTHER                         = 451
 
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801
 
+const val EXCEPTION_API_TASK                                = 900
 const val EXCEPTION_LOGIN_LIBRUS_API_TOKEN                  = 901
 const val EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN               = 902
 const val EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN            = 903

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

@@ -41,43 +41,43 @@ class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
         when (endpointId) {
             ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                IdziennikWebTimetable(data) { onSuccess() }
+                IdziennikWebTimetable(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_GRADES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                IdziennikWebGrades(data) { onSuccess() }
+                IdziennikWebGrades(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                IdziennikWebProposedGrades(data) { onSuccess() }
+                IdziennikWebProposedGrades(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_EXAMS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_exams)
-                IdziennikWebExams(data) { onSuccess() }
+                IdziennikWebExams(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_NOTICES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                IdziennikWebNotices(data) { onSuccess() }
+                IdziennikWebNotices(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_announcements)
-                IdziennikWebAnnouncements(data) { onSuccess() }
+                IdziennikWebAnnouncements(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                IdziennikWebAttendance(data) { onSuccess() }
+                IdziennikWebAttendance(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                IdziennikApiCurrentRegister(data) { onSuccess() }
+                IdziennikApiCurrentRegister(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                IdziennikApiMessagesInbox(data) { onSuccess() }
+                IdziennikApiMessagesInbox(data, onSuccess)
             }
             ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                IdziennikApiMessagesSent(data) { onSuccess() }
+                IdziennikApiMessagesSent(data, onSuccess)
             }
             else -> onSuccess()
         }

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

@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.api.v2.librus
 
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
+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
@@ -14,9 +14,7 @@ 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.librusLoginMethods
 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
@@ -53,12 +51,28 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
                                           |__*/
     override fun sync(featureIds: List<Int>, viewId: Int?) {
         data.prepare(librusLoginMethods, LibrusFeatures, featureIds, viewId)
-        d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}")
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        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) {
-            LibrusData(data) {
-                completed()
-            }
+            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()
         }
     }
 
@@ -102,15 +116,67 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
             }
 
             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) {
-                    in internalErrorList -> {
-                        // finish immediately if the same error occurs twice during the same sync
-                        callback.onError(apiError)
+                    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()
                     }
-                    CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> {
-                        internalErrorList.add(apiError.errorCode)
-                        loginStore.removeLoginData("refreshToken") // force a clean login
-                        //loginLibrus()
+                    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,
+                    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

@@ -45,92 +45,96 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
              */
             ENDPOINT_LIBRUS_API_ME -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                LibrusApiMe(data) { onSuccess() }
+                LibrusApiMe(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_SCHOOLS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_school_info)
-                LibrusApiSchools(data) { onSuccess() }
+                LibrusApiSchools(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_CLASSES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_classes)
-                LibrusApiClasses(data) { onSuccess() }
+                LibrusApiClasses(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_teams)
-                LibrusApiVirtualClasses(data) { onSuccess() }
+                LibrusApiVirtualClasses(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_UNITS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_units)
-                LibrusApiUnits(data) { onSuccess() }
+                LibrusApiUnits(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_USERS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_teachers)
-                LibrusApiUsers(data) { onSuccess() }
+                LibrusApiUsers(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_SUBJECTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_subjects)
-                LibrusApiSubjects(data) { onSuccess() }
+                LibrusApiSubjects(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_CLASSROOMS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_classrooms)
-                LibrusApiClassrooms(data) { onSuccess() }
+                LibrusApiClassrooms(data, onSuccess)
             }
             // TODO push config
             // TODO timetable
 
             ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                LibrusApiGrades(data) { onSuccess() }
+                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() }
+                LibrusApiEventTypes(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_EVENTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_events)
-                LibrusApiEvents(data) { onSuccess() }
+                LibrusApiEvents(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_HOMEWORK -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                LibrusApiHomework(data) { onSuccess() }
+                LibrusApiHomework(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                LibrusApiLuckyNumber(data) { onSuccess() }
+                LibrusApiLuckyNumber(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_NOTICE_TYPES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_notice_types)
-                LibrusApiNoticeTypes(data) { onSuccess() }
+                LibrusApiNoticeTypes(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_NOTICES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                LibrusApiNotices(data) { onSuccess() }
+                LibrusApiNotices(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance_types)
-                LibrusApiAttendanceTypes(data) { onSuccess() }
+                LibrusApiAttendanceTypes(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_ATTENDANCES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                LibrusApiAttendances(data) { onSuccess() }
+                LibrusApiAttendances(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_announcements)
-                LibrusApiAnnouncements(data) { onSuccess() }
+                LibrusApiAnnouncements(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_PT_MEETINGS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings)
-                LibrusApiPtMeetings(data) { onSuccess() }
+                LibrusApiPtMeetings(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types)
-                LibrusApiTeacherFreeDayTypes(data) { onSuccess() }
+                LibrusApiTeacherFreeDayTypes(data, onSuccess)
             }
             ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days)
-                LibrusApiTeacherFreeDays(data) { onSuccess() }
+                LibrusApiTeacherFreeDays(data, onSuccess)
             }
 
             /**
@@ -138,11 +142,11 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
              */
             ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                LibrusSynergiaHomework(data) { onSuccess() }
+                LibrusSynergiaHomework(data, onSuccess)
             }
             ENDPOINT_LIBRUS_SYNERGIA_INFO -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                LibrusSynergiaInfo(data) { onSuccess() }
+                LibrusSynergiaInfo(data, onSuccess)
             }
 
             /**
@@ -150,11 +154,11 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
              */
             ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED) { onSuccess() }
+                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() }
+                LibrusMessagesGetList(data, type = Message.TYPE_SENT, onSuccess = onSuccess)
             }
 
             else -> onSuccess()

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

@@ -44,7 +44,10 @@ open class LibrusPortal(open val data: DataLibrus) {
                         "Access token is invalid" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
                         "ApiDisabled" -> ERROR_LIBRUS_PORTAL_API_DISABLED
                         "Account not found" -> ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND
-                        else -> ERROR_LIBRUS_PORTAL_OTHER
+                        else -> when (json.getString("hint")) {
+                            "Error while decoding to JSON" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED
+                            else -> ERROR_LIBRUS_PORTAL_OTHER
+                        }
                     }.let { errorCode ->
                         data.error(ApiError(tag, errorCode)
                                 .withApiResponse(json)

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-5
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.api
+
+import android.graphics.Color
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GC
+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.GradeCategory
+
+class LibrusApiGradeCategories(override val data: DataLibrus,
+                               val onSuccess: () -> Unit) : LibrusApi(data) {
+    companion object {
+        const val TAG = "LibrusApiGradeCategories"
+    }
+
+    init {
+        apiGet(TAG, "Grades/Categories") { json ->
+            json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category ->
+                val id = category.getLong("Id") ?: return@forEach
+                val name = category.getString("Name") ?: ""
+                val weight = when (category.getBoolean("CountToTheAverage")) {
+                    true -> category.getFloat("Weight") ?: 0f
+                    else -> 0f
+                }
+                val color = category.getJsonObject("Color")?.getInt("Id")
+                        ?.let { data.getColor(it) } ?: Color.BLUE
+
+                val gradeCategoryObject = GradeCategory(
+                        profileId,
+                        id,
+                        weight,
+                        color,
+                        name
+                )
+
+                data.gradeCategories.put(id, gradeCategoryObject)
+            }
+
+            data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GC, SYNC_ALWAYS)
+            onSuccess()
+        }
+    }
+}

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

@@ -42,7 +42,7 @@ class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) {
         when (endpointId) {
             ENDPOINT_MOBIDZIENNIK_API_MAIN -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_data)
-                MobidziennikApi(data) { onSuccess() }
+                MobidziennikApi(data, onSuccess)
             }
             ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
@@ -75,4 +75,4 @@ class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) {
             else -> onSuccess()
         }
     }
-}
+}

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

@@ -390,8 +390,6 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
     }
 
     fun error(apiError: ApiError) {
-        if (apiError.isCritical)
-            cancel()
         callback.onError(apiError)
     }
 

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

@@ -38,35 +38,39 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
         when (endpointId) {
             ENDPOINT_VULCAN_API_DICTIONARIES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_dictionaries)
-                VulcanApiDictionaries(data) { onSuccess() }
+                VulcanApiDictionaries(data, onSuccess)
             }
             ENDPOINT_VULCAN_API_GRADES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                VulcanApiGrades(data) { onSuccess() }
+                VulcanApiGrades(data, onSuccess)
             }
             ENDPOINT_VULCAN_API_GRADES_SUMMARY -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                VulcanApiProposedGrades(data) { onSuccess() }
+                VulcanApiProposedGrades(data, onSuccess)
             }
             ENDPOINT_VULCAN_API_EVENTS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_events)
-                VulcanApiEvents(data, isHomework = false) { onSuccess() }
+                VulcanApiEvents(data, isHomework = false, onSuccess = onSuccess)
             }
             ENDPOINT_VULCAN_API_HOMEWORK -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                VulcanApiEvents(data, isHomework = true) { onSuccess() }
+                VulcanApiEvents(data, isHomework = true, onSuccess = onSuccess)
             }
             ENDPOINT_VULCAN_API_NOTICES -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                VulcanApiNotices(data) { onSuccess() }
+                VulcanApiNotices(data, onSuccess)
             }
             ENDPOINT_VULCAN_API_ATTENDANCE -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                VulcanApiAttendance(data) { onSuccess() }
+                VulcanApiAttendance(data, onSuccess)
             }
             ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                VulcanApiMessagesInbox(data) { onSuccess() }
+                VulcanApiMessagesInbox(data, onSuccess)
+            }
+            ENDPOINT_VULCAN_API_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                VulcanApiMessagesSent(data, onSuccess)
             }
             else -> onSuccess()
         }

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

@@ -11,6 +11,7 @@ import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INB
 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
@@ -20,64 +21,68 @@ class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () ->
         const val TAG = "VulcanApiMessagesInbox"
     }
 
-    init { data.profile?.also { profile ->
+    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 addedDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
-                val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 } ?: -1
-
-                val messageObject = Message(
-                        profileId,
-                        id,
-                        subject,
-                        body,
-                        Message.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,
-                        addedDate
-                ))
+            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
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS)
-            onSuccess()
-        }
-    } ?: onSuccess()}
+            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

@@ -0,0 +1,99 @@
+/*
+ * 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/VulcanApiTemplate.kt

@@ -6,8 +6,6 @@ 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
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonArray
 
 class VulcanApiTemplate(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
     companion object {
@@ -15,10 +13,12 @@ class VulcanApiTemplate(override val data: DataVulcan, val onSuccess: () -> Unit
     }
 
     init {
-        /* apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
+        /* data.profile?.also { profile ->
+            apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
-            onSuccess()
+                data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
+                onSuccess()
+            }
         } */
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java

@@ -8,6 +8,7 @@ import androidx.room.Entity;
 import androidx.room.Ignore;
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
@@ -73,7 +74,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsString();
         }
         return defaultValue;
@@ -83,7 +84,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsInt();
         }
         return defaultValue;
@@ -93,7 +94,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsLong();
         }
         return defaultValue;
@@ -103,7 +104,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsFloat();
         }
         return defaultValue;
@@ -112,7 +113,7 @@ public class LoginStore {
         if (data == null)
             return defaultValue;
         JsonElement element = data.get(key);
-        if (element != null) {
+        if (element != null && !(element instanceof JsonNull)) {
             return element.getAsBoolean();
         }
         return defaultValue;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java

@@ -30,6 +30,7 @@ import androidx.fragment.app.Fragment;
 import androidx.work.WorkManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.chuckerteam.chucker.api.Chucker;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
@@ -50,6 +51,7 @@ import pl.szczodrzynski.edziennik.databinding.CardLuckyNumberBinding;
 import pl.szczodrzynski.edziennik.databinding.CardUpdateBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusCaptchaActivity;
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -104,6 +106,14 @@ public class HomeFragment extends Fragment {
 
         b.pruneWorkButton.setOnClickListener((v -> WorkManager.getInstance(app).pruneWork()));
 
+        b.runChucker.setOnClickListener((v -> {
+            startActivity(Chucker.getLaunchIntent(activity, 1));
+        }));
+
+        b.librusCaptchaButton.setOnClickListener((v -> {
+            startActivity(new Intent(activity, LoginLibrusCaptchaActivity.class));
+        }));
+
         //((TextView)v.findViewById(R.id.nextSync)).setText(getString(R.string.next_sync_format,Time.fromMillis(app.appJobs.syncJobTime).getStringHMS()));
 
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusCaptchaActivity.kt

@@ -0,0 +1,116 @@
+package pl.szczodrzynski.edziennik.ui.modules.login
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.util.Base64
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.afollestad.materialdialogs.MaterialDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.LIBRUS_USER_AGENT
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.Utils.hexFromColorInt
+import java.nio.charset.Charset
+
+class LoginLibrusCaptchaActivity : AppCompatActivity() {
+    companion object {
+        private const val TAG = "LoginLibrusCaptchaActivity"
+    }
+
+    private lateinit var webView: WebView
+    private lateinit var dialog: AlertDialog
+    private lateinit var jsInterface: CaptchaCallbackInterface
+
+    @SuppressLint("AddJavascriptInterface", "SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setTheme(Themes.appThemeNoDisplay)
+        setFinishOnTouchOutside(false)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WebView.setWebContentsDebuggingEnabled(true)
+        }
+
+        val base64Content = """
+PCFET0NUWVBFIGh0bWw+PGh0bWw+PGhlYWQ+PHNjcmlwdCBzcmM9Imh0dHBzOi8vd3d3Lmdvb2ds
+ZS5jb20vcmVjYXB0Y2hhL2FwaS5qcz9vbmxvYWQ9cmVhZHkmcmVuZGVyPWV4cGxpY2l0Ij48L3Nj
+cmlwdD48L2hlYWQ+PGJvZHk+PGJyPjxjZW50ZXIgaWQ9ImdyIj48L2NlbnRlcj48YnI+PHNjcmlw
+dD5mdW5jdGlvbiByZWFkeSgpe2dyZWNhcHRjaGEucmVuZGVyKCdncicse3NpdGVrZXk6JzZMZjQ4
+bW9VQUFBQUFCOUNsaGR2SHI0NmdSV1ItQ04zMUNYUVBHMlUnLHRoZW1lOidUSEVNRScsY2FsbGJh
+Y2s6ZnVuY3Rpb24oZSl7d2luZG93LmlmLmNhbGxiYWNrKGUpO30sImV4cGlyZWQtY2FsbGJhY2si
+OmZ1bmN0aW9uKCl7d2luZG93LmlmLmV4cGlyZWRDYWxsYmFjayhlKTt9LCJlcnJvci1jYWxsYmFj
+ayI6ZnVuY3Rpb24oKXt3aW5kb3cuaWYuZXJyb3JDYWxsYmFjayhlKTt9fSk7fTwvc2NyaXB0Pjwv
+Ym9keT48L2h0bWw+"""
+
+        val backgroundColor = if (Themes.isDark) 0x424242 else 0xffffff
+        val backgroundColorString = hexFromColorInt(backgroundColor)
+
+        val htmlContent = Base64.decode(base64Content, Base64.DEFAULT)
+                .toString(Charset.defaultCharset())
+                .replace("COLOR", backgroundColorString, true)
+                .replace("THEME", if (Themes.isDark) "dark" else "light")
+
+        jsInterface = object : CaptchaCallbackInterface {
+            @JavascriptInterface
+            override fun callback(recaptchaResponse: String) {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha checked")
+                        .content("Response: $recaptchaResponse")
+                        .positiveText("OK")
+                        .show()
+            }
+
+            @JavascriptInterface
+            override fun expiredCallback() {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha expired")
+                        .content("Captcha expired")
+                        .positiveText("OK")
+                        .show()
+            }
+
+            @JavascriptInterface
+            override fun errorCallback() {
+                MaterialDialog.Builder(this@LoginLibrusCaptchaActivity)
+                        .title("Captcha error")
+                        .content("Captcha error")
+                        .positiveText("OK")
+                        .show()
+            }
+        }
+
+        webView = WebView(this).apply {
+            //setBackgroundColor((backgroundColor.toLong() or 0xff000000).toInt())
+            setBackgroundColor(Color.TRANSPARENT)
+            settings.javaScriptEnabled = true
+            settings.userAgentString = LIBRUS_USER_AGENT
+            addJavascriptInterface(jsInterface, "if")
+            loadDataWithBaseURL("https://portal.librus.pl/rodzina/login/", htmlContent, "text/html", "UTF-8", null)
+            setLayerType(WebView.LAYER_TYPE_SOFTWARE, null)
+        }
+
+        dialog = MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.login_librus_captcha_title)
+                .setView(webView)
+                .setNegativeButton(R.string.cancel) { dialog, _ ->
+                    dialog.dismiss()
+                    finish()
+                }
+                .setCancelable(false)
+                .show()
+    }
+
+    interface CaptchaCallbackInterface {
+        @JavascriptInterface
+        fun callback(recaptchaResponse: String)
+        @JavascriptInterface
+        fun expiredCallback()
+        @JavascriptInterface
+        fun errorCallback()
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/utils/AppManagerIntentList.kt

@@ -0,0 +1,24 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.ComponentName
+import android.content.Intent
+
+val appManagerIntentList = listOf(
+        Intent().setClassName("com.miui.powerkeeper", "com.miui.powerkeeper.ui.HiddenAppsConfigActivity")
+                .putExtra("packageName", "pl.szczodrzynski.edziennik")
+                .putExtra("package_label", "Szkolny.eu"),
+        Intent().setComponent(ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")),
+        Intent().setComponent(ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.AutobootManageActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.optimize.process.ProtectActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.appcontrol.activity.StartupAppControlActivity")),
+        Intent().setComponent(ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.startupmgr.ui.StartupNormalAppListActivity")),
+        Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.coloros.safecenter", "com.coloros.safecenter.startupapp.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.oppo.safe", "com.oppo.safe.permission.startup.StartupAppListActivity")),
+        Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.AddWhiteListActivity")),
+        Intent().setComponent(ComponentName("com.iqoo.secure", "com.iqoo.secure.ui.phoneoptimize.BgStartUpManager")),
+        Intent().setComponent(ComponentName("com.vivo.permissionmanager", "com.vivo.permissionmanager.activity.BgStartUpManagerActivity")),
+        Intent().setComponent(ComponentName("com.samsung.android.lool", "com.samsung.android.sm.ui.battery.BatteryActivity")),
+        Intent().setComponent(ComponentName("com.htc.pitroad", "com.htc.pitroad.landingpage.activity.LandingPageActivity")),
+        Intent().setComponent(ComponentName("com.asus.mobilemanager", "com.asus.mobilemanager.MainActivity"))
+)

app/src/main/res/layout/fragment_home.xml

@@ -36,24 +36,46 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:orientation="vertical"
-                tools:visibility="visible">
+                tools:visibility="visible"
+                tools:ignore="HardcodedText">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/librusCaptchaButton"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Librus Captcha" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/runChucker"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Launch Chucker" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:gravity="center">
+
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/mobidziennikMessagesSwitch"
                         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                        android:layout_margin="8dp"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_margin="8dp"
+                        android:layout_weight="1"
                         android:text="Zmień moduł wiadomości" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/composeButton"
                         style="@style/Widget.MaterialComponents.Button"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_margin="8dp"
+                        android:layout_weight="1"
                         android:text="Compose" />
                 </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -930,6 +930,7 @@
     <string name="settings_register_show_teacher_absences_text">Pokazuj nieobecności nauczycieli w Terminarzu</string>
     <string name="edziennik_progress_endpoint_school_info">Pobieram informacje o szkole...</string>
     <string name="edziennik_progress_endpoint_grades">Pobieranie ocen ucznia...</string>
+    <string name="edziennik_progress_endpoint_grade_categories">Pobieranie kategorii ocen...</string>
     <string name="edziennik_progress_login_template_web">Logowanie do Template WEB...</string>
     <string name="edziennik_progress_login_template_api">Logowanie do Template API...</string>
     <string name="edziennik_progress_login_mobidziennik_web">Logowanie do MobiDziennika...</string>
@@ -983,4 +984,5 @@
     <string name="dont_ask_again">Nie pytaj ponownie</string>
     <string name="app_manager_open_failed">Nie udało się otworzyć ustawień</string>
     <string name="edziennik_notification_api_notify_title">Tworzenie powiadomień</string>
+    <string name="login_librus_captcha_title">Librus - logowanie</string>
 </resources>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.3.50'
 
         release = [
-                versionName: "3.1.1",
-                versionCode: 3010199
+                versionName: "3.9.0-dev",
+                versionCode: 3090000
         ]
 
         setup = [