Merge branch 'develop-v4'

Author: kuba2k2

app/build.gradle

@@ -10,6 +10,8 @@ apply from: 'git-info.gradle'
 android {
     compileSdkVersion setup.compileSdk
 
+    namespace 'pl.szczodrzynski.edziennik'
+
     defaultConfig {
         applicationId 'pl.szczodrzynski.edziennik'
         minSdkVersion setup.minSdk

app/git-info.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "org.eclipse.jgit:org.eclipse.jgit:5.5.+"
+        classpath "org.eclipse.jgit:org.eclipse.jgit:7.4.+"
     }
 }
 

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

@@ -1,4 +1,4 @@
-<h3>Wersja 4.15, 2025-11-25</h3>
+<h3>Wersja 4.15.1, 2025-11-25</h3>
 <ul>
     <li>USOS: <b>dodano obsługę egzaminów</b>.</li>
     <li>Dodano opcję blokowania i konfiguracji kart na stronie głównej.</li>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xa3, 0x7e, 0xe4, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0xc3, 0x64, 0xb3, 0xc7, 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/MainActivity.kt

@@ -13,12 +13,16 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.Gravity
 import android.view.View
+import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.navigation.NavOptions
 import com.danimahardhika.cafebar.CafeBar
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -146,6 +150,19 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         setContentView(b.root)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            ViewCompat.setOnApplyWindowInsetsListener(b.rootFrame) { view: View, insets: WindowInsetsCompat ->
+                val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(bars.left, bars.top, bars.right, 0)
+                b.navView.bottomSheet.setPadding(0, 0, 0, bars.bottom)
+                b.swipeRefreshLayout.setPadding(0, 0, 0, bars.bottom)
+                b.nightlyText.updateLayoutParams<FrameLayout.LayoutParams> {
+                    this.bottomMargin = 8.dp + bars.bottom
+                }
+                insets
+            }
+        }
+
         mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 

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

@@ -424,6 +424,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
             HebeFilterType.BY_MESSAGEBOX -> {
                 query["box"] = messageBox ?: data.messageBoxKey ?: ""
             }
+            else -> {}
         }
 
         if (dateFrom != null)

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

@@ -25,7 +25,7 @@ object Signing {
         with(context) {
         try {
             val packageInfo: PackageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
-            for (signature in packageInfo.signatures) {
+            for (signature in packageInfo.signatures ?: arrayOf()) {
                 val signatureBytes = signature.toByteArray()
                 val md = MessageDigest.getInstance("SHA")
                 md.update(signatureBytes)
@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MD6Qm2vQ4e===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDkUJ74VXs===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt

@@ -28,9 +28,6 @@ interface ProfileDao {
     @Query("SELECT * FROM profiles WHERE profileId = :profileId")
     fun getByIdNow(profileId: Int): Profile?
 
-    @Query("SELECT * FROM profiles WHERE profileId = :profileId")
-    suspend fun getByIdSuspend(profileId: Int): Profile?
-
     @get:Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId")
     val all: LiveData<List<Profile>>
 

app/src/main/java/pl/szczodrzynski/edziennik/ext/EnumExtensions.kt

@@ -49,7 +49,7 @@ inline fun <reified E : Enum<E>> Int.toEnum() = when (E::class.java) {
     else -> enumValues<E>()[this]
 } as E
 
-fun <E : Enum<E>> Int.toEnum(type: Class<*>) = when (type) {
+fun <E : Enum<E>> Int.toEnum(type: Class<*>): Enum<E> = when (type) {
     // this is used for Config so all enums are here
     FeatureType::class.java -> this.asFeatureType()
     LoginMethod::class.java -> this.asLoginMethod()

app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt

@@ -21,7 +21,7 @@ import java.io.StringWriter
 
 fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
     observe(lifecycleOwner, object : Observer<T> {
-        override fun onChanged(t: T?) {
+        override fun onChanged(t: T) {
             observer.onChanged(t)
             removeObserver(this)
         }