[3.2.2] Update build.gradle and changelog. Update Librus Client ID and user agent.

Update gradle. Add Chucker.
Update .gitignore
2025-06-18 08:12:44 +02:00 · 2020-02-24 16:55:24 +01:00 · 2020-01-10 09:30:02 +01:00 · 2020-01-09 21:14:08 +01:00
7 changed files with 32 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -47,6 +47,7 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/copyright/profiles_settings.xml

 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@ -80,3 +81,9 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+app/schemas/
+
+signatures/
+
+app/.cxx
--- a/app/build.gradle
+++ b/app/build.gradle
@ -152,6 +152,9 @@ dependencies {
    implementation project(":nachos")
    //implementation project(":Navigation")
    implementation project(":szkolny-font")
+
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
 }
 repositories {
    mavenCentral()
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@ -31,6 +31,13 @@
 </head>
 <body>

+<h3>Wersja 3.2.2, 2020-02-24</h3>
+<ul>
+    <li>Naprawiłem synchronizację oraz logowanie w Librusie.</li>
+    <li><i>Dostępna jest wersja testowa aplikacji 4.0-beta. Można ją pobrać w Google Play, dołączając do programu wersji beta (na dole strony).</i></li>
+    <li>Nowa wersja testowa zawiera m.in. takie funkcje jak wysyłanie wiadomości, nowy plan lekcji czy przebudowany moduł synchronizacji i interfejs.</li>
+</ul>
+
 <h3>Wersja 3.2.1, 2019-12-10</h3>
 <ul>
    <li>Poprawa synchronizacji w Mobidzienniku.</li>
@ -109,4 +116,4 @@
    </ul>
 </i>-->

-</body>
+</body>
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@ -20,6 +20,9 @@ import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;

+import com.chuckerteam.chucker.api.ChuckerCollector;
+import com.chuckerteam.chucker.api.ChuckerInterceptor;
+import com.chuckerteam.chucker.api.RetentionManager;
 import com.evernote.android.job.JobManager;
 import com.google.android.gms.security.ProviderInstaller;
 import com.google.firebase.FirebaseApp;
@ -254,6 +257,12 @@ public class App extends androidx.multidex.MultiDexApplication {
            }
        }

+        if (App.devMode || BuildConfig.DEBUG) {
+            ChuckerCollector chuckerCollector = new ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR);
+            ChuckerInterceptor chuckerInterceptor = new ChuckerInterceptor(this, chuckerCollector);
+            httpBuilder.addInterceptor(chuckerInterceptor);
+        }
+
        http = httpBuilder.build();
        httpLazy = http.newBuilder().followRedirects(false).followSslRedirects(false).build();

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Librus.java
@ -139,7 +139,7 @@ public class Librus implements EdziennikInterface {
    }

    private static final String TAG = "api.Librus";
-    private static final String CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv";
+    private static final String CLIENT_ID = "6XPsKf10LPz1nxgHQLcvZ1KM48DYzlBAhxipaXY8";
    private static final String REDIRECT_URL = "http://localhost/bar";
    private static final String AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id="+CLIENT_ID+"&redirect_uri="+REDIRECT_URL+"&response_type=code";
    private static final String LOGIN_URL = "https://portal.librus.pl/rodzina/login/action";
@ -149,7 +149,7 @@ public class Librus implements EdziennikInterface {
    private static final String API_URL = "https://api.librus.pl/2.0/";
    private static final String SYNERGIA_URL = "https://wiadomosci.librus.pl/module/";
    private static final String SYNERGIA_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action=";
-    private static final String userAgent = "Dalvik/2.1.0 Android LibrusMobileApp";
+    private static final String userAgent = System.getProperty("http.agent")+"LibrusMobileApp";
    private static final String synergiaUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0";

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

        release = [
-                versionName: "3.2.1",
-                versionCode: 3020199
+                versionName: "3.2.2",
+                versionCode: 3020299
        ]

        setup = [
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-all.zip
Author	SHA1	Message	Date
Kuba Szczodrzyński	3c8afb0609	[3.2.2] Update build.gradle and changelog. Update Librus Client ID and user agent.	2020-02-24 16:55:24 +01:00
Kuba Szczodrzyński	27f9b8a04e	Update gradle. Add Chucker.	2020-01-10 09:30:02 +01:00
Kuba Szczodrzyński	86669a491a	Update .gitignore	2020-01-09 21:14:08 +01:00