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

.github/utils/bump_nightly.py

@@ -26,7 +26,7 @@ if __name__ == "__main__":
         exit(-1)
 
     with requests.get(
-        f"https://api.github.com/repos/{repo}/actions/runs?per_page=1&status=success"
+        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]

.github/utils/extract_changelogs.py

@@ -21,10 +21,8 @@ if __name__ == "__main__":
     print("::set-output name=changelogDir::" + dir)
 
     (title, changelog) = get_changelog(project_dir, format="plain")
-    with open(dir + "whatsnew-pl-PL", "w", encoding="utf-8") as f:
-        f.write(changelog)
-    print("::set-output name=changelogPlainFile::" + dir + "whatsnew-pl-PL")
 
+    # plain text changelog - Firebase App Distribution
     with open(dir + "whatsnew-titled.txt", "w", encoding="utf-8") as f:
         f.write(title)
         f.write("\n")
@@ -33,16 +31,31 @@ if __name__ == "__main__":
 
     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)

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

@@ -46,7 +46,7 @@ jobs:
     runs-on: self-hosted
     needs:
       - prepare
-    if: needs.prepare.outputs.hasNewChanges
+    if: ${{ needs.prepare.outputs.hasNewChanges == 'true' }}
     outputs:
       androidHome: ${{ env.ANDROID_HOME }}
       androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }}

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

@@ -1,8 +1,8 @@
-<h3>Wersja 4.7-rc.2, 2021-04-05</h3>
+<h3>Wersja 4.7, 2021-04-07</h3>
 <ul>
     <li><u>Szkolny.eu jest teraz open source!</u> Zapraszamy na stronę <a href="https://szkolny.eu/">https://szkolny.eu/</a> 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>Zaktualizowano tłumaczenie na język angielski. @MarcinK50</li>
+    <li>Ukończono tłumaczenie na język angielski. @MarcinK50</li>
     <li>Dodano ekran informacji o kompilacji w Ustawieniach.</li>
     <li>Zaktualizowano ekran licencji open source.</li>
     <li>Naprawiono zatrzymanie aplikacji na Androidzie 4.4 i starszych.</li>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x25, 0x68, 0xd4, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0xda, 0x9f, 0xd4, 0x2b, 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/data/api/szkolny/interceptor/ApiCacheInterceptor.kt

@@ -15,6 +15,7 @@ class ApiCacheInterceptor(val app: App) : Interceptor {
         val request = chain.request()
         if (request.url().host() == "api.szkolny.eu"
             && Signing.appCertificate.md5() == app.config.apiInvalidCert
+            && !app.buildManager.isSigned
         ) {
             val response = ApiResponse<Unit>(
                 success = false,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt

@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MD+7y77uUm===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDLPrcQX7M===.$param2".sha256()
     }
 }

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

@@ -33,6 +33,7 @@ import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity
 import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
+import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
 
 class LoginChooserFragment : Fragment(), CoroutineScope {
@@ -65,6 +66,15 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         if (!isAdded) return
 
+        b.versionText.setText(
+            R.string.login_chooser_version_format,
+            app.buildManager.versionName,
+            Date.fromMillis(app.buildManager.buildTimestamp).stringY_m_d
+        )
+        b.versionText.onClick {
+            app.buildManager.showVersionDialog(activity)
+        }
+
         val adapter = LoginChooserAdapter(activity, this::onLoginModeClicked)
 
         LoginInfo.chooserList = LoginInfo.chooserList

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

@@ -72,10 +72,16 @@
                 android:text="@string/cancel"
                 android:textAllCaps="false" />
 
-            <Space
+            <TextView
+                android:id="@+id/versionText"
                 android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="?selectableItemBackgroundBorderless"
+                android:gravity="center"
+                android:textAppearance="@style/NavView.TextView.Small"
+                android:textSize="12sp"
+                tools:text="Szkolny.eu v4.7-rc.2\n2021-04-06" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"

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

@@ -1333,7 +1333,7 @@
     <string name="attendance_config_use_symbols_hint">Visible when the list is expanded</string>
     <string name="attendance_config_show_presence_in_month">Display attendance in months view</string>
     <string name="attendance_percentage_format">%.2f%%</string>
-    <string name="attendance_period_summary_format">Attendance during this period: %.2%%</string>
+    <string name="attendance_period_summary_format">Attendance during this period: %.2f%%</string>
     <string name="settings_add_student_subtext">Log in child/parent account in app</string>
     <string name="login_mode_edudziennik_web_guide">Enter the e-mail address and password that you use to log in to the browser on the EduDziennik website.</string>
     <string name="profile_year_not_started_format">Probably the school year for this student has not yet started (will start %s). Please try to sync later.</string>

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

@@ -1424,4 +1424,5 @@
     <string name="build_date">Data kompilacji</string>
     <string name="permissions_generate_timetable">Aby móc zapisać wygenerowany plan lekcji musisz przyznać uprawnienia dostępu do pamięci urządzenia.\n\nKliknij OK, aby przyznać uprawnienia.</string>
     <string name="privacy_policy_dialog_html"><![CDATA[Korzystając z aplikacji potwierdzasz <a href="https://szkolny.eu/privacy-policy">przeczytanie Polityki prywatności</a> i akceptujesz jej postanowienia.<br /><br />Autorzy aplikacji nie biorą odpowiedzialności za korzystanie z aplikacji Szkolny.eu.]]></string>
+    <string name="login_chooser_version_format">Szkolny.eu v%s\n%s</string>
 </resources>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.4.31'
 
         release = [
-                versionName: "4.7-rc.2",
-                versionCode: 4070020
+                versionName: "4.7",
+                versionCode: 4070099
         ]
 
         setup = [