.github/utils/.gitignore

@@ -1,2 +0,0 @@
-.env
-__pycache__/

.github/utils/_get_password.py

@@ -1,57 +0,0 @@
-import base64
-import secrets
-from hashlib import sha256
-from typing import Tuple
-
-import mysql.connector as mysql
-from Crypto.Cipher import AES
-
-
-def get_password(
-    version_name: str,
-    version_code: int,
-    db_host: str,
-    db_user: str,
-    db_pass: str,
-    db_name: str,
-) -> Tuple[str, bytes]:
-    db = mysql.connect(
-        host=db_host,
-        user=db_user,
-        password=db_pass,
-        database=db_name,
-        auth_plugin="mysql_native_password",
-    )
-
-    print(f"Generating passwords for version {version_name} ({version_code})")
-
-    password = base64.b64encode(secrets.token_bytes(16)).decode()
-    iv = secrets.token_bytes(16)
-
-    key = f"{version_name}.{password}.{version_code}"
-    key = sha256(key.encode()).digest()
-    data = "ThisIsOurHardWorkPleaseDoNotCopyOrSteal(c)2019.KubaSz"
-    data = sha256(data.encode()).digest()
-    data = data + (chr(16) * 16).encode()
-
-    aes = AES.new(key=key, mode=AES.MODE_CBC, iv=iv)
-
-    app_password = base64.b64encode(aes.encrypt(data)).decode()
-
-    c = db.cursor()
-    c.execute(
-        "INSERT IGNORE INTO _appPasswords (versionCode, appPassword, password, iv) VALUES (%s, %s, %s, %s);",
-        (version_code, app_password, password, iv),
-    )
-    db.commit()
-
-    c = db.cursor()
-    c.execute(
-        "SELECT password, iv FROM _appPasswords WHERE versionCode = %s;",
-        (version_code,),
-    )
-    row = c.fetchone()
-
-    db.close()
-
-    return (row[0], row[1])

.github/utils/_utils.py

@@ -1,142 +0,0 @@
-import re
-import subprocess
-import sys
-from datetime import datetime
-from typing import Tuple
-
-VERSION_NAME_REGEX = r'versionName: "(.+?)"'
-VERSION_CODE_REGEX = r"versionCode: ([0-9]+)"
-VERSION_NAME_FORMAT = 'versionName: "{}"'
-VERSION_CODE_FORMAT = "versionCode: {}"
-
-
-def get_project_dir() -> str:
-    project_dir = sys.argv[1]
-    if project_dir[-1:] == "/" or project_dir[-1:] == "\\":
-        project_dir = project_dir[:-1]
-    return project_dir
-
-
-def read_gradle_version(project_dir: str) -> Tuple[int, str]:
-    GRADLE_PATH = f"{project_dir}/build.gradle"
-
-    with open(GRADLE_PATH, "r") as f:
-        gradle = f.read()
-
-    version_name = re.search(VERSION_NAME_REGEX, gradle).group(1)
-    version_code = int(re.search(VERSION_CODE_REGEX, gradle).group(1))
-
-    return (version_code, version_name)
-
-
-def write_gradle_version(project_dir: str, version_code: int, version_name: str):
-    GRADLE_PATH = f"{project_dir}/build.gradle"
-
-    with open(GRADLE_PATH, "r") as f:
-        gradle = f.read()
-
-    gradle = re.sub(
-        VERSION_NAME_REGEX, VERSION_NAME_FORMAT.format(version_name), gradle
-    )
-    gradle = re.sub(
-        VERSION_CODE_REGEX, VERSION_CODE_FORMAT.format(version_code), gradle
-    )
-
-    with open(GRADLE_PATH, "w") as f:
-        f.write(gradle)
-
-
-def build_version_code(version_name: str) -> int:
-    version = version_name.split("+")[0].split("-")
-    version_base = version[0]
-    version_suffix = version[1] if len(version) == 2 else ""
-
-    base_parts = version_base.split(".")
-    major = int(base_parts[0]) or 0
-    minor = int(base_parts[1]) if len(base_parts) > 1 else 0
-    patch = int(base_parts[2]) if len(base_parts) > 2 else 0
-
-    beta = 9
-    rc = 9
-    if "dev" in version_suffix:
-        beta = 0
-        rc = 0
-    elif "beta." in version_suffix:
-        beta = int(version_suffix.split(".")[1])
-        rc = 0
-    elif "rc." in version_suffix:
-        beta = 0
-        rc = int(version_suffix.split(".")[1])
-
-    version_code = beta + rc * 10 + patch * 100 + minor * 10000 + major * 1000000
-    return version_code
-
-
-def get_changelog(project_dir: str, format: str) -> Tuple[str, str]:
-    with open(
-        f"{project_dir}/app/src/main/assets/pl-changelog.html", "r", encoding="utf-8"
-    ) as f:
-        changelog = f.read()
-
-    title = re.search(r"<h3>(.+?)</h3>", changelog).group(1)
-    content = re.search(r"(?s)<ul>(.+)</ul>", changelog).group(1).strip()
-    content = "\n".join(line.strip() for line in content.split("\n"))
-
-    if format != "html":
-        content = content.replace("<li>", "- ")
-        content = content.replace("<br>", "\n")
-        if format == "markdown":
-            content = re.sub(r"<u>(.+?)</u>", "__\\1__", content)
-            content = re.sub(r"<i>(.+?)</i>", "*\\1*", content)
-            content = re.sub(r"<b>(.+?)</b>", "**\\1**", content)
-        content = re.sub(r"</?.+?>", "", content)
-
-    return (title, content)
-
-
-def get_commit_log(project_dir: str, format: str, max_lines: int = None) -> str:
-    last_tag = (
-        subprocess.check_output("git describe --tags --abbrev=0".split(" "))
-        .decode()
-        .strip()
-    )
-
-    log = subprocess.run(
-        args=f"git log {last_tag}..HEAD --format=%an%x00%at%x00%h%x00%s%x00%D".split(" "),
-        cwd=project_dir,
-        stdout=subprocess.PIPE,
-    )
-    log = log.stdout.strip().decode()
-
-    commits = [line.split("\x00") for line in log.split("\n")]
-    if max_lines:
-        commits = commits[:max_lines]
-
-    output = []
-    valid = False
-
-    for commit in commits:
-        if not commit[0]:
-            continue
-        if "origin/" in commit[4]:
-            valid = True
-        if not valid:
-            continue
-        date = datetime.fromtimestamp(float(commit[1]))
-        date = date.strftime("%Y-%m-%d %H:%M:%S")
-        if format == "html":
-            output.append(f"<li>{commit[3]} <i> - {commit[0]}</i></li>")
-        elif format == "markdown":
-            output.append(f"[{date}] {commit[0]}\n    {commit[3]}")
-        elif format == "markdown_full":
-            output.append(
-                f"_[{date}] {commit[0]}_\n`    `__`{commit[2]}`__  **{commit[3]}**"
-            )
-        elif format == "plain":
-            output.append(f"- {commit[3]}")
-
-    if format == "markdown":
-        output.insert(0, "```")
-        output.append("```")
-
-    return "\n".join(output)

.github/utils/bump_nightly.py

@@ -1,69 +0,0 @@
-import json
-import os
-import re
-import sys
-from datetime import datetime, timedelta
-
-import requests
-
-from _utils import (
-    get_commit_log,
-    get_project_dir,
-    read_gradle_version,
-    write_gradle_version,
-)
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: bump_nightly.py <project dir>")
-        exit(-1)
-
-    repo = os.getenv("GITHUB_REPOSITORY")
-    sha = os.getenv("GITHUB_SHA")
-
-    if not repo or not sha:
-        print("Missing GitHub environment variables.")
-        exit(-1)
-
-    with requests.get(
-        f"https://api.github.com/repos/{repo}/actions/runs?per_page=5&status=success"
-    ) as r:
-        data = json.loads(r.text)
-        runs = [run for run in data["workflow_runs"] if run["head_sha"] == sha]
-        if runs:
-            print("::set-output name=hasNewChanges::false")
-            exit(0)
-
-    print("::set-output name=hasNewChanges::true")
-
-    project_dir = get_project_dir()
-
-    (version_code, version_name) = read_gradle_version(project_dir)
-    version_name = version_name.split("+")[0]
-
-    date = datetime.now()
-    if date.hour > 6:
-        version_name += "+daily." + date.strftime("%Y%m%d-%H%M")
-    else:
-        date -= timedelta(days=1)
-        version_name += "+nightly." + date.strftime("%Y%m%d")
-
-    print("::set-output name=appVersionName::" + version_name)
-    print("::set-output name=appVersionCode::" + str(version_code))
-
-    write_gradle_version(project_dir, version_code, version_name)
-
-    commit_log = get_commit_log(project_dir, format="html", max_lines=10)
-
-    with open(
-        f"{project_dir}/app/src/main/assets/pl-changelog.html", "r", encoding="utf-8"
-    ) as f:
-        changelog = f.read()
-
-    changelog = re.sub(r"<h3>(.+?)</h3>", f"<h3>{version_name}</h3>", changelog)
-    changelog = re.sub(r"(?s)<ul>(.+)</ul>", f"<ul>\n{commit_log}\n</ul>", changelog)
-
-    with open(
-        f"{project_dir}/app/src/main/assets/pl-changelog.html", "w", encoding="utf-8"
-    ) as f:
-        f.write(changelog)

.github/utils/bump_version.py

@@ -1,41 +0,0 @@
-import os
-
-from dotenv import load_dotenv
-
-from _get_password import get_password
-from _utils import build_version_code, write_gradle_version
-from sign import sign
-
-if __name__ == "__main__":
-    version_name = input("Enter version name: ")
-    version_code = build_version_code(version_name)
-
-    print(f"Bumping version to {version_name} ({version_code})")
-
-    project_dir = "../.."
-
-    load_dotenv()
-    DB_HOST = os.getenv("DB_HOST")
-    DB_USER = os.getenv("DB_USER")
-    DB_PASS = os.getenv("DB_PASS")
-    DB_NAME = os.getenv("DB_NAME")
-
-    write_gradle_version(project_dir, version_code, version_name)
-    (password, iv) = get_password(
-        version_name, version_code, DB_HOST, DB_USER, DB_PASS, DB_NAME
-    )
-
-    sign(project_dir, version_name, version_code, password, iv, commit=False)
-
-    print("Writing mock passwords")
-    os.chdir(project_dir)
-    os.system(
-        "sed -i -E 's/\/\*([0-9a-f]{2} ?){16}\*\//\/*secret password - removed for source code publication*\//g' app/src/main/cpp/szkolny-signing.cpp"
-    )
-    os.system(
-        "sed -i -E 's/\\t0x.., 0x(.)., 0x.(.), 0x.(.), 0x.., 0x.., 0x.., 0x.(.), 0x.., 0x.(.), 0x(.)., 0x(.)., 0x.., 0x.., 0x.., 0x.(.)/\\t0x\\3\\6, 0x\\7\\4, 0x\\1\\8, 0x\\2\\5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff /g' app/src/main/cpp/szkolny-signing.cpp"
-    )
-    os.system(
-        "sed -i -E 's/param1\..(.).(.).(.).(.)..(.)..(.)..(.)..(.).../param1.MTIzNDU2Nzg5MD\\5\\2\\7\\6\\1\\3\\4\8==/g' app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt"
-    )
-    input("Press any key to finish")

.github/utils/extract_changelogs.py

@@ -1,72 +0,0 @@
-import os
-import sys
-
-from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: extract_changelogs.py <project dir>")
-        exit(-1)
-
-    project_dir = get_project_dir()
-
-    (version_code, version_name) = read_gradle_version(project_dir)
-
-    print("::set-output name=appVersionName::" + version_name)
-    print("::set-output name=appVersionCode::" + str(version_code))
-
-    dir = f"{project_dir}/app/release/whatsnew-{version_name}/"
-    os.makedirs(dir, exist_ok=True)
-
-    print("::set-output name=changelogDir::" + dir)
-
-    (title, changelog) = get_changelog(project_dir, format="plain")
-
-    # plain text changelog - Firebase App Distribution
-    with open(dir + "whatsnew-titled.txt", "w", encoding="utf-8") as f:
-        f.write(title)
-        f.write("\n")
-        f.write(changelog)
-    print("::set-output name=changelogPlainTitledFile::" + dir + "whatsnew-titled.txt")
-
-    print("::set-output name=changelogTitle::" + title)
-
-    # plain text changelog, max 500 chars - Google Play
-    with open(dir + "whatsnew-pl-PL", "w", encoding="utf-8") as f:
-        changelog_lines = changelog.split("\n")
-        changelog = ""
-        for line in changelog_lines:
-            if len(changelog) + len(line) < 500:
-                changelog += "\n" + line
-        changelog = changelog.strip()
-        f.write(changelog)
-
-    print("::set-output name=changelogPlainFile::" + dir + "whatsnew-pl-PL")
-
-    # markdown changelog - Discord webhook
-    (_, changelog) = get_changelog(project_dir, format="markdown")
-    with open(dir + "whatsnew.md", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=changelogMarkdownFile::" + dir + "whatsnew.md")
-
-    # html changelog - version info in DB
-    (_, changelog) = get_changelog(project_dir, format="html")
-    with open(dir + "whatsnew.html", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=changelogHtmlFile::" + dir + "whatsnew.html")
-
-
-    changelog = get_commit_log(project_dir, format="plain", max_lines=10)
-    with open(dir + "commit_log.txt", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=commitLogPlainFile::" + dir + "commit_log.txt")
-
-    changelog = get_commit_log(project_dir, format="markdown", max_lines=10)
-    with open(dir + "commit_log.md", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=commitLogMarkdownFile::" + dir + "commit_log.md")
-
-    changelog = get_commit_log(project_dir, format="html", max_lines=10)
-    with open(dir + "commit_log.html", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=commitLogHtmlFile::" + dir + "commit_log.html")

.github/utils/rename_artifacts.py

@@ -1,26 +0,0 @@
-import glob
-import os
-import sys
-
-from _utils import get_project_dir
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: rename_artifacts.py <project dir>")
-        exit(-1)
-
-    project_dir = get_project_dir()
-
-    files = glob.glob(f"{project_dir}/app/release/*.*")
-    for file in files:
-        file_relative = file.replace(os.getenv("GITHUB_WORKSPACE") + "/", "")
-        if "-aligned.apk" in file:
-            os.unlink(file)
-        elif "-signed.apk" in file:
-            new_file = file.replace("-signed.apk", ".apk")
-            if os.path.isfile(new_file):
-                os.unlink(new_file)
-            os.rename(file, new_file)
-        elif ".apk" in file or ".aab" in file:
-            print("::set-output name=signedReleaseFile::" + file)
-            print("::set-output name=signedReleaseFileRelative::" + file_relative)

.github/utils/save_version.py

@@ -1,122 +0,0 @@
-import glob
-import os
-import sys
-from datetime import datetime
-from time import time
-
-import mysql.connector as mysql
-from dotenv import load_dotenv
-
-from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version
-
-
-def save_version(
-    project_dir: str,
-    db_host: str,
-    db_user: str,
-    db_pass: str,
-    db_name: str,
-    apk_server_release: str,
-    apk_server_nightly: str,
-):
-    db = mysql.connect(
-        host=db_host,
-        user=db_user,
-        password=db_pass,
-        database=db_name,
-        auth_plugin="mysql_native_password",
-    )
-
-    (version_code, version_name) = read_gradle_version(project_dir)
-    (_, changelog) = get_changelog(project_dir, format="html")
-
-    types = ["dev", "beta", "nightly", "daily", "rc", "release"]
-    build_type = [x for x in types if x in version_name]
-    build_type = build_type[0] if build_type else "release"
-
-    if "+nightly." in version_name or "+daily." in version_name:
-        changelog = get_commit_log(project_dir, format="html")
-        build_type = "nightly"
-    elif "-dev" in version_name:
-        build_type = "dev"
-    elif "-beta." in version_name:
-        build_type = "beta"
-    elif "-rc." in version_name:
-        build_type = "rc"
-
-    build_date = int(time())
-    apk_name = None
-    bundle_name_play = None
-
-    files = glob.glob(f"{project_dir}/app/release/*.*")
-    output_apk = f"Edziennik_{version_name}_official.apk"
-    output_aab_play = f"Edziennik_{version_name}_play.aab"
-    for file in files:
-        if output_apk in file:
-            build_date = int(os.stat(file).st_mtime)
-            apk_name = output_apk
-        if output_aab_play in file:
-            build_date = int(os.stat(file).st_mtime)
-            bundle_name_play = output_aab_play
-
-    build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M:%S")
-
-    if build_type in ["nightly", "daily"]:
-        download_url = apk_server_nightly + apk_name if apk_name else None
-    else:
-        download_url = apk_server_release + apk_name if apk_name else None
-
-    cols = [
-        "versionCode",
-        "versionName",
-        "releaseDate",
-        "releaseNotes",
-        "releaseType",
-        "downloadUrl",
-        "apkName",
-        "bundleNamePlay",
-    ]
-    updated = {
-        "versionCode": version_code,
-        "downloadUrl": download_url,
-        "apkName": apk_name,
-        "bundleNamePlay": bundle_name_play,
-    }
-
-    values = [
-        version_code,
-        version_name,
-        build_date,
-        changelog,
-        build_type,
-        download_url,
-        apk_name,
-        bundle_name_play,
-    ]
-    values.extend(val for val in updated.values() if val)
-
-    updated = ", ".join(f"{col} = %s" for (col, val) in updated.items() if val)
-
-    sql = f"INSERT INTO updates ({', '.join(cols)}) VALUES ({'%s, ' * (len(cols) - 1)}%s) ON DUPLICATE KEY UPDATE {updated};"
-
-    c = db.cursor()
-    c.execute(sql, tuple(values))
-    db.commit()
-
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: save_version.py <project dir>")
-        exit(-1)
-
-    project_dir = get_project_dir()
-
-    load_dotenv()
-    DB_HOST = os.getenv("DB_HOST")
-    DB_USER = os.getenv("DB_USER")
-    DB_PASS = os.getenv("DB_PASS")
-    DB_NAME = os.getenv("DB_NAME")
-    APK_SERVER_RELEASE = os.getenv("APK_SERVER_RELEASE")
-    APK_SERVER_NIGHTLY = os.getenv("APK_SERVER_NIGHTLY")
-
-    save_version(project_dir, DB_HOST, DB_USER, DB_PASS, DB_NAME, APK_SERVER_RELEASE, APK_SERVER_NIGHTLY)

.github/utils/sign.py

@@ -1,84 +0,0 @@
-import os
-import re
-import sys
-
-from dotenv import load_dotenv
-
-from _get_password import get_password
-from _utils import get_project_dir, read_gradle_version
-
-
-def sign(
-    project_dir: str,
-    version_name: str,
-    version_code: int,
-    password: str,
-    iv: bytes,
-    commit: bool = False,
-):
-    SIGNING_PATH = f"{project_dir}/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt"
-    CPP_PATH = f"{project_dir}/app/src/main/cpp/szkolny-signing.cpp"
-
-    with open(SIGNING_PATH, "r") as f:
-        signing = f.read()
-
-    with open(CPP_PATH, "r") as f:
-        cpp = f.read()
-
-    SIGNING_REGEX = r"\$param1\..*\.\$param2"
-    CPP_REGEX = r"(?s)/\*.+?toys AES_IV\[16\] = {.+?};"
-
-    SIGNING_FORMAT = "$param1.{}.$param2"
-    CPP_FORMAT = "/*{}*/\nstatic toys AES_IV[16] = {{\n\t{} }};"
-
-    print(f"Writing passwords for version {version_name} ({version_code})")
-
-    iv_hex = " ".join(["{:02x}".format(x) for x in iv])
-    iv_cpp = ", ".join(["0x{:02x}".format(x) for x in iv])
-
-    signing = re.sub(SIGNING_REGEX, SIGNING_FORMAT.format(password), signing)
-    cpp = re.sub(CPP_REGEX, CPP_FORMAT.format(iv_hex, iv_cpp), cpp)
-
-    with open(SIGNING_PATH, "w") as f:
-        f.write(signing)
-
-    with open(CPP_PATH, "w") as f:
-        f.write(cpp)
-
-    if commit:
-        os.chdir(project_dir)
-        os.system("git add .")
-        os.system(
-            f'git commit -m "[{version_name}] Update build.gradle, signing and changelog."'
-        )
-
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: sign.py <project dir> [commit]")
-        exit(-1)
-
-    project_dir = get_project_dir()
-
-    load_dotenv()
-    DB_HOST = os.getenv("DB_HOST")
-    DB_USER = os.getenv("DB_USER")
-    DB_PASS = os.getenv("DB_PASS")
-    DB_NAME = os.getenv("DB_NAME")
-
-    (version_code, version_name) = read_gradle_version(project_dir)
-    (password, iv) = get_password(
-        version_name, version_code, DB_HOST, DB_USER, DB_PASS, DB_NAME
-    )
-
-    print("::set-output name=appVersionName::" + version_name)
-    print("::set-output name=appVersionCode::" + str(version_code))
-
-    sign(
-        project_dir,
-        version_name,
-        version_code,
-        password,
-        iv,
-        commit="commit" in sys.argv,
-    )

.github/utils/webhook_discord.py

@@ -1,118 +0,0 @@
-import os
-import sys
-from datetime import datetime
-
-import requests
-from dotenv import load_dotenv
-
-from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version
-
-
-def post_webhook(
-    project_dir: str,
-    apk_file: str,
-    apk_server_release: str,
-    apk_server_nightly: str,
-    webhook_release: str,
-    webhook_testing: str,
-):
-    (_, version_name) = read_gradle_version(project_dir)
-
-    types = ["dev", "beta", "nightly", "daily", "rc", "release"]
-    build_type = [x for x in types if x in version_name]
-    build_type = build_type[0] if build_type else None
-
-    testing = ["dev", "beta", "nightly", "daily"]
-    testing = build_type in testing
-
-    apk_name = os.path.basename(apk_file)
-    if build_type in ["nightly", "daily"]:
-        download_url = apk_server_nightly + apk_name
-    else:
-        download_url = apk_server_release + apk_name
-
-    if testing:
-        build_date = int(os.stat(apk_file).st_mtime)
-        if build_date:
-            build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M")
-
-        # untagged release, get commit log
-        if build_type in ["nightly", "daily"]:
-            changelog = get_commit_log(project_dir, format="markdown", max_lines=5)
-        else:
-            changelog = get_changelog(project_dir, format="markdown")
-
-        webhook = get_webhook_testing(
-            version_name, build_type, changelog, download_url, build_date
-        )
-        requests.post(url=webhook_testing, json=webhook)
-    else:
-        changelog = get_changelog(project_dir, format="markdown")
-        webhook = get_webhook_release(changelog, download_url)
-        requests.post(url=webhook_release, json=webhook)
-
-
-def get_webhook_release(changelog: str, download_url: str):
-    (title, content) = changelog
-    return {"content": f"__**{title}**__\n{content}\n{download_url}"}
-
-
-def get_webhook_testing(
-    version_name: str,
-    build_type: str,
-    changelog: str,
-    download_url: str,
-    build_date: str,
-):
-    return {
-        "embeds": [
-            {
-                "title": f"Nowa wersja {build_type} aplikacji Szkolny.eu",
-                "description": f"Dostępna jest nowa wersja testowa **{build_type}**.",
-                "color": 2201331,
-                "fields": [
-                    {
-                        "name": f"Wersja `{version_name}`",
-                        "value": f"[Pobierz .APK]({download_url})"
-                        if download_url
-                        else "*Pobieranie niedostępne*",
-                        "inline": False,
-                    },
-                    {
-                        "name": "Data kompilacji",
-                        "value": build_date or "-",
-                        "inline": False,
-                    },
-                    {
-                        "name": "Ostatnie zmiany",
-                        "value": changelog or "-",
-                        "inline": False,
-                    },
-                ],
-            }
-        ]
-    }
-
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("usage: webhook_discord.py <project dir>")
-        exit(-1)
-
-    project_dir = get_project_dir()
-
-    load_dotenv()
-    APK_FILE = os.getenv("APK_FILE")
-    APK_SERVER_RELEASE = os.getenv("APK_SERVER_RELEASE")
-    APK_SERVER_NIGHTLY = os.getenv("APK_SERVER_NIGHTLY")
-    WEBHOOK_RELEASE = os.getenv("WEBHOOK_RELEASE")
-    WEBHOOK_TESTING = os.getenv("WEBHOOK_TESTING")
-
-    post_webhook(
-        project_dir,
-        APK_FILE,
-        APK_SERVER_RELEASE,
-        APK_SERVER_NIGHTLY,
-        WEBHOOK_RELEASE,
-        WEBHOOK_TESTING,
-    )

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

@@ -1,154 +0,0 @@
-name: Nightly build
-
-on:
-  schedule:
-    # 23:30 UTC, 0:30 or 1:30 CET/CEST
-    - cron: "30 23 * * *"
-  workflow_dispatch:
-
-jobs:
-  prepare:
-    name: Prepare build environment
-    runs-on: self-hosted
-    outputs:
-      hasNewChanges: ${{ steps.nightly.outputs.hasNewChanges }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          clean: false
-      - name: Set executable permissions to gradlew
-        run: chmod +x ./gradlew
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Install packages
-        uses: BSFishy/pip-action@v1
-        with:
-          packages: |
-            python-dotenv
-            pycryptodome
-            mysql-connector-python
-            requests
-      - name: Bump nightly version
-        id: nightly
-        run: python $GITHUB_WORKSPACE/.github/utils/bump_nightly.py $GITHUB_WORKSPACE
-      - name: Write signing passwords
-        if: steps.nightly.outputs.hasNewChanges
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-        run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit
-  build:
-    name: Build APK
-    runs-on: self-hosted
-    needs:
-      - prepare
-    if: ${{ needs.prepare.outputs.hasNewChanges == 'true' }}
-    outputs:
-      androidHome: ${{ env.ANDROID_HOME }}
-      androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }}
-    steps:
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Clean build artifacts
-        run: |
-          rm -rf app/release/*
-          rm -rf app/build/outputs/apk/*
-          rm -rf app/build/outputs/bundle/*
-      - name: Assemble official release with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assembleOfficialRelease
-  sign:
-    name: Sign APK
-    runs-on: self-hosted
-    needs:
-      - build
-    outputs:
-      signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }}
-      signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }}
-    steps:
-      - name: Sign build artifacts
-        id: sign_app
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: app/release
-          signingKeyBase64: ${{ secrets.KEY_STORE }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }}
-        env:
-          ANDROID_HOME: ${{ needs.build.outputs.androidHome }}
-          ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }}
-          BUILD_TOOLS_VERSION: "30.0.2"
-      - name: Rename signed artifacts
-        id: artifacts
-        run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE
-  publish:
-    name: Publish APK
-    runs-on: self-hosted
-    needs:
-      - sign
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v2
-
-      - name: Extract changelogs
-        id: changelog
-        run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE
-
-      - name: Upload APK to SFTP
-        uses: easingthemes/ssh-deploy@v2.1.6
-        env:
-          REMOTE_HOST: ${{ secrets.SSH_IP }}
-          REMOTE_USER: ${{ secrets.SSH_USERNAME }}
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }}
-          SOURCE: ${{ needs.sign.outputs.signedReleaseFileRelative }}
-          TARGET: ${{ secrets.SSH_PATH_NIGHTLY }}
-      - name: Save version metadata
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-          APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }}
-          APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }}
-        run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE
-
-      - name: Distribute to App Distribution
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{ secrets.FIREBASE_APP_ID }}
-          token: ${{ secrets.FIREBASE_TOKEN }}
-          groups: ${{ secrets.FIREBASE_GROUPS_NIGHTLY }}
-          file: ${{ needs.sign.outputs.signedReleaseFile }}
-          releaseNotesFile: ${{ steps.changelog.outputs.commitLogPlainFile }}
-
-      - name: Post Discord webhook
-        env:
-          APK_FILE: ${{ needs.sign.outputs.signedReleaseFile }}
-          APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }}
-          APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }}
-          WEBHOOK_RELEASE: ${{ secrets.WEBHOOK_RELEASE }}
-          WEBHOOK_TESTING: ${{ secrets.WEBHOOK_TESTING }}
-        run: python $GITHUB_WORKSPACE/.github/utils/webhook_discord.py $GITHUB_WORKSPACE
-
-      - name: Upload workflow artifact
-        uses: actions/upload-artifact@v2
-        if: true
-        with:
-          name: ${{ steps.changelog.outputs.appVersionName }}
-          path: |
-            app/release/whatsnew*/
-            app/release/*.apk
-            app/release/*.aab
-            app/release/*.json
-            app/release/*.txt

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

@@ -1,131 +0,0 @@
-name: Release build - Google Play [AAB]
-
-on:
-  push:
-    branches:
-      - "master"
-
-jobs:
-  prepare:
-    name: Prepare build environment
-    runs-on: self-hosted
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          clean: false
-      - name: Set executable permissions to gradlew
-        run: chmod +x ./gradlew
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Install packages
-        uses: BSFishy/pip-action@v1
-        with:
-          packages: |
-            python-dotenv
-            pycryptodome
-            mysql-connector-python
-            requests
-      - name: Write signing passwords
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-        run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit
-  build:
-    name: Build App Bundle
-    runs-on: self-hosted
-    needs:
-      - prepare
-    outputs:
-      androidHome: ${{ env.ANDROID_HOME }}
-      androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }}
-    steps:
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Clean build artifacts
-        run: |
-          rm -rf app/release/*
-          rm -rf app/build/outputs/apk/*
-          rm -rf app/build/outputs/bundle/*
-      - name: Bundle play release with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: bundlePlayRelease
-  sign:
-    name: Sign App Bundle
-    runs-on: self-hosted
-    needs:
-      - build
-    outputs:
-      signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }}
-      signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }}
-    steps:
-      - name: Sign build artifacts
-        id: sign_app
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: app/release
-          signingKeyBase64: ${{ secrets.KEY_STORE }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }}
-        env:
-          ANDROID_HOME: ${{ needs.build.outputs.androidHome }}
-          ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }}
-          BUILD_TOOLS_VERSION: "30.0.2"
-      - name: Rename signed artifacts
-        id: artifacts
-        run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE
-  publish:
-    name: Publish App Bundle
-    runs-on: self-hosted
-    needs:
-      - sign
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v2
-
-      - name: Extract changelogs
-        id: changelog
-        run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE
-
-      - name: Save version metadata
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-          APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }}
-          APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }}
-        run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE
-
-      - name: Publish AAB to Google Play
-        uses: r0adkll/upload-google-play@v1
-        if: ${{ endsWith(needs.sign.outputs.signedReleaseFile, '.aab') }}
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
-          packageName: pl.szczodrzynski.edziennik
-          releaseFile: ${{ needs.sign.outputs.signedReleaseFile }}
-          releaseName: ${{ steps.changelog.outputs.appVersionName }}
-          track: ${{ secrets.PLAY_RELEASE_TRACK }}
-          whatsNewDirectory: ${{ steps.changelog.outputs.changelogDir }}
-
-      - name: Upload workflow artifact
-        uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: ${{ steps.changelog.outputs.appVersionName }}
-          path: |
-            app/release/whatsnew*/
-            app/release/*.apk
-            app/release/*.aab
-            app/release/*.json
-            app/release/*.txt

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

@@ -1,154 +0,0 @@
-name: Release build - official
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  prepare:
-    name: Prepare build environment
-    runs-on: self-hosted
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          clean: false
-      - name: Set executable permissions to gradlew
-        run: chmod +x ./gradlew
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Install packages
-        uses: BSFishy/pip-action@v1
-        with:
-          packages: |
-            python-dotenv
-            pycryptodome
-            mysql-connector-python
-            requests
-      - name: Write signing passwords
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-        run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit
-  build:
-    name: Build APK
-    runs-on: self-hosted
-    needs:
-      - prepare
-    outputs:
-      androidHome: ${{ env.ANDROID_HOME }}
-      androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }}
-    steps:
-      - name: Setup JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Clean build artifacts
-        run: |
-          rm -rf app/release/*
-          rm -rf app/build/outputs/apk/*
-          rm -rf app/build/outputs/bundle/*
-      - name: Assemble official release with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assembleOfficialRelease
-  sign:
-    name: Sign APK
-    runs-on: self-hosted
-    needs:
-      - build
-    outputs:
-      signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }}
-      signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }}
-    steps:
-      - name: Sign build artifacts
-        id: sign_app
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: app/release
-          signingKeyBase64: ${{ secrets.KEY_STORE }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }}
-        env:
-          ANDROID_HOME: ${{ needs.build.outputs.androidHome }}
-          ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }}
-          BUILD_TOOLS_VERSION: "30.0.2"
-      - name: Rename signed artifacts
-        id: artifacts
-        run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE
-  publish:
-    name: Publish APK
-    runs-on: self-hosted
-    needs:
-      - sign
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v2
-
-      - name: Extract changelogs
-        id: changelog
-        run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE
-
-      - name: Upload APK to SFTP
-        uses: easingthemes/ssh-deploy@v2.1.6
-        env:
-          REMOTE_HOST: ${{ secrets.SSH_IP }}
-          REMOTE_USER: ${{ secrets.SSH_USERNAME }}
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }}
-          SOURCE: ${{ needs.sign.outputs.signedReleaseFileRelative }}
-          TARGET: ${{ secrets.SSH_PATH_RELEASE }}
-      - name: Save version metadata
-        env:
-          DB_HOST: ${{ secrets.DB_HOST }}
-          DB_USER: ${{ secrets.DB_USER }}
-          DB_PASS: ${{ secrets.DB_PASS }}
-          DB_NAME: ${{ secrets.DB_NAME }}
-          APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }}
-          APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }}
-        run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE
-
-      - name: Distribute to App Distribution
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{ secrets.FIREBASE_APP_ID }}
-          token: ${{ secrets.FIREBASE_TOKEN }}
-          groups: ${{ secrets.FIREBASE_GROUPS_RELEASE }}
-          file: ${{ needs.sign.outputs.signedReleaseFile }}
-          releaseNotesFile: ${{ steps.changelog.outputs.changelogPlainTitledFile }}
-      - name: Release on GitHub
-        uses: softprops/action-gh-release@v1
-        with:
-          name: ${{ steps.changelog.outputs.changelogTitle }}
-          body_path: ${{ steps.changelog.outputs.changelogMarkdownFile }}
-          files: ${{ needs.sign.outputs.signedReleaseFile }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Post Discord webhook
-        env:
-          APK_FILE: ${{ needs.sign.outputs.signedReleaseFile }}
-          APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }}
-          APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }}
-          WEBHOOK_RELEASE: ${{ secrets.WEBHOOK_RELEASE }}
-          WEBHOOK_TESTING: ${{ secrets.WEBHOOK_TESTING }}
-        run: python $GITHUB_WORKSPACE/.github/utils/webhook_discord.py $GITHUB_WORKSPACE
-
-      - name: Upload workflow artifact
-        uses: actions/upload-artifact@v2
-        if: true
-        with:
-          name: ${{ steps.changelog.outputs.appVersionName }}
-          path: |
-            app/release/whatsnew*/
-            app/release/*.apk
-            app/release/*.aab
-            app/release/*.json
-            app/release/*.txt

.gitignore

@@ -265,4 +265,3 @@ fabric.properties
 # End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,gradle,java,kotlin
 
 signatures/
-.idea/*.xml

.idea/codeStyles/Project.xml

@@ -1,7 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
@@ -16,7 +15,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -27,7 +25,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -39,7 +36,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -50,7 +46,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -61,7 +56,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -72,7 +66,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -83,7 +76,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -95,7 +87,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -107,7 +98,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

.idea/copyright/Antoni.xml

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

.idea/dictionaries/Kuba.xml

@@ -5,7 +5,6 @@
       <w>ciasteczko</w>
       <w>csrf</w>
       <w>edziennik</w>
-      <w>elearning</w>
       <w>gson</w>
       <w>hebe</w>
       <w>idziennik</w>
@@ -13,7 +12,6 @@
       <w>synergia</w>
       <w>szczodrzyński</w>
       <w>szkolny</w>
-      <w>usos</w>
     </words>
   </dictionary>
 </component>

.idea/discord.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+  </component>
+  <component name="ProjectNotificationSettings">
+    <option name="askShowProject" value="false" />
+  </component>
+</project>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
+</project>

.idea/runConfigurations.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

README.md

@@ -1,6 +1,8 @@
-<div align="center">
+# Szkolny.eu
 
-![Readme Banner](.github/readme-banner.png)
+Nieoficjalna aplikacja do obsługi najpopularniejszych dzienników elektronicznych w Polsce.
+
+<div align="center">
 
 [![Discord](https://img.shields.io/discord/619178050562686988?color=%237289DA&logo=discord&logoColor=white&style=for-the-badge)](https://szkolny.eu/discord)
 [![Oficjalna strona](https://img.shields.io/badge/-website-orange?style=for-the-badge&logo=internet-explorer&logoColor=white)](https://szkolny.eu/)
@@ -10,15 +12,11 @@
 [![Najnowsza wersja](https://img.shields.io/github/v/release/szkolny-eu/szkolny-android?color=%2344CC11&include_prereleases&logo=github&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/releases/latest)
 ![Licencja](https://img.shields.io/github/license/szkolny-eu/szkolny-android?color=blue&logo=github&logoColor=white&style=for-the-badge)
 
-[![Release build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Release%20build%20-%20official?label=Release&logo=github-actions&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-release-apk.yml)
-[![Play build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Release%20build%20-%20Google%20Play%20%5BAAB%5D?label=Play&logo=google-play&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-release-aab-play.yml)
-[![Nightly build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Nightly%20build?label=Nightly&logo=github-actions&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-nightly-apk.yml)
-
 </div>
 
 ## Ważna informacja
 
-Jak zapewne już wiecie, we wrześniu 2020 r. **firma Librus zabroniła nam** publikowania w sklepie Google Play naszej aplikacji z obsługą dziennika Librus&reg; Synergia. Prowadziliśmy rozmowy, aby **umożliwić Wam wygodny, bezpłatny dostęp do Waszych ocen, wiadomości, zadań domowych**, jednak oczekiwania firmy Librus zdecydowanie przekroczyły wszelkie nasze możliwości finansowe. Mając na uwadze powyższe względy, zdecydowaliśmy się opublikować kod źródłowy aplikacji Szkolny.eu. Liczymy, że dzięki temu aplikacja będzie mogła dalej funkcjonować, być rozwijana, pomagając Wam w czasie zdalnego nauczania i przez kolejne lata nauki.
+Jak zapewne już wiecie, we wrześniu 2020r. **firma Librus zabroniła nam** publikowania w sklepie Google Play naszej aplikacji z obsługą dziennika Librus&reg; Synergia. Prowadziliśmy rozmowy, aby **umożliwić Wam wygodny, bezpłatny dostęp do Waszych ocen, wiadomości, zadań domowych**, jednak oczekiwania firmy Librus zdecydowanie przekroczyły wszelkie nasze możliwości finansowe. Mając na uwadze powyższe względy, zdecydowaliśmy się opublikować kod źródłowy aplikacji Szkolny.eu. Liczymy, że dzięki temu aplikacja będzie mogła dalej funkcjonować, być rozwijana, pomagając Wam w czasie zdalnego nauczania i przez kolejne lata nauki.
 
 __Zachęcamy do [przeczytania całej informacji](https://szkolny.eu/informacja) na naszej stronie.__
 
@@ -32,17 +30,17 @@ Szkolny.eu jest nieoficjalną aplikacją, umożliwiającą rodzicom i uczniom do
 
 - plan lekcji, terminarz, oceny, wiadomości, zadania domowe, uwagi, frekwencja
 - wygodne **widgety** na ekran główny
-- łatwa komunikacja z nauczycielami — **odbieranie, wyszukiwanie i wysyłanie wiadomości**
+- łatwa komunikacja z nauczycielami - **odbieranie, wyszukiwanie i wysyłanie wiadomości**
 - pobieranie **załączników wiadomości i zadań domowych**
 - **powiadomienia** o nowych informacjach na telefonie lub na komputerze
-- organizacja zadań domowych i sprawdzianów — łatwe oznaczanie jako wykonane
+- organizacja zadań domowych i sprawdzianów - łatwe oznaczanie jako wykonane
 - obliczanie **średniej ocen** ze wszystkich przedmiotów, oceny proponowane i końcowe
-- Symulator edycji ocen — obliczanie średniej z przedmiotu po zmianie dowolnych jego ocen
+- Symulator edycji ocen - obliczanie średniej z przedmiotu po zmianie dowolnych jego ocen
 - **dodawanie własnych wydarzeń** i zadań do terminarza
 - nowoczesny i intuicyjny interfejs użytkownika
-- **obsługa wielu profili** uczniów — jeżeli jesteś Rodzicem, możesz skonfigurować wszystkie swoje konta uczniowskie i łatwo między nimi przełączać
+- **obsługa wielu profili** uczniów - jeżeli jesteś Rodzicem, możesz skonfigurować wszystkie swoje konta uczniowskie i łatwo między nimi przełączać
 - opcja **automatycznej synchronizacji** z E-dziennikiem
-- opcja Ciszy nocnej — nigdy więcej budzących Cię dźwięków z telefonu
+- opcja Ciszy nocnej - nigdy więcej budzących Cię dźwięków z telefonu
 
 [Zobacz porównanie funkcji z innymi aplikacjami](https://szkolny.eu/funkcje)
 
@@ -55,7 +53,7 @@ Najnowsze wersje możesz pobrać z Google Play lub bezpośrednio z naszej strony
 
 ### Kompilacja
 
-Aby uruchomić aplikację „ze źródeł” należy użyć Android Studio w wersji co najmniej 4.2 Beta 6. Wersja `debug` może wtedy zostać zainstalowana np. na emulatorze Androida.
+Aby uruchomić aplikację "ze źródeł" należy użyć Android Studio w wersji co najmniej 4.2 Beta 6. Wersja `debug` może wtedy zostać zainstalowana np. na emulatorze Androida.
 
 Aby zbudować wersję produkcyjną, tzn. `release` należy użyć wariantu `mainRelease` oraz podpisać wyjściowy plik .APK sygnaturą w wersji V1 i V2.
 
@@ -70,15 +68,15 @@ __Jeśli masz jakieś pytania, zapraszamy na [nasz serwer Discord](https://szkol
 ## Licencja
 
 Szkolny.eu publikowany jest na licencji [GNU GPLv3](LICENSE). W szczególności, deweloper:
-- Może modyfikować oraz usprawniać kod aplikacji
-- Może dystrybuować wersje produkcyjne
-- Musi opublikować wszelkie wprowadzone zmiany, tzn. publiczny fork tego repozytorium
-- Nie może zmieniać licencji ani copyrightu aplikacji
+- może modyfikować oraz usprawniać kod aplikacji
+- może dystrybuować wersje produkcyjne
+- musi opublikować wszelkie wprowadzone zmiany, tzn. publiczny fork tego repozytorium
+- nie może zmieniać licencji ani copyrightu aplikacji
 
 Dodatkowo:
-- Zabronione jest modyfikowanie lub usuwanie kodu odpowiedzialnego za zgodność wersji produkcyjnych z licencją.
+- zabronione jest modyfikowanie lub usuwanie kodu odpowiedzialnego za zgodność wersji produkcyjnych z licencją
 
-- **Wersje skompilowane nie mogą być dystrybuowane za pomocą Google Play oraz żadnej platformy, na której istnieje oficjalna wersja aplikacji**.
+- **wersje skompilowane nie mogą być dystrybuowane za pomocą Google Play oraz żadnej platformy, na której istnieje oficjalna wersja aplikacji**
 
 **Autorzy aplikacji nie biorą odpowiedzialności za używanie aplikacji, modyfikowanie oraz dystrybuowanie.**
 

app/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 
@@ -19,10 +18,8 @@ android {
         versionName release.versionName
 
         buildConfigField "java.util.Map<String, String>", "GIT_INFO", gitInfoMap
+        buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
         buildConfigField "String", "VERSION_BASE", "\"${release.versionName}\""
-        manifestPlaceholders = [
-                buildTimestamp: String.valueOf(System.currentTimeMillis())
-        ]
 
         multiDexEnabled = true
 
@@ -31,21 +28,11 @@ android {
                 cppFlags "-std=c++11"
             }
         }
-
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-            }
-        }
     }
 
     buildTypes {
         debug {
-            getIsDefault().set(true)
             minifyEnabled = false
-            manifestPlaceholders = [
-                    buildTimestamp: 0
-            ]
         }
         release {
             minifyEnabled = true
@@ -56,34 +43,23 @@ android {
     }
     flavorDimensions "platform"
     productFlavors {
-        unofficial {
-            getIsDefault().set(true)
-            versionName "${release.versionName}-${gitInfo.versionSuffix}"
+        main {
+            versionName gitInfo.versionHuman
         }
         official {}
         play {}
     }
     variantFilter { variant ->
         def flavors = variant.flavors*.name
-        setIgnore(variant.buildType.name == "debug" && !flavors.contains("unofficial") || flavors.contains("main"))
-    }
-    sourceSets {
-        unofficial {
-            java.srcDirs = ["src/main/java", "src/play-not/java"]
-            manifest.srcFile("src/play-not/AndroidManifest.xml")
-        }
-        official {
-            java.srcDirs = ["src/main/java", "src/play-not/java"]
-            manifest.srcFile("src/play-not/AndroidManifest.xml")
-        }
-        play {
-            java.srcDirs = ["src/main/java", "src/play/java"]
-        }
+        setIgnore(variant.buildType.name == "debug" && !flavors.contains("main"))
     }
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
     }
+    lintOptions {
+        checkReleaseBuilds = false
+    }
     buildFeatures {
         dataBinding = true
         viewBinding = true
@@ -97,9 +73,7 @@ android {
         jvmTarget = "1.8"
     }
     packagingOptions {
-        resources {
-            excludes += ['META-INF/library-core_release.kotlin_module']
-        }
+        exclude 'META-INF/library-core_release.kotlin_module'
     }
     externalNativeBuild {
         cmake {
@@ -107,9 +81,6 @@ android {
             version "3.10.2"
         }
     }
-    lint {
-        checkReleaseBuilds false
-    }
 }
 
 tasks.whenTaskAdded { task ->
@@ -127,10 +98,7 @@ tasks.whenTaskAdded { task ->
 
     if (flavor != "") {
         tasks.create(renameTaskName, Copy) {
-            from file("${projectDir}/${flavor}/release/"),
-                    file("${buildDir}/outputs/mapping/${flavor}Release/"),
-                    file("${buildDir}/outputs/apk/${flavor}/release/"),
-                    file("${buildDir}/outputs/bundle/${flavor}Release/")
+            from file("${projectDir}/${flavor}/release/"), file("${buildDir}/outputs/mapping/${flavor}Release/")
             include "*.aab", "*.apk", "mapping.txt", "output-metadata.json"
             destinationDir file("${projectDir}/release/")
             rename ".+?\\.(.+)", "Edziennik_${android.defaultConfig.versionName}_${flavor}." + '$1'
@@ -144,29 +112,28 @@ dependencies {
 
     // Language cores
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.multidex:multidex:2.0.1"
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 
     // Android Jetpack
-    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.core:core-ktx:1.9.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-    implementation "androidx.navigation:navigation-fragment-ktx:2.5.2"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.room:room-runtime:2.4.3"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
-    kapt "androidx.room:room-compiler:2.4.3"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.3.4"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.room:room-runtime:2.2.6"
+    implementation "androidx.work:work-runtime-ktx:2.5.0"
+    kapt "androidx.room:room-compiler:2.2.6"
 
     // Google design libs
-    implementation "com.google.android.material:material:1.6.1"
-    implementation "com.google.android.flexbox:flexbox:3.0.0"
+    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android:flexbox:2.0.1"
 
     // Play Services/Firebase
-    implementation "com.google.android.gms:play-services-wearable:17.1.0"
-    implementation("com.google.firebase:firebase-core") { version { strictly "19.0.2" } }
-    implementation "com.google.firebase:firebase-crashlytics:18.2.13"
+    implementation "com.google.android.gms:play-services-wearable:17.0.0"
+    implementation "com.google.firebase:firebase-core:18.0.2"
+    implementation "com.google.firebase:firebase-crashlytics:17.4.0"
     implementation("com.google.firebase:firebase-messaging") { version { strictly "20.1.3" } }
 
     // OkHttp, Retrofit, Gson, Jsoup
@@ -174,22 +141,20 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
-    implementation 'com.google.code.gson:gson:2.8.8'
-    implementation 'org.jsoup:jsoup:1.14.3'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation "org.jsoup:jsoup:1.13.1"
     implementation "pl.droidsonroids:jspoon:1.3.2"
     implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
 
     // Szkolny.eu libraries/forks
-    implementation "eu.szkolny:android-snowfall:1ca9ea2da3"
-    implementation "eu.szkolny:agendacalendarview:1.0.4"
+    implementation "eu.szkolny:agendacalendarview:1799f8ef47"
     implementation "eu.szkolny:cafebar:5bf0c618de"
     implementation "eu.szkolny.fslogin:lib:2.0.0"
     implementation "eu.szkolny:material-about-library:1d5ebaf47c"
     implementation "eu.szkolny:mhttp:af4b62e6e9"
     implementation "eu.szkolny:nachos:0e5dfcaceb"
     implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
-    officialImplementation "eu.szkolny:ssl-provider:1.0.0"
-    unofficialImplementation "eu.szkolny:ssl-provider:1.0.0"
+    implementation "eu.szkolny:ssl-provider:1.0.0"
     implementation "pl.szczodrzynski:navlib:0.8.0"
     implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
     implementation "pl.szczodrzynski:recyclertablayout:700f980584"
@@ -197,34 +162,34 @@ dependencies {
     kapt "eu.szkolny.selective-dao:codegen:27f8f3f194"
 
     // Iconics & related
-    implementation "com.mikepenz:iconics-core:5.3.2"
-    implementation "com.mikepenz:iconics-views:5.3.2"
+    implementation "com.mikepenz:iconics-core:5.3.0-b01"
+    implementation "com.mikepenz:iconics-views:5.3.0-b01"
     implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
-    implementation "eu.szkolny:szkolny-font:77e33acc2a"
+    implementation "eu.szkolny:szkolny-font:1.3"
 
     // Other dependencies
     implementation "cat.ereza:customactivityoncrash:2.3.0"
-    implementation "com.android.volley:volley:1.2.1"
+    implementation "com.applandeo:material-calendar-view:1.5.0"
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation "com.github.Applandeo:Material-Calendar-View:15de569cbc" // https://github.com/Applandeo/Material-Calendar-View
-    implementation "com.github.CanHub:Android-Image-Cropper:2.2.2" // https://github.com/CanHub/Android-Image-Cropper
-    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1" // https://github.com/ChuckerTeam/chucker
-    implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2" // https://github.com/antonKozyriatskyi/CircularProgressIndicator
-    implementation "com.github.bassaer:chatmessageview:2.0.1" // https://github.com/bassaer/ChatMessageView
-    implementation "com.github.hypertrack:hyperlog-android:0.0.10" // https://github.com/hypertrack/hyperlog-android
-    implementation "com.github.smuyyh:JsonViewer:V1.0.6" // https://github.com/smuyyh/JsonViewer
-    implementation "com.github.underwindfall.PowerPermission:powerpermission-coroutines:1.4.0" // https://github.com/underwindfall/PowerPermission
-    implementation "com.github.underwindfall.PowerPermission:powerpermission:1.4.0" // https://github.com/underwindfall/PowerPermission
-    implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31" // https://github.com/wulkanowy/uonet-request-signer
+    implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
+    implementation "com.github.bassaer:chatmessageview:2.0.1"
+    implementation "com.github.CanHub:Android-Image-Cropper:2.2.2"
+    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
+    implementation "com.github.jetradarmobile:android-snowfall:1.2.0"
+    implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31"
+    implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
+    implementation "com.hypertrack:hyperlog:0.0.10"
     implementation "com.jaredrummler:colorpicker:1.1.0"
+    implementation "com.qifan.powerpermission:powerpermission-coroutines:1.3.0"
+    implementation "com.qifan.powerpermission:powerpermission:1.3.0"
+    implementation "com.yuyh.json:jsonviewer:1.0.6"
     implementation "io.coil-kt:coil:1.1.1"
     implementation "me.dm7.barcodescanner:zxing:1.9.8"
     implementation "me.grantland:autofittextview:0.2.1"
     implementation "me.leolin:ShortcutBadger:1.1.22@aar"
     implementation "org.greenrobot:eventbus:3.2.0"
-    implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } }
     implementation("pl.droidsonroids.gif:android-gif-drawable") { version { strictly "1.2.15" } }
 
     // Debug-only dependencies
-    debugImplementation "com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6"
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
 }

app/git-info.gradle

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

app/proguard-rules.pro

@@ -25,17 +25,15 @@
 -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.data.db.entity.Note { *; }
--keep class pl.szczodrzynski.edziennik.ui.home.HomeCardModel { *; }
+-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); }
--keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); }
 -keepclassmembernames class androidx.appcompat.view.menu.StandardMenuPopup { private *; }
--keepclassmembernames class androidx.appcompat.view.menu.MenuItemImpl { private *; }
+-keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); }
 
 -keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; }
 
@@ -68,7 +66,7 @@
 
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.ui.login.LoginInfo$Platform { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
 
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     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" />
@@ -12,7 +13,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <!-- 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" />
 
@@ -28,8 +29,6 @@
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute">
 
-        <meta-data android:name="buildTimestamp" android:value="${buildTimestamp}" />
-
         <!--  __  __       _                      _   _       _ _
              |  \/  |     (_)           /\       | | (_)     (_) |
              | \  / | __ _ _ _ __      /  \   ___| |_ ___   ___| |_ _   _
@@ -42,7 +41,6 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -66,7 +64,6 @@
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:exported="true"
             android:theme="@style/AppTheme.Dark.NoDisplay">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -74,8 +71,7 @@
         </activity>
         <!-- TIMETABLE -->
         <receiver android:name=".ui.widgets.timetable.WidgetTimetableProvider"
-            android:label="@string/widget_timetable_title"
-            android:exported="true">
+            android:label="@string/widget_timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -90,12 +86,10 @@
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:exported="true"
             android:theme="@style/AppTheme.Dark.NoDisplay" />
         <!-- NOTIFICATIONS -->
         <receiver android:name=".ui.widgets.notifications.WidgetNotificationsProvider"
-            android:label="@string/widget_notifications_title"
-            android:exported="true">
+            android:label="@string/widget_notifications_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -108,8 +102,7 @@
             android:permission="android.permission.BIND_REMOTEVIEWS" />
         <!-- LUCKY NUMBER -->
         <receiver android:name=".ui.widgets.luckynumber.WidgetLuckyNumberProvider"
-            android:label="@string/widget_lucky_number_title"
-            android:exported="true">
+            android:label="@string/widget_lucky_number_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -126,43 +119,31 @@
               / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
              /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
         -->
-        <activity android:name=".ui.base.CrashActivity"
+        <activity android:name=".ui.modules.base.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
-            android:exported="false"
             android:theme="@style/DeadTheme" />
-        <activity android:name=".ui.intro.ChangelogIntroActivity"
+        <activity android:name=".ui.modules.intro.ChangelogIntroActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
-            android:exported="false"
             android:theme="@style/Theme.Intro" />
-        <activity android:name=".ui.login.LoginActivity"
+        <activity android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
-            android:exported="false"
             android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.home.CounterActivity"
-            android:exported="false"
+        <activity android:name=".ui.modules.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
-        <activity android:name=".ui.feedback.FeedbackActivity"
+        <activity android:name=".ui.modules.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
-            android:exported="false"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.settings.SettingsLicenseActivity"
+        <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:exported="false"
             android:theme="@style/AppTheme" />
         <activity android:name="com.canhub.cropper.CropImageActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:exported="false"
             android:theme="@style/Base.Theme.AppCompat" />
-        <activity android:name=".ui.login.oauth.OAuthLoginActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:exported="false"
-            android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.base.BuildInvalidActivity" android:exported="false" />
-        <activity android:name=".ui.settings.contributors.ContributorsActivity" android:exported="false" />
+        <activity android:name=".ui.modules.base.BuildInvalidActivity" />
 
         <!--  _____               _
              |  __ \             (_)
@@ -172,14 +153,12 @@
              |_|  \_\___|\___\___|_| \_/ \___|_|  |___/
         -->
         <receiver android:name=".receivers.UserPresentReceiver"
-            android:enabled="true"
-            android:exported="true">
+            android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".sync.UpdateDownloaderService$DownloadProgressReceiver"
-            android:exported="true">
+        <receiver android:name=".sync.UpdateDownloaderService$DownloadProgressReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
             </intent-filter>

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

@@ -1,11 +1,14 @@
-<h3>Wersja 4.13-beta.2, 2022-10-18</h3>
+<h3>Wersja 4.7-rc.1, 2021-04-01</h3>
 <ul>
-    <li>Poprawione powiadomienia na Androidzie 13. @santoni0</li>
-    <li>Możliwość dostosowania wyświetlania planu lekcji</li>
-    <li>Opcja kolorowania bloków w planie lekcji</li>
-    <li><b>USOS</b> - pierwsza wersja obsługi systemu</li>
+    <li><u>Szkolny.eu jest teraz open source!</u> Zapraszamy na stronę https://szkolny.eu/ po więcej ważnych informacji.</li>
+    <li>Poprawiono wybieranie obrazków (tła nagłówka, tła aplikacji oraz profilu) z dowolnego źródła.</li>
+    <li>Naprawiono zatrzymanie aplikacji na Androidzie 4.4 i starszych.</li>
+    <li>Naprawiono problemy z połączeniem internetowym na Androidzie 4.4 i starszych.</li>
+    <li>Dodano ekran informacji o kompilacji w Ustawieniach.</li>
+    <li>Zaktualizowano ekran licencji open source.</li>
+    <li>Zoptymalizowano wielkość aplikacji.</li>
 </ul>
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>
-<i>&copy; [Kuba Szczodrzyński](@kuba2k2), [Kacper Ziubryniewicz](@kapi2289) 2022</i>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2021</i>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xde, 0xd4, 0xce, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0xdd, 0x0a, 0x72, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

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

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

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

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

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

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

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

@@ -12,7 +12,10 @@ 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.*
+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
@@ -72,15 +75,10 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false }
         set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value }
 
-    private var mDevMode: Boolean? = null
-    var devMode: Boolean?
-        get() { mDevMode = mDevMode ?: values.getBooleanOrNull("debugMode"); return mDevMode }
-        set(value) { set("debugMode", value?.toString()); mDevMode = value }
-
-    private var mEnableChucker: Boolean? = null
-    var enableChucker: Boolean?
-        get() { mEnableChucker = mEnableChucker ?: values.getBooleanOrNull("enableChucker"); return mEnableChucker }
-        set(value) { set("enableChucker", value?.toString()); mEnableChucker = 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?
@@ -122,11 +120,6 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mApiInvalidCert = mApiInvalidCert ?: values["apiInvalidCert"]; return mApiInvalidCert }
         set(value) { set("apiInvalidCert", value); mApiInvalidCert = value }
 
-    private var mApiAvailabilityCheck: Boolean? = null
-    var apiAvailabilityCheck: Boolean
-        get() { mApiAvailabilityCheck = mApiAvailabilityCheck ?: values.get("apiAvailabilityCheck", true); return mApiAvailabilityCheck ?: true }
-        set(value) { set("apiAvailabilityCheck", value); mApiAvailabilityCheck = value }
-
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {

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

@@ -6,7 +6,6 @@ package pl.szczodrzynski.edziennik.config
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
@@ -124,19 +123,6 @@ class ConfigSync(private val config: Config) {
 
     private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
     var registerAvailability: Map<String, RegisterAvailabilityStatus>
-        get() {
-            val flavor = config.values.get("registerAvailabilityFlavor", null as String?)
-            if (BuildConfig.FLAVOR != flavor)
-                return mapOf()
-
-            mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it ->
-                gson.fromJson(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type)
-            }
-            return mRegisterAvailability ?: mapOf()
-        }
-        set(value) {
-            config.setMap("registerAvailability", value)
-            config.set("registerAvailabilityFlavor", BuildConfig.FLAVOR)
-            mRegisterAvailability = value
-        }
+        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
+        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
 }

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

@@ -49,11 +49,6 @@ class ConfigUI(private val config: Config) {
         get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false }
         set(value) { config.set("snowfall", value); mSnowfall = value }
 
-    private var mEggfall: Boolean? = null
-    var eggfall: Boolean
-        get() { mEggfall = mEggfall ?: config.values.get("eggfall", false); return mEggfall ?: false }
-        set(value) { config.set("eggfall", value); mEggfall = value }
-
     private var mBottomSheetOpened: Boolean? = null
     var bottomSheetOpened: Boolean
         get() { mBottomSheetOpened = mBottomSheetOpened ?: config.values.get("bottomSheetOpened", false); return mBottomSheetOpened ?: false }

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

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

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

@@ -4,12 +4,12 @@
 
 package pl.szczodrzynski.edziennik.config
 
-import pl.szczodrzynski.edziennik.config.utils.getIntList
+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.getIntList("notificationFilter", listOf()); return mNotificationFilter ?: listOf() }
+        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

@@ -7,7 +7,7 @@ package pl.szczodrzynski.edziennik.config
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
-import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel
 
 class ProfileConfigUI(private val config: ProfileConfig) {
     private var mAgendaViewType: Int? = null
@@ -15,78 +15,8 @@ class ProfileConfigUI(private val config: ProfileConfig) {
         get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: AGENDA_DEFAULT }
         set(value) { config.set("agendaViewType", value); mAgendaViewType = value }
 
-    private var mAgendaCompactMode: Boolean? = null
-    var agendaCompactMode: Boolean
-        get() { mAgendaCompactMode = mAgendaCompactMode ?: config.values.get("agendaCompactMode", false); return mAgendaCompactMode ?: false }
-        set(value) { config.set("agendaCompactMode", value); mAgendaCompactMode = value }
-
-    private var mAgendaGroupByType: Boolean? = null
-    var agendaGroupByType: Boolean
-        get() { mAgendaGroupByType = mAgendaGroupByType ?: config.values.get("agendaGroupByType", false); return mAgendaGroupByType ?: false }
-        set(value) { config.set("agendaGroupByType", value); mAgendaGroupByType = value }
-
-    private var mAgendaLessonChanges: Boolean? = null
-    var agendaLessonChanges: Boolean
-        get() { mAgendaLessonChanges = mAgendaLessonChanges ?: config.values.get("agendaLessonChanges", true); return mAgendaLessonChanges ?: true }
-        set(value) { config.set("agendaLessonChanges", value); mAgendaLessonChanges = value }
-
-    private var mAgendaTeacherAbsence: Boolean? = null
-    var agendaTeacherAbsence: Boolean
-        get() { mAgendaTeacherAbsence = mAgendaTeacherAbsence ?: config.values.get("agendaTeacherAbsence", true); return mAgendaTeacherAbsence ?: true }
-        set(value) { config.set("agendaTeacherAbsence", value); mAgendaTeacherAbsence = value }
-
-    private var mAgendaElearningMark: Boolean? = null
-    var agendaElearningMark: Boolean
-        get() { mAgendaElearningMark = mAgendaElearningMark ?: config.values.get("agendaElearningMark", false); return mAgendaElearningMark ?: false }
-        set(value) { config.set("agendaElearningMark", value); mAgendaElearningMark = value }
-
-    private var mAgendaElearningGroup: Boolean? = null
-    var agendaElearningGroup: Boolean
-        get() { mAgendaElearningGroup = mAgendaElearningGroup ?: config.values.get("agendaElearningGroup", true); return mAgendaElearningGroup ?: true }
-        set(value) { config.set("agendaElearningGroup", value); mAgendaElearningGroup = 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 }
-
-    private var mMessagesGreetingOnCompose: Boolean? = null
-    var messagesGreetingOnCompose: Boolean
-        get() { mMessagesGreetingOnCompose = mMessagesGreetingOnCompose ?: config.values.get("messagesGreetingOnCompose", true); return mMessagesGreetingOnCompose ?: true }
-        set(value) { config.set("messagesGreetingOnCompose", value); mMessagesGreetingOnCompose = value }
-
-    private var mMessagesGreetingOnReply: Boolean? = null
-    var messagesGreetingOnReply: Boolean
-        get() { mMessagesGreetingOnReply = mMessagesGreetingOnReply ?: config.values.get("messagesGreetingOnReply", true); return mMessagesGreetingOnReply ?: true }
-        set(value) { config.set("messagesGreetingOnReply", value); mMessagesGreetingOnReply = value }
-
-    private var mMessagesGreetingOnForward: Boolean? = null
-    var messagesGreetingOnForward: Boolean
-        get() { mMessagesGreetingOnForward = mMessagesGreetingOnForward ?: config.values.get("messagesGreetingOnForward", false); return mMessagesGreetingOnForward ?: false }
-        set(value) { config.set("messagesGreetingOnForward", value); mMessagesGreetingOnForward = value }
-
-    private var mMessagesGreetingText: String? = null
-    var messagesGreetingText: String?
-        get() { mMessagesGreetingText = mMessagesGreetingText ?: config.values["messagesGreetingText"]; return mMessagesGreetingText }
-        set(value) { config.set("messagesGreetingText", value); mMessagesGreetingText = value }
-
-    private var mTimetableShowAttendance: Boolean? = null
-    var timetableShowAttendance: Boolean
-        get() { mTimetableShowAttendance = mTimetableShowAttendance ?: config.values.get("timetableShowAttendance", true); return mTimetableShowAttendance ?: true }
-        set(value) { config.set("timetableShowAttendance", value); mTimetableShowAttendance = value }
-
-    private var mTimetableShowEvents: Boolean? = null
-    var timetableShowEvents: Boolean
-        get() { mTimetableShowEvents = mTimetableShowEvents ?: config.values.get("timetableShowEvents", true); return mTimetableShowEvents ?: true }
-        set(value) { config.set("timetableShowEvents", value); mTimetableShowEvents = value }
-
-    private var mTimetableTrimHourRange: Boolean? = null
-    var timetableTrimHourRange: Boolean
-        get() { mTimetableTrimHourRange = mTimetableTrimHourRange ?: config.values.get("timetableTrimHourRange", false); return mTimetableTrimHourRange ?: false }
-        set(value) { config.set("timetableTrimHourRange", value); mTimetableTrimHourRange = value }
-    
-    private var mTimetableColorSubjectName: Boolean? = null
-    var timetableColorSubjectName: Boolean
-        get() { mTimetableColorSubjectName = mTimetableColorSubjectName ?: config.values.get("timetableColorSubjectName", false); return mTimetableColorSubjectName ?: false }
-        set(value) { config.set("timetableColorSubjectName", value); mTimetableColorSubjectName = value }
 }

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

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

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

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

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

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

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

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

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

@@ -22,7 +22,7 @@ import pl.szczodrzynski.edziennik.data.api.task.ErrorReportTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.ext.toApiError
+import pl.szczodrzynski.edziennik.toApiError
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -84,21 +84,19 @@ class ApiService : Service() {
             runTask()
         }
 
-        override fun onRequiresUserAction(event: UserActionRequiredEvent) {
-            app.userActionManager.sendToUser(event)
-            taskRunning?.cancel()
-            clearTask()
-            runTask()
-        }
-
         override fun onError(apiError: ApiError) {
             lastEventTime = System.currentTimeMillis()
             d(TAG, "Task $taskRunningId threw an error - $apiError")
             apiError.profileId = taskProfileId
 
-            EventBus.getDefault().postSticky(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()

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

@@ -24,7 +24,7 @@ const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"
 
 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 = "VaItV6oRutdo8fnjJwysnTjVlvaswf52ZqmXsJGP"
+const val LIBRUS_CLIENT_ID = "0RbsDOkV9tyKEQYzlLv5hs3DM1ukrynFI4p6C1Yc"
 const val LIBRUS_REDIRECT_URL = "app://librus"
 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"
@@ -43,7 +43,7 @@ const val LIBRUS_API_TOKEN_URL = "https://api.librus.pl/OAuth/Token"
 const val LIBRUS_API_TOKEN_JST_URL = "https://api.librus.pl/OAuth/TokenJST"
 const val LIBRUS_API_AUTHORIZATION = "Mjg6ODRmZGQzYTg3YjAzZDNlYTZmZmU3NzdiNThiMzMyYjE="
 const val LIBRUS_API_SECRET_JST = "18b7c1ee08216f636a1b1a2440e68398"
-const val LIBRUS_API_CLIENT_ID_JST = "59"
+const val LIBRUS_API_CLIENT_ID_JST = "49"
 //const val LIBRUS_API_CLIENT_ID_JST_REFRESH = "42"
 
 const val LIBRUS_JST_DEMO_CODE = "68656A21"
@@ -59,15 +59,40 @@ 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 LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL = "https://synergia.librus.pl/wiadomosci/pobierz_zalacznik"
 
-const val LIBRUS_PORTAL_RECAPTCHA_KEY = "6Lf48moUAAAAAB9ClhdvHr46gRWR"
-const val LIBRUS_PORTAL_RECAPTCHA_REFERER = "https://portal.librus.pl/rodzina/login"
+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"
+const val IDZIENNIK_API_CURRENT_REGISTER = "Uczniowie/\$STUDENT_ID/AktualnyDziennik"
+const val IDZIENNIK_API_GRADES = "Uczniowie/\$STUDENT_ID/Oceny/" /* + semester */
+const val IDZIENNIK_API_MESSAGES_INBOX = "Wiadomosci/Odebrane"
+const val IDZIENNIK_API_MESSAGES_SENT = "Wiadomosci/Wyslane"
 
 
 val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
 
 const val VULCAN_HEBE_USER_AGENT = "Dart/2.10 (dart:io)"
 const val VULCAN_HEBE_APP_NAME = "DzienniczekPlus 2.0"
-const val VULCAN_HEBE_APP_VERSION = "22.09.02 (G)"
+const val VULCAN_HEBE_APP_VERSION = "21.02.09 (G)"
 private const val VULCAN_API_DEVICE_NAME_PREFIX = "Szkolny.eu "
 private const val VULCAN_API_DEVICE_NAME_SUFFIX = " - nie usuwać"
 val VULCAN_API_DEVICE_NAME by lazy {
@@ -84,30 +109,20 @@ const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all"
 const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule"
 const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes"
 const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook"
-const val VULCAN_HEBE_ENDPOINT_TEACHERS = "api/mobile/teacher"
 const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam"
 const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
 const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary"
 const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework"
 const val VULCAN_HEBE_ENDPOINT_NOTICES = "api/mobile/note"
 const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson"
-const val VULCAN_HEBE_ENDPOINT_MESSAGEBOX = "api/mobile/messagebox"
-const val VULCAN_HEBE_ENDPOINT_MESSAGEBOX_ADDRESSBOOK = "api/mobile/messagebox/addressbook"
-const val VULCAN_HEBE_ENDPOINT_MESSAGEBOX_MESSAGES = "api/mobile/messagebox/message"
-const val VULCAN_HEBE_ENDPOINT_MESSAGEBOX_STATUS = "api/mobile/messagebox/message/status"
-const val VULCAN_HEBE_ENDPOINT_MESSAGEBOX_SEND = "api/mobile/messagebox/message"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_SEND = "api/mobile/message"
 const val VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER = "api/mobile/school/lucky"
 
+const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
+
 const val PODLASIE_API_VERSION = "1.0.62"
 const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
 const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"
 const val PODLASIE_API_LOGOUT_DEVICES_ENDPOINT = "/wyczyscUrzadzenia"
-
-const val USOS_API_OAUTH_REDIRECT_URL = "szkolny://redirect/usos"
-
-val USOS_API_SCOPES by lazy { listOf(
-    "offline_access",
-    "studies",
-    "grades",
-    "events",
-) }

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

@@ -11,9 +11,8 @@ import android.content.Context
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_MIN
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.Bundle
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ext.Bundle
-import pl.szczodrzynski.edziennik.ext.pendingIntentFlag
 import pl.szczodrzynski.edziennik.receivers.SzkolnyReceiver
 import kotlin.math.roundToInt
 
@@ -41,14 +40,14 @@ class EdziennikNotification(val app: App) {
                 "task" to "TaskCancelRequest",
                 "taskId" to taskId
         ))
-        return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or pendingIntentFlag()) as PendingIntent
+        return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) as PendingIntent
     }
     private val closePendingIntent: PendingIntent
         get() {
             val intent = SzkolnyReceiver.getIntent(app, Bundle(
                     "task" to "ServiceCloseRequest"
             ))
-            return PendingIntent.getBroadcast(app, 0, intent, pendingIntentFlag()) as PendingIntent
+            return PendingIntent.getBroadcast(app, 0, intent, 0) as PendingIntent
         }
 
     private fun errorCountText(): String? {

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

@@ -58,7 +58,11 @@ const val ERROR_INVALID_LOGIN_MODE                          = 110
 const val ERROR_LOGIN_METHOD_NOT_SATISFIED                  = 111
 const val ERROR_NOT_IMPLEMENTED                             = 112
 const val ERROR_FILE_DOWNLOAD                               = 113
-const val ERROR_REQUIRES_USER_ACTION                        = 114
+
+const val ERROR_NO_STUDENTS_IN_ACCOUNT                      = 115
+
+const val ERROR_CAPTCHA_NEEDED                              = 3000
+const val ERROR_CAPTCHA_LIBRUS_PORTAL                       = 3001
 
 const val ERROR_API_PDO_ERROR                               = 5000
 const val ERROR_API_INVALID_CLIENT                          = 5001
@@ -191,21 +195,21 @@ const val ERROR_VULCAN_HEBE_FIREBASE_ERROR                  = 362
 const val ERROR_VULCAN_HEBE_CERTIFICATE_GONE                = 363
 const val ERROR_VULCAN_HEBE_SERVER_ERROR                    = 364
 const val ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND                = 365
-const val ERROR_VULCAN_HEBE_MISSING_SENDER_ENTRY            = 366
 const val ERROR_VULCAN_API_DEPRECATED                       = 390
 
+const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
+const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
+const val ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID         = 511
+const val ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS              = 521
+const val ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED             = 522
+const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING                = 530
+
 const val ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN            = 601
 const val ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT             = 602
 const val ERROR_PODLASIE_API_NO_TOKEN                       = 630
 const val ERROR_PODLASIE_API_OTHER                          = 631
 const val ERROR_PODLASIE_API_DATA_MISSING                   = 632
 
-const val ERROR_USOS_OAUTH_GOT_DIFFERENT_TOKEN              = 702
-const val ERROR_USOS_OAUTH_INCOMPLETE_RESPONSE              = 703
-const val ERROR_USOS_NO_STUDENT_PROGRAMMES                  = 704
-const val ERROR_USOS_API_INCOMPLETE_RESPONSE                = 705
-const val ERROR_USOS_API_MISSING_RESPONSE                   = 706
-
 const val ERROR_TEMPLATE_WEB_OTHER                          = 801
 
 const val EXCEPTION_API_TASK                                = 900
@@ -219,6 +223,8 @@ const val EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST           = 908
 const val EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST            = 909
 const val EXCEPTION_NOTIFY                                  = 910
 const val EXCEPTION_LIBRUS_MESSAGES_REQUEST                 = 911
+const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
+const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
 const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
 const val EXCEPTION_VULCAN_WEB_LOGIN                        = 931
 const val EXCEPTION_VULCAN_WEB_REQUEST                      = 932

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

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.data.api
 
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginMessages
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
@@ -13,7 +14,6 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.Mobidzie
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.usos.login.UsosLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
@@ -26,9 +26,8 @@ import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 
 const val SYNERGIA_API_ENABLED = false
 
-// the graveyard
+
 const val LOGIN_TYPE_IDZIENNIK = 3
-const val LOGIN_TYPE_EDUDZIENNIK = 5
 
 const val LOGIN_TYPE_TEMPLATE = 21
 
@@ -119,6 +118,15 @@ val vulcanLoginMethods = listOf(
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
 )
 
+const val LOGIN_TYPE_EDUDZIENNIK = 5
+const val LOGIN_MODE_EDUDZIENNIK_WEB = 0
+const val LOGIN_METHOD_EDUDZIENNIK_WEB = 100
+val edudziennikLoginMethods = listOf(
+        LoginMethod(LOGIN_TYPE_EDUDZIENNIK, LOGIN_METHOD_EDUDZIENNIK_WEB, EdudziennikLoginWeb::class.java)
+                .withIsPossible { _, _ -> true }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
+)
+
 const val LOGIN_TYPE_PODLASIE = 6
 const val LOGIN_MODE_PODLASIE_API = 0
 const val LOGIN_METHOD_PODLASIE_API = 100
@@ -128,15 +136,6 @@ val podlasieLoginMethods = listOf(
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
 )
 
-const val LOGIN_TYPE_USOS = 7
-const val LOGIN_MODE_USOS_OAUTH = 0
-const val LOGIN_METHOD_USOS_API = 100
-val usosLoginMethods = listOf(
-        LoginMethod(LOGIN_TYPE_USOS, LOGIN_METHOD_USOS_API, UsosLoginApi::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
-)
-
 val templateLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_TEMPLATE, LOGIN_METHOD_TEMPLATE_WEB, TemplateLoginWeb::class.java)
                 .withIsPossible { _, _ -> true }

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

@@ -16,14 +16,6 @@ object Regexes {
         """[^0-9]""".toRegex()
     }
 
-    val HTML_BR by lazy {
-        """<br\s?/?>""".toRegex()
-    }
-
-    val MESSAGE_META by lazy {
-        """^\[META:([A-z0-9-&=]+)]""".toRegex()
-    }
-
 
 
     val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
@@ -58,16 +50,15 @@ object Regexes {
         """events: (.+),$""".toRegex(RegexOption.MULTILINE)
     }
 
-    val MOBIDZIENNIK_WEB_ATTACHMENT by lazy {
-        """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik(_rozwiazania)?=([0-9]+)".+?>(.+?)(?: <small.+?\(([0-9.]+)\s(M|K|G|)B\)</small>)?</a>""".toRegex()
-    }
-
     val MOBIDZIENNIK_MESSAGE_READ_DATE by lazy {
         """czas przeczytania:.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL)
     }
     val MOBIDZIENNIK_MESSAGE_SENT_READ_DATE by lazy {
         """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL)
     }
+    val MOBIDZIENNIK_MESSAGE_ATTACHMENT by lazy {
+        """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)"(?:.+?<small.+?\(([0-9.]+)\s(M|K|G|)B\))*""".toRegex(DOT_MATCHES_ALL)
+    }
     val MOBIDZIENNIK_MESSAGE_SENT_READ_BY by lazy {
         """([0-9]+)/([0-9]+)""".toRegex()
     }
@@ -109,43 +100,61 @@ object Regexes {
         """<strong>(.+?)</strong>\s*<small>\s*\((.+?),\s*(.+?)\)""".toRegex(DOT_MATCHES_ALL)
     }
 
-    val MOBIDZIENNIK_MOBILE_HOMEWORK_ROW by lazy {
+    val MOBIDZIENNIK_HOMEWORK_ROW by lazy {
         """class="rowRolling">(.+?</div>\s*</td>)""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_MOBILE_HOMEWORK_ITEM by lazy {
+    val MOBIDZIENNIK_HOMEWORK_ITEM by lazy {
         """<p><b>(.+?):</b>\s*(.+?)\s*</p>""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_MOBILE_HOMEWORK_BODY by lazy {
+    val MOBIDZIENNIK_HOMEWORK_BODY by lazy {
         """Treść:</b>(.+?)<p><b>""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_MOBILE_HOMEWORK_ID by lazy {
-        """name="id_zadania" value="([0-9]+)"""".toRegex(DOT_MATCHES_ALL)
+    val MOBIDZIENNIK_HOMEWORK_ID by lazy {
+        """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
     }
-    val MOBIDZIENNIK_MOBILE_HOMEWORK_ATTACHMENT by lazy {
+    val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
         """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
 
-    val MOBIDZIENNIK_WEB_HOMEWORK_ADDED_DATE by lazy {
-        """Wpisał\(a\):</td>\s+<th>\s+(.+?), (.+?), ([0-9]{1,2}) (.+?) ([0-9]{4}), godzina ([0-9:]+)""".toRegex()
+
+
+    val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
+        """<input type="hidden".+?name="([A-z0-9_]+)?".+?value="([A-z0-9_+-/=]+)?".+?>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_ERROR by lazy {
+        """id="spanErrorMessage">(.*?)</""".toRegex(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME by lazy {
+        """Imię i nazwisko:.+?">(.+?)</div>""".toRegex(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]+)/([0-9]+)<""".toRegex(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
+        """<select.*?name="ctl00\${"$"}dxComboUczniowie".*?</select>""".toRegex(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(DOT_MATCHES_ALL)
+    }
+    val IDZIENNIK_MESSAGES_RECIPIENT_PARENT by lazy {
+        """(.+?)\s\((.+)\)""".toRegex()
+    }
+    /*<span id="ctl00_spanSzczesliwyLos">Szczęśliwy los na dzisiaj to <b>19</b>. Los na jutro to <b>22</b></span>*/
+    val IDZIENNIK_WEB_LUCKY_NUMBER by lazy {
+        """dzisiaj to <b>([0-9]+)</b>""".toRegex()
+    }
+    val IDZIENNIK_WEB_SELECTED_REGISTER by lazy {
+        """selected="selected" value="([0-9]+)" data-id-ucznia""".toRegex()
     }
 
 
-    val MOBIDZIENNIK_TIMETABLE_TOP by lazy {
-        """<div class="plansc_top">.+?</div></div>""".toRegex(DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_TIMETABLE_CELL by lazy {
-        """<div class="plansc_cnt_w" style="(.+?)">.+?style="(.+?)".+?title="(.+?)".+?>\s+(.+?)\s+</div>""".toRegex(DOT_MATCHES_ALL)
-    }
-    val MOBIDZIENNIK_TIMETABLE_LEFT by lazy {
-        """<div class="plansc_godz">.+?</div></div>""".toRegex(DOT_MATCHES_ALL)
-    }
 
-
-    val MOBIDZIENNIK_EVENT_CONTENT by lazy {
-        """<h1>(.+?) <small>\(wpisał\(a\) (.+?) w dniu ([0-9-]{10})\).+?<strong>(.+?)</strong><br""".toRegex(DOT_MATCHES_ALL)
+    val VULCAN_SHIFT_ANNOTATION by lazy {
+        """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
     }
-
-
     val VULCAN_WEB_PERMISSIONS by lazy {
         """permissions: '([A-z0-9/=+\-_|]+?)'""".toRegex()
     }
@@ -163,6 +172,82 @@ object Regexes {
     }
 
 
+
+    val EDUDZIENNIK_STUDENTS_START by lazy {
+        """<li><a href="/Students/([\w-_]+?)/start/">(.*?)</a>""".toRegex()
+    }
+    val EDUDZIENNIK_ACCOUNT_NAME_START by lazy {
+        """<span id='user_dn'>(.*?)</span>""".toRegex()
+    }
+    val EDUDZIENNIK_SUBJECTS_START by lazy {
+        """<a class="menu-course" href="/Students/[\w-_]+?/Courses/([\w-_]+)/">(.+?)</a>""".toRegex()
+    }
+
+    val EDUDZIENNIK_ATTENDANCE_ENTRIES by lazy {
+        """<td id="([\d-]+?):(\d+?)".*?>(.+?)</td>""".toRegex()
+    }
+    val EDUDZIENNIK_ATTENDANCE_TYPES by lazy {
+        """<div class="info">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_ATTENDANCE_TYPE by lazy {
+        """\((.+?)\) (.+)""".toRegex()
+    }
+
+    val EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION by lazy {
+        """<div class="desc">.*?<p>(.*?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_HOMEWORK_DESCRIPTION by lazy {
+        """<div class="desc">(.*?)</div>""".toRegex(DOT_MATCHES_ALL)
+    }
+
+    val EDUDZIENNIK_SUBJECT_ID by lazy {
+        """/Courses/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_GRADE_ID by lazy {
+        """/Grades/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EXAM_ID by lazy {
+        """/Evaluations/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EVENT_TYPE_ID by lazy {
+        """/GradeLabels/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_ANNOUNCEMENT_ID by lazy {
+        """/Announcement/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_HOMEWORK_ID by lazy {
+        """/Homework/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_TEACHER_ID by lazy {
+        """/Teachers/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_EVENT_ID by lazy {
+        """/KlassEvent/([\w-_]+?)/""".toRegex()
+    }
+    val EDUDZIENNIK_NOTE_ID by lazy {
+        """/RegistryNotes/([\w-_]+?)/""".toRegex()
+    }
+
+    val EDUDZIENNIK_SCHOOL_DETAIL_ID by lazy {
+        """<a id="School_detail".*?/School/([\w-_]+?)/""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_SCHOOL_DETAIL_NAME by lazy {
+        """</li>.*?<p>(.*?)</p>.*?<li>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_CLASS_DETAIL_ID by lazy {
+        """<a id="Klass_detail".*?/Klass/([\w-_]+?)/""".toRegex(DOT_MATCHES_ALL)
+    }
+    val EDUDZIENNIK_CLASS_DETAIL_NAME by lazy {
+        """<a id="Klass_detail".*?>(.*?)</a>""".toRegex(DOT_MATCHES_ALL)
+    }
+
+    val EDUDZIENNIK_TEACHERS by lazy {
+        """<div class="teacher">.*?<p>(.+?) (.+?)</p>""".toRegex(DOT_MATCHES_ALL)
+    }
+
+
+
+
     val LINKIFY_DATE_YMD by lazy {
         """(1\d{3}|20\d{2})[\-./](1[0-2]|0?\d)[\-./]([1-2]\d|3[0-1]|0?\d)""".toRegex()
     }

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

@@ -8,16 +8,17 @@ import com.google.gson.JsonObject
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.Edudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.Mobidziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.Podlasie
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template
-import pl.szczodrzynski.edziennik.data.api.edziennik.usos.Usos
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan
 import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
@@ -26,7 +27,6 @@ import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
@@ -90,21 +90,35 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
                 return
             }
 
-            val error = app.availabilityManager.check(profile)
-            when (error?.type) {
-                Type.NOT_AVAILABLE -> {
+            profile.registerName?.also { registerName ->
+                var status = app.config.sync.registerAvailability[registerName]
+                if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching({
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }, onError = {
+                        val apiError = it.toApiError(TAG)
+                        if (apiError.errorCode == ERROR_API_INVALID_SIGNATURE) {
+                            return@also
+                        }
+                        taskCallback.onError(apiError)
+                        return
+                    })
+                }
+
+                if (status?.available != true
+                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
                     if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
-                        EventBus.getDefault().postSticky(RegisterAvailabilityEvent())
+                        EventBus.getDefault().postSticky(
+                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
+                        )
                     }
                     cancel()
                     taskCallback.onCompleted()
                     return
                 }
-                Type.API_ERROR -> {
-                    taskCallback.onError(error.apiError!!)
-                    return
-                }
-                else -> return@let
             }
         }
 
@@ -112,9 +126,9 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
             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_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_USOS -> Usos(app, profile, loginStore, taskCallback)
             else -> null
         }
         if (edziennikInterface == null) {

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

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

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.models.Data
+import pl.szczodrzynski.edziennik.data.db.entity.*
+
+/**
+ * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art
+ *
+ * Use https://codepen.io/kubasz/pen/RwwwbGN to easily generate the student data getters/setters
+ */
+class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
+
+    fun isWebLoginValid() = webSessionIdExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty()
+
+    override fun satisfyLoginMethods() {
+        loginMethods.clear()
+        if (isWebLoginValid()) {
+            loginMethods += LOGIN_METHOD_EDUDZIENNIK_WEB
+        }
+    }
+
+    override fun generateUserCode() = "$schoolName:$loginEmail:${studentId?.crc32()}"
+
+    private var mLoginEmail: String? = null
+    var loginEmail: String?
+        get() { mLoginEmail = mLoginEmail ?: loginStore.getLoginData("email", null); return mLoginEmail }
+        set(value) { loginStore.putLoginData("email", value); mLoginEmail = value }
+
+    private var mLoginPassword: String? = null
+    var loginPassword: String?
+        get() { mLoginPassword = mLoginPassword ?: loginStore.getLoginData("password", null); return mLoginPassword }
+        set(value) { loginStore.putLoginData("password", value); mLoginPassword = value }
+
+    private var mStudentId: String? = null
+    var studentId: String?
+        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId }
+        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
+
+    private var mSchoolId: String? = null
+    var schoolId: String?
+        get() { mSchoolId = mSchoolId ?: profile?.getStudentData("schoolId", null); return mSchoolId }
+        set(value) { profile?.putStudentData("schoolId", value) ?: return; mSchoolId = value }
+
+    private var mClassId: String? = null
+    var classId: String?
+        get() { mClassId = mClassId ?: profile?.getStudentData("classId", null); return mClassId }
+        set(value) { profile?.putStudentData("classId", value) ?: return; mClassId = value }
+
+    /*   __          __  _
+         \ \        / / | |
+          \ \  /\  / /__| |__
+           \ \/  \/ / _ \ '_ \
+            \  /\  /  __/ |_) |
+             \/  \/ \___|_._*/
+    private var mWebSessionId: String? = null
+    var webSessionId: String?
+        get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId }
+        set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value }
+
+    private var mWebSessionIdExpiryTime: Long? = null
+    var webSessionIdExpiryTime: Long
+        get() { mWebSessionIdExpiryTime = mWebSessionIdExpiryTime ?: loginStore.getLoginData("webSessionIdExpiryTime", 0L); return mWebSessionIdExpiryTime ?: 0L }
+        set(value) { loginStore.putLoginData("webSessionIdExpiryTime", value); mWebSessionIdExpiryTime = value }
+
+    /*     ____  _   _
+          / __ \| | | |
+         | |  | | |_| |__   ___ _ __
+         | |  | | __| '_ \ / _ \ '__|
+         | |__| | |_| | | |  __/ |
+          \____/ \__|_| |_|\___|*/
+    private var mCurrentSemester: Int? = null
+    var currentSemester: Int
+        get() { mCurrentSemester = mCurrentSemester ?: profile?.getStudentData("currentSemester", 1); return mCurrentSemester ?: 1 }
+        set(value) { profile?.putStudentData("currentSemester", value) ?: return; mCurrentSemester = value }
+
+    private var mSchoolName: String? = null
+    var schoolName: String?
+        get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName }
+        set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value }
+
+    val studentEndpoint: String
+        get() = "Students/$studentId/"
+
+    val schoolEndpoint: String
+        get() = "Schools/$schoolId/"
+
+    val classStudentEndpoint: String
+        get() = "Class/$studentId/"
+
+    val schoolClassEndpoint: String
+        get() = "Schools/$classId/"
+
+    val studentAndClassEndpoint: String
+        get() = "Students/$studentId/Klass/$classId/"
+
+    val studentAndClassesEndpoint: String
+        get() = "Students/$studentId/Classes/$classId/"
+
+    val timetableEndpoint: String
+        get() = "Plan/$studentId/"
+
+    val studentAndTeacherClassEndpoint: String
+        get() = "Students/$studentId/Teachers/$classId/"
+
+    val courseStudentEndpoint: String
+        get() = "Course/$studentId/"
+
+    fun getSubject(longId: String, name: String): Subject {
+        val id = longId.crc32()
+        return subjectList.singleOrNull { it.id == id } ?: run {
+            val subject = Subject(profileId, id, name, name)
+            subjectList.put(id, subject)
+            subject
+        }
+    }
+
+    fun getTeacher(firstName: String, lastName: String, longId: String? = null): Teacher {
+        val name = "$firstName $lastName".fixName()
+        val id = name.crc32()
+        return teacherList.singleOrNull { it.id == id }?.also {
+            if (longId != null && it.loginId == null) it.loginId = longId
+        } ?: run {
+            val teacher = Teacher(profileId, id, firstName, lastName, longId)
+            teacherList.put(id, teacher)
+            teacher
+        }
+    }
+
+    fun getTeacherByFirstLast(nameFirstLast: String, longId: String? = null): Teacher {
+        val nameParts = nameFirstLast.split(" ")
+        return getTeacher(nameParts[0], nameParts[1], longId)
+    }
+
+    fun getTeacherByLastFirst(nameLastFirst: String, longId: String? = null): Teacher {
+        val nameParts = nameLastFirst.split(" ")
+        return getTeacher(nameParts[1], nameParts[0], longId)
+    }
+
+    fun getEventType(longId: String, name: String): EventType {
+        val id = longId.crc16().toLong()
+        return eventTypes.singleOrNull { it.id == id } ?: run {
+            val eventType = EventType(profileId, id, name, colorFromName(name))
+            eventTypes.put(id, eventType)
+            eventType
+        }
+    }
+}

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

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikData
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetAnnouncement
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetHomework
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin.EdudziennikFirstLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLogin
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
+import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
+    companion object {
+        private const val TAG = "Edudziennik"
+    }
+
+    val internalErrorList = mutableListOf<Int>()
+    val data: DataEdudziennik
+    private var afterLogin: (() -> Unit)? = null
+
+    init {
+        data = DataEdudziennik(app, profile, loginStore).apply {
+            callback = wrapCallback(this@Edudziennik.callback)
+            satisfyLoginMethods()
+        }
+    }
+
+    private fun completed() {
+        data.saveData()
+        callback.onCompleted()
+    }
+
+    /*    _______ _                     _                  _ _   _
+         |__   __| |              /\   | |                (_) | | |
+            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
+            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
+            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
+            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
+                                           __/ |
+                                          |__*/
+    override fun sync(featureIds: List<Int>, viewId: Int?, onlyEndpoints: List<Int>?, arguments: JsonObject?) {
+        data.arguments = arguments
+        data.prepare(edudziennikLoginMethods, EdudziennikFeatures, featureIds, viewId, onlyEndpoints)
+        login()
+    }
+
+    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        loginMethodId?.let { data.prepareFor(edudziennikLoginMethods, it) }
+        afterLogin?.let { this.afterLogin = it }
+        EdudziennikLogin(data) {
+            data()
+        }
+    }
+
+    private fun data() {
+        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
+        if (internalErrorList.isNotEmpty()) {
+            d(TAG, "  - Internal errors:")
+            internalErrorList.forEach { d(TAG, "      - code $it") }
+        }
+        afterLogin?.invoke() ?: EdudziennikData(data) {
+            completed()
+        }
+    }
+
+    override fun getMessage(message: MessageFull) {}
+    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {}
+    override fun markAllAnnouncementsAsRead() {}
+
+    override fun getAnnouncement(announcement: AnnouncementFull) {
+        EdudziennikLoginWeb(data) {
+            EdudziennikWebGetAnnouncement(data, announcement) {
+                completed()
+            }
+        }
+    }
+
+    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {}
+    override fun getRecipientList() {}
+
+    override fun getEvent(eventFull: EventFull) {
+        EdudziennikLoginWeb(data) {
+            EdudziennikWebGetHomework(data, eventFull) {
+                completed()
+            }
+        }
+    }
+
+    override fun firstLogin() { EdudziennikFirstLogin(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_EDUDZIENNIK_WEB_SESSION_EXPIRED -> {
+                        login()
+                    }
+                    ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID -> {
+                        login()
+                    }
+                    ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS -> {
+                        data()
+                    }
+                    else -> callback.onError(apiError)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik
+
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.models.Feature
+
+const val ENDPOINT_EDUDZIENNIK_WEB_START                = 1000
+const val ENDPOINT_EDUDZIENNIK_WEB_TEACHERS             = 1001
+const val ENDPOINT_EDUDZIENNIK_WEB_GRADES               = 1011
+const val ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE            = 1012
+const val ENDPOINT_EDUDZIENNIK_WEB_EXAMS                = 1013
+const val ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE           = 1014
+const val ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS        = 1015
+const val ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK             = 1016
+const val ENDPOINT_EDUDZIENNIK_WEB_EVENTS               = 1017
+const val ENDPOINT_EDUDZIENNIK_WEB_NOTES                = 1018
+const val ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER         = 1030
+
+val EdudziennikFeatures = listOf(
+        /* School and team info and subjects */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Teachers */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TEACHERS, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_TEACHERS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Timetable */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TIMETABLE, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Grades */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_GRADES, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_GRADES to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Agenda */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_AGENDA, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_EXAMS to LOGIN_METHOD_EDUDZIENNIK_WEB,
+                ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB,
+                ENDPOINT_EDUDZIENNIK_WEB_EVENTS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Homework */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_HOMEWORK, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Behaviour */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_BEHAVIOUR, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_NOTES to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Attendance */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ATTENDANCE, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Announcements */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)),
+
+        /* Lucky number */
+        Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER to LOGIN_METHOD_EDUDZIENNIK_WEB
+        ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB))
+)

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
+
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.*
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class EdudziennikData(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikData"
+    }
+
+    init {
+        nextEndpoint(onSuccess)
+    }
+
+    private fun nextEndpoint(onSuccess: () -> Unit) {
+        if (data.targetEndpointIds.isEmpty()) {
+            onSuccess()
+            return
+        }
+        if (data.cancelled) {
+            onSuccess()
+            return
+        }
+        val id = data.targetEndpointIds.firstKey()
+        val lastSync = data.targetEndpointIds.remove(id)
+        useEndpoint(id, lastSync) { endpointId ->
+            data.progress(data.progressStep)
+            nextEndpoint(onSuccess)
+        }
+    }
+
+    private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) {
+        Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync")
+        when (endpointId) {
+            ENDPOINT_EDUDZIENNIK_WEB_START -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_data)
+                EdudziennikWebStart(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_TEACHERS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
+                EdudziennikWebTeachers(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                EdudziennikWebGrades(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                EdudziennikWebTimetable(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_EXAMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_exams)
+                EdudziennikWebExams(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                EdudziennikWebAttendance(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
+                EdudziennikWebAnnouncements(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                EdudziennikWebHomework(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_EVENTS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_events)
+                EdudziennikWebEvents(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_NOTES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                EdudziennikWebNotes(data, lastSync, onSuccess)
+            }
+            ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                EdudziennikWebLuckyNumber(data, lastSync, onSuccess)
+            }
+            else -> onSuccess(endpointId)
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Long?) {
+    companion object {
+        private const val TAG = "EdudziennikWeb"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun webGet(tag: String, endpoint: String, xhr: Boolean = false, semester: Int? = null, onSuccess: (text: String) -> Unit) {
+        val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) {
+            true -> endpoint
+            else -> "$endpoint/"
+        } + (semester?.let { "?semester=" + if(it == -1) "all" else it } ?: "")
+
+        d(tag, "Request: Edudziennik/Web - $url")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null || response == null) {
+                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                if (semester == null && url.contains("start")) {
+                    profile?.also { profile ->
+                        val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                        val semesterCookie = cookies["semester"]?.toIntOrNull()
+
+                        semesterCookie?.let { data.currentSemester = it }
+
+                        if (semesterCookie == 2 && profile.dateSemester2Start > Date.getToday())
+                            profile.dateSemester2Start = Date.getToday().stepForward(0, 0, -1)
+                    }
+                }
+
+                try {
+                    onSuccess(text)
+                } catch (e: Exception) {
+                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_WEB_REQUEST)
+                            .withThrowable(e)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                val error = when (response?.code()) {
+                    402 -> ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS
+                    403 -> ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED
+                    else -> ERROR_REQUEST_FAILURE
+                }
+                data.error(ApiError(tag, error)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        data.app.cookieJar.set("dziennikel.appspot.com", "sessionid", data.webSessionId)
+
+        Request.builder()
+                .url(url)
+                .userAgent(EDUDZIENNIK_USER_AGENT)
+                .apply {
+                    if (xhr) header("X-Requested-With", "XMLHttpRequest")
+                }
+                .get()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ANNOUNCEMENT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.Announcement
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebAnnouncements(override val data: DataEdudziennik,
+                                  override val lastSync: Long?,
+                                  val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        const val TAG = "EdudziennikWebAnnouncements"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.schoolClassEndpoint + "Announcements") { text ->
+            val doc = Jsoup.parse(text)
+
+            if (doc.getElementsByClass("message").text().trim() != "Brak ogłoszeń.") {
+                doc.select("table.list tbody tr").forEach { announcementElement ->
+                    val titleElement = announcementElement.child(0).child(0)
+
+                    val longId = EDUDZIENNIK_ANNOUNCEMENT_ID.find(titleElement.attr("href"))?.get(1)
+                            ?: return@forEach
+                    val id = longId.crc32()
+                    val subject = titleElement.text()
+
+                    val teacherName = announcementElement.child(1).text()
+                    val teacher = data.getTeacherByFirstLast(teacherName)
+
+                    val dateString = announcementElement.getElementsByClass("datetime").first().text()
+                    val startDate = Date.fromY_m_d(dateString)
+                    val addedDate = Date.fromIsoHm(dateString)
+
+                    val announcementObject = Announcement(
+                            profileId = profileId,
+                            id = id,
+                            subject = subject,
+                            text = null,
+                            startDate = startDate,
+                            endDate = null,
+                            teacherId = teacher.id,
+                            addedDate = addedDate
+                    ).also {
+                        it.idString = longId
+                    }
+
+                    data.announcementList.add(announcementObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ANNOUNCEMENT,
+                            id,
+                            profile.empty,
+                            profile.empty
+                    ))
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS) }
+}

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

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_ENTRIES
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPE
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.util.*
+
+class EdudziennikWebAttendance(override val data: DataEdudziennik,
+                               override val lastSync: Long?,
+                               val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebAttendance"
+    }
+
+    private var requestSemester: Int? = null
+
+    init {
+        if (profile?.empty == true && data.currentSemester == 2) requestSemester = 1
+        getAttendances()
+    }
+
+    private fun getAttendances() { data.profile?.also { profile ->
+        webGet(TAG, data.studentEndpoint + "Presence", semester = requestSemester) { text ->
+
+            val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map {
+                val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim())
+                val symbol = type?.get(1)?.trim() ?: "?"
+                val name = type?.get(2)?.trim() ?: "nieznany rodzaj"
+                return@map Triple(
+                        symbol,
+                        name,
+                        when (name.toLowerCase(Locale.ROOT)) {
+                            "obecność" -> Attendance.TYPE_PRESENT
+                            "nieobecność" -> Attendance.TYPE_ABSENT
+                            "spóźnienie" -> Attendance.TYPE_BELATED
+                            "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED
+                            "dzień wolny" -> Attendance.TYPE_DAY_FREE
+                            "brak zajęć" -> Attendance.TYPE_DAY_FREE
+                            "oddelegowany" -> Attendance.TYPE_RELEASED
+                            else -> Attendance.TYPE_UNKNOWN
+                        }
+                )
+            } ?: emptyList()
+
+            EDUDZIENNIK_ATTENDANCE_ENTRIES.findAll(text).forEach { attendanceElement ->
+                val date = Date.fromY_m_d(attendanceElement[1])
+                val lessonNumber = attendanceElement[2].toInt()
+                val attendanceSymbol = attendanceElement[3]
+
+                val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
+                val lesson = lessons.firstOrNull { it.lessonNumber == lessonNumber }
+
+                val id = "${date.stringY_m_d}:$lessonNumber:$attendanceSymbol".crc32()
+
+                val (typeSymbol, typeName, baseType) = attendanceTypes.firstOrNull { (symbol, _, _) -> symbol == attendanceSymbol }
+                        ?: return@forEach
+
+                val startTime = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }?.startTime
+                        ?: return@forEach
+
+                val attendanceObject = Attendance(
+                        profileId = profileId,
+                        id = id,
+                        baseType = baseType,
+                        typeName = typeName,
+                        typeShort = data.app.attendanceManager.getTypeShort(baseType),
+                        typeSymbol = typeSymbol,
+                        typeColor = null,
+                        date = date,
+                        startTime = lesson?.displayStartTime ?: startTime,
+                        semester = profile.currentSemester,
+                        teacherId = lesson?.displayTeacherId ?: -1,
+                        subjectId = lesson?.displaySubjectId ?: -1
+                ).also {
+                    it.lessonNumber = lessonNumber
+                }
+
+                data.attendanceList.add(attendanceObject)
+                if (baseType != Attendance.TYPE_PRESENT) {
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            id,
+                            profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN,
+                            profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN
+                    ))
+                }
+            }
+
+            if (profile.empty && requestSemester == 1 && data.currentSemester == 2) {
+                requestSemester = null
+                getAttendances()
+            } else {
+                data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
+                onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE)
+            }
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE) }
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-1
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EVENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebEvents(override val data: DataEdudziennik,
+                           override val lastSync: Long?,
+                           val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        const val TAG = "EdudziennikWebEvents"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.studentAndClassesEndpoint + "KlassEvent", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.getElementsByTag("tr").forEach { eventElement ->
+                val date = Date.fromY_m_d(eventElement.child(1).text())
+
+                val titleElement = eventElement.child(2).child(0)
+                val title = titleElement.text().trim()
+
+                val id = EDUDZIENNIK_EVENT_ID.find(titleElement.attr("href"))?.get(1)?.crc32()
+                        ?: return@forEach
+
+                val eventObject = Event(
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = null,
+                        topic = title,
+                        color = null,
+                        type = Event.TYPE_CLASS_EVENT,
+                        teacherId = -1,
+                        subjectId = -1,
+                        teamId = data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile.empty,
+                        profile.empty
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_CLASS_EVENT))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EVENTS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS) }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_TYPE_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EXAM_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebExams(override val data: DataEdudziennik,
+                          override val lastSync: Long?,
+                          val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        const val TAG = "EdudziennikWebExams"
+    }
+
+    init { profile?.also { profile ->
+        webGet(TAG, data.studentAndClassEndpoint + "Evaluations", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.select("tr").forEach { examElement ->
+                val id = EDUDZIENNIK_EXAM_ID.find(examElement.child(0).child(0).attr("href"))
+                        ?.get(1)?.crc32() ?: return@forEach
+                val topic = examElement.child(0).text().trim()
+
+                val subjectElement = examElement.child(1).child(0)
+                val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                        ?: return@forEach
+                val subjectName  = subjectElement.text().trim()
+                val subject = data.getSubject(subjectId, subjectName)
+
+                val dateString = examElement.child(2).text().trim()
+                if (dateString.isBlank()) return@forEach
+                val date = Date.fromY_m_d(dateString)
+
+                val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
+                val startTime = lessons.firstOrNull { it.displaySubjectId == subject.id }?.displayStartTime
+
+                val eventTypeElement = examElement.child(3).child(0)
+                val eventTypeId = EDUDZIENNIK_EVENT_TYPE_ID.find(eventTypeElement.attr("href"))?.get(1)
+                        ?: return@forEach
+                val eventTypeName = eventTypeElement.text()
+                val eventType = data.getEventType(eventTypeId, eventTypeName)
+
+                val eventObject = Event(
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = eventType.id,
+                        teacherId = -1,
+                        subjectId = subject.id,
+                        teamId = data.teamClass?.id ?: -1
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile.empty,
+                        profile.empty
+                ))
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf(
+                    Event.TYPE_HOMEWORK,
+                    Event.TYPE_CLASS_EVENT
+            )))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EXAMS)
+        }
+    }}
+}

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebGetAnnouncement(override val data: DataEdudziennik,
+                                    private val announcement: AnnouncementFull,
+                                    val onSuccess: () -> Unit
+) : EdudziennikWeb(data, null) {
+    companion object {
+        const val TAG = "EdudziennikWebGetAnnouncement"
+    }
+
+    init {
+        webGet(TAG, "Announcement/${announcement.idString}") { text ->
+            val description = Regexes.EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION.find(text)?.get(1)?.trim() ?: ""
+
+            announcement.text = description
+
+            EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement))
+
+            data.announcementList.add(announcement)
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.text.Html
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class EdudziennikWebGetHomework(
+        override val data: DataEdudziennik,
+        val event: EventFull,
+        val onSuccess: () -> Unit
+) : EdudziennikWeb(data, null) {
+    companion object {
+        const val TAG = "EdudziennikWebGetHomework"
+    }
+
+    init {
+        if (event.attachmentNames.isNotNullNorEmpty()) {
+            val id = event.attachmentNames!![0]
+
+            webGet(TAG, "Homework/$id") { text ->
+                val description = Regexes.EDUDZIENNIK_HOMEWORK_DESCRIPTION.find(text)?.get(1)?.trim()
+
+                if (description != null) event.topic = Html.fromHtml(description).toString()
+
+                event.homeworkBody = ""
+                event.attachmentNames = null
+
+                data.eventList += event
+                data.eventListReplace = true
+
+                EventBus.getDefault().postSticky(EventGetEvent(event))
+                onSuccess()
+            }
+        } else {
+            EventBus.getDefault().postSticky(EventGetEvent(event))
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.graphics.Color
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.colorFromCssName
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebGrades(override val data: DataEdudziennik,
+                           override val lastSync: Long?,
+                           val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebGrades"
+    }
+
+    private var requestSemester: Int? = null
+
+    init {
+        if (profile?.empty == true && data.currentSemester == 2) requestSemester = 1
+        getGrades()
+    }
+
+    private fun getGrades() { data.profile?.also { profile ->
+        webGet(TAG, data.studentEndpoint + "start", semester = requestSemester) { text ->
+            val semester = requestSemester ?: data.currentSemester
+
+            val doc = Jsoup.parse(text)
+            val subjects = doc.select("#student_grades tbody").firstOrNull()?.children()
+
+            subjects?.forEach { subjectElement ->
+                if (subjectElement.id().isBlank()) return@forEach
+
+                val subjectId = subjectElement.id().trim()
+                val subjectName = subjectElement.child(0).text().trim()
+                val subject = data.getSubject(subjectId, subjectName)
+
+                val gradeType = when {
+                    subjectElement.select("#sum").text().isNotBlank() -> TYPE_POINT_SUM
+                    else -> TYPE_NORMAL
+                }
+
+                val gradeCountToAverage = subjectElement.select("#avg").text().isNotBlank()
+
+                val grades = subjectElement.select(".grade[data-edited]")
+                val gradesInfo = subjectElement.select(".grade-tip")
+
+                val gradeValues = if (grades.isNotEmpty()) {
+                    subjects.select(".avg-$subjectId .grade-tip > p").first()
+                            .text().split('+').map {
+                                val split = it.split('*')
+                                val value = split[1].trim().toFloatOrNull()
+                                val weight = value?.let { split[0].trim().toFloatOrNull() } ?: 0f
+
+                                Pair(value ?: 0f, weight)
+                            }
+                } else emptyList()
+
+                grades.forEachIndexed { index, gradeElement ->
+                    val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
+                            ?: return@forEachIndexed
+                    val (value, weight) = gradeValues[index]
+                    val name = gradeElement.text().trim().let {
+                        if (it.contains(',') || it.contains('.')) {
+                            val replaced = it.replace(',', '.')
+                            val float = replaced.toFloatOrNull()
+
+                            if (float != null && float % 1 == 0f) float.toInt().toString()
+                            else it
+                        } else it
+                    }
+
+                    val info = gradesInfo[index]
+                    val fullName = info.child(0).text().trim()
+                    val columnName = info.child(4).text().trim()
+                    val comment = info.ownText()
+
+                    val description = columnName + if (comment.isNotBlank()) " - $comment" else null
+
+                    val teacherName = info.child(1).text()
+                    val teacher = data.getTeacherByLastFirst(teacherName)
+
+                    val addedDate = info.child(2).text().split(' ').let {
+                        val day = it[0].toInt()
+                        val month = Utils.monthFromName(it[1])
+                        val year = it[2].toInt()
+
+                        Date(year, month, day).inMillis
+                    }
+
+                    val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let {
+                        if (it.startsWith('#')) Color.parseColor(it)
+                        else colorFromCssName(it)
+                    } ?: -1
+
+                    val gradeObject = Grade(
+                            profileId = profileId,
+                            id = id,
+                            name = name,
+                            type = gradeType,
+                            value = value,
+                            weight = if (gradeCountToAverage) weight else 0f,
+                            color = color,
+                            category = fullName,
+                            description = description,
+                            comment = null,
+                            semester = semester,
+                            teacherId = teacher.id,
+                            subjectId = subject.id,
+                            addedDate = addedDate
+                    )
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            profile.empty,
+                            profile.empty
+                    ))
+                }
+
+                val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim()
+
+                if (proposed != null && proposed.isNotBlank()) {
+                    val proposedGradeObject = Grade(
+                            profileId = profileId,
+                            id = (-1 * subject.id) - 1,
+                            name = proposed,
+                            type = when (semester) {
+                                1 -> TYPE_SEMESTER1_PROPOSED
+                                else -> TYPE_SEMESTER2_PROPOSED
+                            },
+                            value = proposed.toFloatOrNull() ?: 0f,
+                            weight = 0f,
+                            color = -1,
+                            category = null,
+                            description = null,
+                            comment = null,
+                            semester = semester,
+                            teacherId = -1,
+                            subjectId = subject.id
+                    )
+
+                    data.gradeList.add(proposedGradeObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            proposedGradeObject.id,
+                            profile.empty,
+                            profile.empty
+                    ))
+                }
+
+                val final = subjectElement.select(".final").firstOrNull()?.text()?.trim()
+
+                if (final != null && final.isNotBlank()) {
+                    val finalGradeObject = Grade(
+                            profileId = profileId,
+                            id = (-1 * subject.id) - 2,
+                            name = final,
+                            type = when (semester) {
+                                1 -> TYPE_SEMESTER1_FINAL
+                                else -> TYPE_SEMESTER2_FINAL
+                            },
+                            value = final.toFloatOrNull() ?: 0f,
+                            weight = 0f,
+                            color = -1,
+                            category = null,
+                            description = null,
+                            comment = null,
+                            semester = semester,
+                            teacherId = -1,
+                            subjectId = subject.id
+                    )
+
+                    data.gradeList.add(finalGradeObject)
+                    data.metadataList.add(Metadata(
+                            data.profileId,
+                            Metadata.TYPE_GRADE,
+                            finalGradeObject.id,
+                            profile.empty,
+                            profile.empty
+                    ))
+                }
+            }
+
+            if (!subjects.isNullOrEmpty()) {
+                data.toRemove.addAll(listOf(
+                        TYPE_NORMAL,
+                        TYPE_POINT_SUM,
+                        TYPE_SEMESTER1_PROPOSED,
+                        TYPE_SEMESTER2_PROPOSED,
+                        TYPE_SEMESTER1_FINAL,
+                        TYPE_SEMESTER2_FINAL
+                ).map {
+                    DataRemoveModel.Grades.semesterWithType(semester, it)
+                })
+            }
+
+            if (profile.empty && requestSemester == 1 && data.currentSemester == 2) {
+                requestSemester = null
+                getGrades()
+            } else {
+                data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
+                onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES)
+            }
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES) }
+}

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_HOMEWORK_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebHomework(override val data: DataEdudziennik,
+                             override val lastSync: Long?,
+                             val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        const val TAG = "EdudziennikWebHomework"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.courseStudentEndpoint + "Homework", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") {
+                doc.getElementsByTag("tr").forEach { homeworkElement ->
+                    val dateElement = homeworkElement.getElementsByClass("date").first().child(0)
+                    val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach
+                    val id = idStr.crc32()
+                    val date = Date.fromY_m_d(dateElement.text())
+
+                    val subjectElement = homeworkElement.child(1).child(0)
+                    val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                            ?: return@forEach
+                    val subjectName = subjectElement.text()
+                    val subject = data.getSubject(subjectId, subjectName)
+
+                    val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
+                    val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime
+
+                    val teacherName = homeworkElement.child(2).text()
+                    val teacher = data.getTeacherByFirstLast(teacherName)
+
+                    val topic = homeworkElement.child(4).text()?.trim()
+
+                    val eventObject = Event(
+                            profileId = profileId,
+                            id = id,
+                            date = date,
+                            time = startTime,
+                            topic = topic ?: "",
+                            color = null,
+                            type = Event.TYPE_HOMEWORK,
+                            teacherId = teacher.id,
+                            subjectId = subject.id,
+                            teamId = data.teamClass?.id ?: -1
+                    )
+
+                    eventObject.attachmentNames = mutableListOf(idStr)
+
+                    data.eventList.add(eventObject)
+                    data.metadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_HOMEWORK,
+                            id,
+                            profile.empty,
+                            profile.empty
+                    ))
+                }
+            }
+
+            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK) }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
+                                override val lastSync: Long?,
+                                val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebLuckyNumber"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text ->
+            text.toIntOrNull()?.also { luckyNumber ->
+                val luckyNumberObject = LuckyNumber(
+                        profileId = profileId,
+                        date = Date.getToday(),
+                        number = luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_LUCKY_NUMBER,
+                        luckyNumberObject.date.value.toLong(),
+                        true,
+                        profile.empty
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER) }
+}

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-1
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebNotes(override val data: DataEdudziennik,
+                          override val lastSync: Long?,
+                          val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        const val TAG = "EdudziennikWebNotes"
+    }
+
+    init { data.profile?.also { profile ->
+        webGet(TAG, data.classStudentEndpoint + "RegistryNotesStudent", xhr = true) { text ->
+            val doc = Jsoup.parseBodyFragment("<table>" + text.trim() + "</table>")
+
+            doc.getElementsByTag("tr").forEach { noteElement ->
+                val dateElement = noteElement.getElementsByClass("date").first().child(0)
+                val addedDate = Date.fromY_m_d(dateElement.text()).inMillis
+
+                val id = EDUDZIENNIK_NOTE_ID.find(dateElement.attr("href"))?.get(0)?.crc32()
+                        ?: return@forEach
+
+                val teacherName = noteElement.child(1).text()
+                val teacher = data.getTeacherByFirstLast(teacherName)
+
+                val description = noteElement.child(3).text()
+
+                val noticeObject = Notice(
+                        profileId = profileId,
+                        id = id,
+                        type = Notice.TYPE_NEUTRAL,
+                        semester = profile.currentSemester,
+                        text = description,
+                        category = null,
+                        points = null,
+                        teacherId = teacher.id,
+                        addedDate = addedDate
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        id,
+                        profile.empty,
+                        profile.empty
+                ))
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_NOTES, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES) }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECTS_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.firstLettersName
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebStart(override val data: DataEdudziennik,
+                          override val lastSync: Long?,
+                          val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebStart"
+    }
+
+    init {
+        webGet(TAG, data.studentEndpoint + "start") { text ->
+            getSchoolAndTeam(text)
+            getSubjects(text)
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, MONTH)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_START)
+        }
+    }
+
+    private fun getSchoolAndTeam(text: String) {
+        val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim()
+        val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.schoolId = schoolId
+
+        val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim()
+        val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim()
+        data.classId = classId
+
+        if (classId == null || className == null || schoolId == null || schoolLongName == null) {
+            data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING)
+                    .withApiResponse(text))
+            return
+        }
+
+        val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu"
+        data.schoolName = schoolName
+
+        val teamId = classId.crc32()
+        val teamCode = "$schoolName:$className"
+
+        val teamObject = Team(
+                data.profileId,
+                teamId,
+                className,
+                Team.TYPE_CLASS,
+                teamCode,
+                -1
+        )
+
+        data.teamClass = teamObject
+        data.teamList.put(teamObject.id, teamObject)
+    }
+
+    private fun getSubjects(text: String) {
+        EDUDZIENNIK_SUBJECTS_START.findAll(text).forEach {
+            val id = it[1].trim()
+            val name = it[2].trim()
+            data.getSubject(id, name)
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebTeachers(override val data: DataEdudziennik,
+                             override val lastSync: Long?,
+                             val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebTeachers"
+    }
+
+    init {
+        webGet(TAG, data.studentAndTeacherClassEndpoint + "grid") { text ->
+            EDUDZIENNIK_TEACHERS.findAll(text).forEach {
+                val lastName = it[1].trim()
+                val firstName = it[2].trim()
+                data.getTeacher(firstName, lastName)
+            }
+
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS, MONTH)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS)
+        }
+    }
+}

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

@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class EdudziennikWebTimetable(override val data: DataEdudziennik,
+                              override val lastSync: Long?,
+                              val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+    companion object {
+        private const val TAG = "EdudziennikWebTimetable"
+    }
+
+    init { data.profile?.also { profile ->
+
+        val currentWeekStart = Week.getWeekStart()
+
+        if (Date.getToday().weekDay > 4) {
+            currentWeekStart.stepForward(0, 0, 7)
+        }
+
+        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+        val weekStart = Date.fromY_m_d(getDate)
+        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+        webGet(TAG, data.timetableEndpoint + "print?date=$getDate") { text ->
+            val doc = Jsoup.parse(text)
+
+            val dataDays = mutableListOf<Int>()
+            val dataStart = weekStart.clone()
+            while (dataStart <= weekEnd) {
+                dataDays += dataStart.value
+                dataStart.stepForward(0, 0, 1)
+            }
+
+            val table = doc.select("#Schedule tbody").first()
+
+            if (!table.text().contains("Brak planu lekcji.")) {
+                table.children().forEach { row ->
+                    val rowElements = row.children()
+
+                    val lessonNumber = rowElements[0].text().toInt()
+
+                    val times = rowElements[1].text().split('-')
+                    val startTime = Time.fromH_m(times[0].trim())
+                    val endTime = Time.fromH_m(times[1].trim())
+
+                    data.lessonRanges.singleOrNull {
+                        it.lessonNumber == lessonNumber && it.startTime == startTime && it.endTime == endTime
+                    } ?: run {
+                        data.lessonRanges.put(lessonNumber, LessonRange(profileId, lessonNumber, startTime, endTime))
+                    }
+
+                    rowElements.subList(2, rowElements.size).forEachIndexed { index, lesson ->
+                        val course = lesson.select(".course").firstOrNull() ?: return@forEachIndexed
+                        val info = course.select("span > span")
+
+                        if (info.isEmpty()) return@forEachIndexed
+
+                        val type = when (course.hasClass("substitute")) {
+                            true -> Lesson.TYPE_CHANGE
+                            else -> Lesson.TYPE_NORMAL
+                        }
+
+                        /* Getting subject */
+
+                        val subjectElement = info[0].child(0)
+                        val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+                                ?: return@forEachIndexed
+                        val subjectName = subjectElement.text().trim()
+                        val subject = data.getSubject(subjectId, subjectName)
+
+                        /* Getting teacher */
+
+                        val teacherId = if (info.size >= 2) {
+                            val teacherElement = info[1].child(0)
+                            val teacherLongId = EDUDZIENNIK_TEACHER_ID.find(teacherElement.attr("href"))?.get(1)
+                            val teacherName = teacherElement.text().trim()
+                            data.getTeacherByLastFirst(teacherName, teacherLongId).id
+                        } else null
+
+                        val lessonObject = Lesson(profileId, -1).also {
+                            it.type = type
+                            it.date = weekStart.clone().stepForward(0, 0, index)
+                            it.lessonNumber = lessonNumber
+                            it.startTime = startTime
+                            it.endTime = endTime
+                            it.subjectId = subject.id
+                            it.teacherId = teacherId
+                            it.teamId = data.teamClass?.id
+
+                            it.id = it.buildId()
+                        }
+
+                        data.lessonList.add(lessonObject)
+                        dataDays.remove(lessonObject.date!!.value)
+
+                        if (type != Lesson.TYPE_NORMAL) {
+                            val seen = profile.empty || lessonObject.date!! < Date.getToday()
+
+                            data.metadataList.add(Metadata(
+                                    profileId,
+                                    Metadata.TYPE_LESSON_CHANGE,
+                                    lessonObject.id,
+                                    seen,
+                                    seen
+                            ))
+                        }
+                    }
+                }
+            }
+
+            for (day in dataDays) {
+                val lessonDate = Date.fromValue(day)
+                data.lessonList += Lesson(profileId, lessonDate.value.toLong()).apply {
+                    type = Lesson.TYPE_NO_LESSONS
+                    date = lessonDate
+                }
+            }
+
+            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
+
+            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+            data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE)
+        }
+    } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE) }
+}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ACCOUNT_NAME_START
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_STUDENTS_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
+import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getShortName
+import pl.szczodrzynski.edziennik.set
+
+class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikFirstLogin"
+    }
+
+    private val web = EdudziennikWeb(data, null)
+    private val profileList = mutableListOf<Profile>()
+
+    init {
+        val loginStoreId = data.loginStore.id
+        val loginStoreType = LOGIN_TYPE_EDUDZIENNIK
+        var firstProfileId = loginStoreId
+
+        EdudziennikLoginWeb(data) {
+            web.webGet(TAG, "") { text ->
+                val accountNameLong = EDUDZIENNIK_ACCOUNT_NAME_START.find(text)?.get(1)?.fixName()
+
+                EDUDZIENNIK_STUDENTS_START.findAll(text).forEach {
+                    val studentId = it[1]
+                    val studentNameLong = it[2].fixName()
+
+                    if (studentId.isBlank() || studentNameLong.isBlank()) return@forEach
+
+                    val studentNameShort = studentNameLong.getShortName()
+                    val accountName = if (accountNameLong == studentNameLong) null else accountNameLong
+
+                    val profile = Profile(
+                            firstProfileId++,
+                            loginStoreId,
+                            loginStoreType,
+                            studentNameLong,
+                            data.loginEmail,
+                            studentNameLong,
+                            studentNameShort,
+                            accountName
+                    ).apply {
+                        studentData["studentId"] = studentId
+                    }
+                    profileList.add(profile)
+                }
+
+                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
+                onSuccess()
+            }
+        }
+    }
+}

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

@@ -1,17 +1,17 @@
 /*
- * Copyright (c) Kuba Szczodrzyński 2022-10-11.
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
  */
 
-package pl.szczodrzynski.edziennik.data.api.edziennik.usos.login
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login
 
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_USOS_API
-import pl.szczodrzynski.edziennik.data.api.edziennik.usos.DataUsos
-import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.utils.Utils
 
-class UsosLogin(val data: DataUsos, val onSuccess: () -> Unit) {
+class EdudziennikLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) {
     companion object {
-        private const val TAG = "UsosLogin"
+        private const val TAG = "EdudziennikLogin"
     }
 
     private var cancelled = false
@@ -43,11 +43,11 @@ class UsosLogin(val data: DataUsos, val onSuccess: () -> Unit) {
             onSuccess(-1)
             return
         }
-        d(TAG, "Using login method $loginMethodId")
+        Utils.d(TAG, "Using login method $loginMethodId")
         when (loginMethodId) {
-            LOGIN_METHOD_USOS_API -> {
-                data.startProgress(R.string.edziennik_progress_login_usos_api)
-                UsosLoginApi(data) { onSuccess(loginMethodId) }
+            LOGIN_METHOD_EDUDZIENNIK_WEB -> {
+                data.startProgress(R.string.edziennik_progress_login_edudziennik_web)
+                EdudziennikLoginWeb(data) { onSuccess(loginMethodId) }
             }
         }
     }

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login
+
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.callback.TextCallbackHandler
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.getUnixDate
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+import pl.szczodrzynski.edziennik.utils.Utils.d
+
+class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "EdudziennikLoginWeb"
+    }
+
+    init { run {
+        if (data.isWebLoginValid()) {
+            onSuccess()
+        }
+        else {
+            data.app.cookieJar.clear("dziennikel.appspot.com")
+            if (data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
+                loginWithCredentials()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun loginWithCredentials() {
+        d(TAG, "Request: Edudziennik/Login/Web - https://dziennikel.appspot.com/login/?next=/")
+
+        val callback = object : TextCallbackHandler() {
+            override fun onSuccess(text: String?, response: Response?) {
+                if (text == null || response == null) {
+                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response))
+                    return
+                }
+
+                val url = response.raw().request().url().toString()
+
+                if (!url.contains("Student")) {
+                    when {
+                        text.contains("Wprowadzono nieprawidłową nazwę użytkownika lub hasło.") -> ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN
+                        else -> ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER
+                    }.let { errorCode ->
+                        data.error(ApiError(TAG, errorCode)
+                                .withApiResponse(text)
+                                .withResponse(response))
+                        return
+                    }
+                }
+
+                val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                val sessionId = cookies["sessionid"]
+
+                if (sessionId == null) {
+                    data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID)
+                            .withResponse(response)
+                            .withApiResponse(text))
+                    return
+                }
+
+                data.webSessionId = sessionId
+                data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45 min */
+                onSuccess()
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable))
+            }
+        }
+
+        Request.builder()
+                .url("https://dziennikel.appspot.com/login/?next=/")
+                .userAgent(EDUDZIENNIK_USER_AGENT)
+                .contentType("application/x-www-form-urlencoded")
+                .addParameter("email", data.loginEmail)
+                .addParameter("password", data.loginPassword)
+                .addParameter("auth_method", "password")
+                .addParameter("next", "/")
+                .post()
+                .callback(callback)
+                .build()
+                .enqueue()
+    }
+}

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

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

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

@@ -16,7 +16,6 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
-import pl.szczodrzynski.edziennik.data.api.events.UserActionRequiredEvent
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -163,7 +162,6 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
         return object : EdziennikCallback {
             override fun onCompleted() { callback.onCompleted() }
-            override fun onRequiresUserAction(event: UserActionRequiredEvent) { callback.onRequiresUserAction(event) }
             override fun onProgress(step: Float) { callback.onProgress(step) }
             override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
             override fun onError(apiError: ApiError) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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