[3.0.3] Update build.gradle and changelog

[API/Vulcan] Fix for null OddzialKod in students list.
[API/Vulcan] Fix messages mark-as-read. Fix sent messages & attendances sync.
2025-06-13 14:10:46 +02:00 · 2019-09-26 22:26:34 +02:00 · 2019-09-26 20:25:57 +02:00 · 2019-09-26 18:48:45 +02:00 · 2019-09-25 22:37:44 +02:00 · 2019-09-25 22:26:28 +02:00
8 changed files with 149 additions and 22 deletions
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@ -31,6 +31,22 @@
 </head>
 <body>

+<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>
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@ -514,7 +514,7 @@ public class App extends androidx.multidex.MultiDexApplication {
            }
        }

-        if (appConfig.lastAppVersion > BuildConfig.VERSION_CODE) {
+        /*if (appConfig.lastAppVersion > BuildConfig.VERSION_CODE) {
            BootReceiver br = new BootReceiver();
            Intent i = new Intent();
            //i.putExtra("UserChecked", true);
@ -522,7 +522,7 @@ public class App extends androidx.multidex.MultiDexApplication {
            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);
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@ -30,6 +30,7 @@ import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
 import pl.szczodrzynski.navlib.drawer.items.withAppTitle
 import pl.szczodrzynski.navlib.getColorFromAttr
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.graphics.ColorUtils
 import androidx.navigation.NavOptions
 import com.danimahardhika.cafebar.CafeBar
 import com.mikepenz.iconics.IconicsColor
@ -239,6 +240,14 @@ class MainActivity : AppCompatActivity() {

                b.navView.configSystemBarsUtil(this)

+                // fix for setting status bar color to window color, outside of navlib
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    window.statusBarColor = statusBarColor
+                }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ColorUtils.calculateLuminance(statusBarColor) > 0.6) {
+                    window.decorView.systemUiVisibility = window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                }
+
                // TODO fix navlib navbar detection, orientation change issues, status bar color setting if not fullscreen

                commit()
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
@ -288,6 +288,7 @@ public class Librus implements EdziennikInterface {
            targetEndpoints.add("Grades");
            targetEndpoints.add("PointGrades");
            targetEndpoints.add("DescriptiveGrades");
+            targetEndpoints.add("TextGrades");
            targetEndpoints.add("BehaviourGrades");

            targetEndpoints.add("Events");
@ -359,6 +360,7 @@ public class Librus implements EdziennikInterface {
                        targetEndpoints.add("Grades");
                        targetEndpoints.add("PointGrades");
                        targetEndpoints.add("DescriptiveGrades");
+                        targetEndpoints.add("TextGrades");
                        targetEndpoints.add("BehaviourGrades");
                        break;
                    case FEATURE_HOMEWORKS:
@ -433,6 +435,10 @@ public class Librus implements EdziennikInterface {
            callback.onProgress(PROGRESS_STEP);
            index++;
        }
+        if (index > targetEndpoints.size()) {
+            finish();
+            return;
+        }
        d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
        switch (targetEndpoints.get(index)) {
            case "Me":
@ -498,6 +504,9 @@ public class Librus implements EdziennikInterface {
            case "DescriptiveGrades":
                getDescriptiveGrades();
                break;
+            case "TextGrades":
+                getTextGrades();
+                break;
            case "BehaviourGrades":
                getBehaviourGrades();
                break;
@ -644,7 +653,7 @@ public class Librus implements EdziennikInterface {
        };

        librusLoginCallback = redirectUrl -> {
-            fakeAuthorize = "authorize2";
+            fakeAuthorize = "authorize";
            authorize(AUTHORIZE_URL, authorizeCallback);
        };

@ -1662,11 +1671,32 @@ public class Librus implements EdziennikInterface {
                                continue;
                            }

+                            Time startTime = null;
+                            Time endTime = null;
+                            try {
+                                startTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourFrom" : "HourFrom").getAsString());
+                                endTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourTo" : "HourTo").getAsString());
+                            }
+                            catch (Exception ignore) {
+                                try {
+                                    JsonElement lessonNo;
+                                    if (!((lessonNo = lesson.get("LessonNo")) instanceof JsonNull)) {
+                                        Pair<Time, Time> timePair = lessonRanges.get(strToInt(lessonNo.getAsString()));
+                                        if (timePair != null) {
+                                            startTime = timePair.first;
+                                            endTime = timePair.second;
+                                        }
+                                    }
+                                }
+                                catch (Exception ignore2) { }
+                            }
+
+
                            Lesson lessonObject = new Lesson(
                                    profileId,
                                    lesson.get("DayNo").getAsInt() - 1,
-                                    Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourFrom" : "HourFrom").getAsString()),
-                                    Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourTo" : "HourTo").getAsString())
+                                    startTime,
+                                    endTime
                            );

                            JsonElement subject;
@ -1711,7 +1741,7 @@ public class Librus implements EdziennikInterface {
                r("finish", "Substitutions");
                return;
            }
-            
+
            JsonArray substitutions = data.get("Substitutions").getAsJsonArray();
            try {
                List<Long> ignoreList = new ArrayList<>();
@ -2389,6 +2419,70 @@ public class Librus implements EdziennikInterface {
        });
    }

+    private void getTextGrades() {
+        callback.onActionStarted(R.string.sync_action_syncing_descriptive_grades);
+        apiRequest("DescriptiveGrades", data -> {
+            if (data == null) {
+                r("finish", "TextGrades");
+                return;
+            }
+            JsonArray grades = data.get("Grades").getAsJsonArray();
+            //d("Got Grades: "+grades.toString());
+            for (JsonElement gradeEl : grades) {
+                JsonObject grade = gradeEl.getAsJsonObject();
+                long id = grade.get("Id").getAsLong();
+                long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
+                int semester = grade.get("Semester").getAsInt();
+                long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
+                JsonElement map = grade.get("Map");
+                JsonElement realGrade = grade.get("RealGradeValue");
+                String description = "";
+                if (map != null) {
+                    description = map.getAsString();
+                }
+                else if (realGrade != null) {
+                    description = realGrade.getAsString();
+                }
+
+                long categoryId = -1;
+                JsonElement skillEl = grade.get("Skill");
+                if (skillEl != null) {
+                    categoryId = skillEl.getAsJsonObject().get("Id").getAsLong();
+                }
+
+                String str_date = grade.get("AddDate").getAsString();
+                long addedDate = Date.fromIso(str_date);
+
+                String category = "";
+                int color = -1;
+                GradeCategory gradeCategory = GradeCategory.search(gradeCategoryList, categoryId);
+                if (gradeCategory != null) {
+                    category = gradeCategory.text;
+                    color = gradeCategory.color;
+                }
+
+                Grade gradeObject = new Grade(
+                        profileId,
+                        id,
+                        category,
+                        color,
+                        "",
+                        description,
+                        0.0f,
+                        0,
+                        semester,
+                        teacherId,
+                        subjectId
+                );
+                gradeObject.type = Grade.TYPE_DESCRIPTIVE;
+
+                gradeList.add(gradeObject);
+                metadataList.add(new Metadata(profileId, Metadata.TYPE_GRADE, gradeObject.id, profile.getEmpty(), profile.getEmpty(), addedDate));
+            }
+            r("finish", "TextGrades");
+        });
+    }
+
    private void getBehaviourGrades() {
        d(TAG, "Grades settings: "+enableStandardGrades+", "+enablePointGrades+", "+enableDescriptiveGrades);
        if (!enableBehaviourGrades) {
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java
@ -113,6 +113,7 @@ public class Vulcan implements EdziennikInterface {
    private static final String ENDPOINT_ATTENDANCES = "mobile-api/Uczen.v3.Uczen/Frekwencje";
    private static final String ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane";
    private static final String ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane";
+    private static final String ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci";
    private static final String ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken";
    private static final String userAgent = "MobileUserAgent";

@ -427,8 +428,10 @@ public class Vulcan implements EdziennikInterface {
            app.db.noticeDao().clearForSemester(profileId, studentSemesterNumber);
            app.db.noticeDao().addAll(noticeList);
        }
-        if (attendanceList.size() > 0)
+        if (attendanceList.size() > 0) {
+            app.db.attendanceDao().clearAfterDate(profileId, getCurrentSemesterStartDate());
            app.db.attendanceDao().addAll(attendanceList);
+        }
        if (messageList.size() > 0)
            app.db.messageDao().addAllIgnore(messageList);
        if (messageRecipientList.size() > 0)
@ -742,7 +745,7 @@ public class Vulcan implements EdziennikInterface {
        studentLoginId = account.get("UzytkownikLoginId").getAsInt();
        studentClassId = account.get("IdOddzial").getAsInt();
        studentSemesterId = account.get("IdOkresKlasyfikacyjny").getAsInt();
-        String studentClassName = account.get("OddzialKod").getAsString();
+        String studentClassName = account.get("OkresPoziom").getAsInt()+account.get("OddzialSymbol").getAsString();
        targetProfile.putStudentData("userName", account.get("UzytkownikNazwa").getAsString());
        targetProfile.putStudentData("schoolName", schoolName);
        targetProfile.putStudentData("schoolSymbol", schoolSymbol);
@ -1240,9 +1243,9 @@ public class Vulcan implements EdziennikInterface {
                Grade gradeObject = new Grade(
                        profileId,
                        id,
-                        finalDescription,
-                        color,
                        category,
+                        color,
+                        finalDescription,
                        finalName,
                        finalValue,
                        weight,
@ -1459,7 +1462,7 @@ public class Vulcan implements EdziennikInterface {
    private void getAttendances() {
        callback.onActionStarted(R.string.sync_action_syncing_attendances);
        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", profile.getEmpty() ? getCurrentSemesterStartDate().getStringY_m_d() : oneMonthBack.getStringY_m_d());
+        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getStringY_m_d() : oneMonthBack.getStringY_m_d());
        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getStringY_m_d());
        json.addProperty("IdOddzial", studentClassId);
        json.addProperty("IdUczen", studentId);
@ -1506,8 +1509,8 @@ public class Vulcan implements EdziennikInterface {
    private void getMessagesInbox() {
        callback.onActionStarted(R.string.sync_action_syncing_messages_inbox);
        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", profile.getEmpty() ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
-        json.addProperty("DataKoncowa", Date.getToday().getInUnix());
+        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
+        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getInUnix());
        json.addProperty("LoginId", studentLoginId);
        json.addProperty("IdUczen", studentId);
        apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_RECEIVED, json, result -> {
@ -1557,8 +1560,8 @@ public class Vulcan implements EdziennikInterface {
        }
        callback.onActionStarted(R.string.sync_action_syncing_messages_outbox);
        JsonObject json = new JsonObject();
-        json.addProperty("DataPoczatkowa", profile.getEmpty() ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
-        json.addProperty("DataKoncowa", Date.getToday().getInUnix());
+        json.addProperty("DataPoczatkowa", true ? getCurrentSemesterStartDate().getInUnix() : oneMonthBack.getInUnix());
+        json.addProperty("DataKoncowa", getCurrentSemesterEndDate().getInUnix());
        json.addProperty("LoginId", studentLoginId);
        json.addProperty("IdUczen", studentId);
        apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_SENT, json, result -> {
@ -1632,6 +1635,15 @@ public class Vulcan implements EdziennikInterface {
                    recipient.fullName = profile.getStudentNameLong();
            }
            if (!message.seen) {
+                studentId = profile.getStudentData("studentId", -1);
+                studentLoginId = profile.getStudentData("studentLoginId", -1);
+                JsonObject json = new JsonObject();
+                json.addProperty("WiadomoscId", message.id);
+                json.addProperty("FolderWiadomosci", "Odebrane");
+                json.addProperty("Status", "Widoczna");
+                json.addProperty("LoginId", studentLoginId);
+                json.addProperty("IdUczen", studentId);
+                apiRequest(schoolSymbol+"/"+ENDPOINT_MESSAGES_CHANGE_STATUS, json, result -> { });
                app.db.metadataDao().setSeen(profile.getId(), message, true);
                if (message.type != TYPE_SENT) {
                    app.db.messageRecipientDao().add(new MessageRecipient(profile.getId(), -1, -1, System.currentTimeMillis(), message.id));
--- a/app/src/main/res/layout/activity_web_push_config.xml
+++ b/app/src/main/res/layout/activity_web_push_config.xml
@ -18,11 +18,11 @@
            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

        <ScrollView
+            android:id="@+id/webPushConfig"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

            <LinearLayout
-                android:id="@+id/webPushConfig"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical">
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -95,8 +95,6 @@
        <item name="mal_color_secondary">?android:textColorSecondary</item>
        <item name="mal_card_background">?colorSurface</item>
        <item name="mal_divider_color">@color/dividerColor</item>
-
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?android:windowBackground</item>
    </style>
    <style name="AppTheme.Dark" parent="NavView.Dark">
        <item name="colorPrimary">#64b5f6</item>
@ -121,8 +119,6 @@
        <item name="mal_color_secondary">@color/secondaryTextDark</item>
        <item name="mal_card_background">?colorSurface</item>
        <item name="mal_divider_color">@color/dividerColor</item>
-
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?android:windowBackground</item>
    </style>


--- a/build.gradle
+++ b/build.gradle
@ -5,8 +5,8 @@ buildscript {
        kotlin_version = '1.3.50'

        release = [
-                versionName: "3.0.1",
-                versionCode: 3000199
+                versionName: "3.0.3",
+                versionCode: 3000399
        ]

        setup = [
Author	SHA1	Message	Date
Kuba Szczodrzyński	518a8ea542	[3.0.3] Update build.gradle and changelog	2019-09-26 22:26:34 +02:00
Kuba Szczodrzyński	773b590d79	[API/Vulcan] Fix for null OddzialKod in students list.	2019-09-26 20:25:57 +02:00
Kuba Szczodrzyński	8a30c6c7ce	[API/Vulcan] Fix messages mark-as-read. Fix sent messages & attendances sync.	2019-09-26 18:48:45 +02:00
Kuba Szczodrzyński	1bdafd489c	[API/Vulcan] Add marking message as read in the e-register.	2019-09-25 22:37:44 +02:00
Kuba Szczodrzyński	9cc4da5fe9	[API/Vulcan] Temporarily try to fix attendances not syncing.	2019-09-25 22:26:28 +02:00
Kuba Szczodrzyński	33ca55401b	[API/Vulcan] Swap grade category and description.	2019-09-25 22:23:47 +02:00
Kuba Szczodrzyński	37e57d2f73	[API/Librus] Fix timetable with no HourFrom and HourTo.	2019-09-25 21:48:28 +02:00
Kuba Szczodrzyński	554097fc7d	[API/Librus] Fix r() IndexOutOfBounds. Fix Descriptive grades NPE.	2019-09-25 21:40:03 +02:00
Kuba Szczodrzyński	3e6b0250d0	Merge branch 'hotfix-3.0.2'	2019-09-25 18:47:47 +02:00
Kuba Szczodrzyński	349bcc851d	[3.0.2] Update build.gradle and changelog	2019-09-25 18:40:57 +02:00
Kuba Szczodrzyński	df52029a29	[API/Librus] Add Librus descriptive grades ("Bieżące oceny opisowe") support.	2019-09-24 21:45:49 +02:00
Kuba Szczodrzyński	1a2b51f3f9	[3.0.2-rc.1] Update build.gradle and changelog	2019-09-23 22:07:34 +02:00
Kuba Szczodrzyński	9500ba52fd	[UI] Fix status bar icon color in light theme, color&date picker dialogs crashing the app.	2019-09-23 21:53:04 +02:00
Kuba Szczodrzyński	18d9471a94	[UI] Fix web push activity QR scanner	2019-09-23 21:32:12 +02:00
Kuba Szczodrzyński	93b4c03b87	Remove older app version check	2019-09-23 21:26:29 +02:00