Compare commits

...

43 Commits

Author SHA1 Message Date
240216d6ec Merge branch 'develop-v4'
Some checks failed
Push (master) / Build for Google Play (AAB) (push) Failing after 0s
2025-02-05 18:34:17 +01:00
988d7cac76 [4.14.1] Update build.gradle, signing and changelog 2025-02-05 18:17:10 +01:00
2f029c096f [UI/Widgets] Set FLAG_UPDATE_CURRENT on pending intents 2025-02-05 18:14:40 +01:00
908959f7ee [UI] Make snowfall condition consistent (#195) 2025-02-05 18:14:13 +01:00
d1ae14a65c [App] Set RECEIVER_EXPORTED flag on registerReceiver() 2025-02-05 18:09:14 +01:00
541979dcd6 [App] Add foreground service type to services 2025-02-05 17:51:40 +01:00
aebb621a8a Merge branch 'develop-v4'
Some checks failed
Push (master) / Build for Google Play (AAB) (push) Failing after 1s
2025-02-02 18:14:01 +01:00
f65d01de1b [App] Update target SDK to 34 2025-02-02 18:13:47 +01:00
54693bf25e Merge branch 'develop-v4' 2025-02-02 17:40:42 +01:00
f2a20c3aae Merge branch 'hotfix/nologin'
Some checks failed
Push (master) / Build for Google Play (AAB) (push) Failing after 1s
2024-07-08 14:39:02 +02:00
1071a0848a Merge branch 'develop' 2023-03-25 10:10:42 +01:00
53c813f014 Merge branch 'develop' 2023-03-24 22:35:54 +01:00
87b7bd9b30 Merge branch 'develop' 2022-12-27 12:30:23 +01:00
8d7dc511ea Merge branch 'develop' 2022-12-27 12:09:04 +01:00
a322986df5 Merge branch 'develop' 2022-11-28 20:39:51 +01:00
726c22b70a Merge branch 'develop' 2022-10-26 22:21:13 +02:00
ef0996c80e Merge branch 'develop' 2022-09-23 12:05:03 +02:00
14952307b3 Merge branch 'develop' 2022-09-17 23:06:32 +02:00
86c41d9191 Merge branch 'develop' 2022-04-19 23:13:15 +02:00
c1ef0e9d11 Merge branch 'develop' 2022-03-14 18:46:37 +01:00
2e97467c57 Merge branch 'develop' 2022-02-21 22:12:46 +01:00
46de915965 Merge branch 'develop' 2022-02-05 21:11:40 +01:00
9a6d56ec77 Merge branch 'develop' 2021-11-01 14:00:30 +01:00
41217190bb Merge branch 'develop' 2021-09-23 22:09:20 +02:00
d60e622626 Merge branch 'develop' 2021-09-11 00:31:21 +02:00
c011f550bb Merge branch 'develop' 2021-05-26 22:32:14 +02:00
61b7410bd0 Merge branch 'develop' 2021-04-07 18:43:05 +02:00
d5c10fbd2b Merge branch 'develop' 2021-04-07 18:31:03 +02:00
fd31cafd8f Merge branch 'develop' 2021-02-26 23:45:28 +01:00
df7044cc64 Merge branch 'develop' 2021-02-22 00:18:20 +01:00
0a127ac6ee Merge branch 'develop' 2020-10-17 00:22:35 +02:00
6b75715e87 Merge branch 'develop' 2020-09-05 19:39:17 +02:00
b9e0d91220 Merge branch 'develop' 2020-09-04 15:44:55 +02:00
0d5bb331f3 Merge branch 'develop' 2020-09-03 14:09:55 +02:00
0e52fb7386 Merge branch 'develop' 2020-08-29 00:01:16 +02:00
339bb9c8f6 Merge branch 'develop' 2020-08-28 15:32:36 +02:00
b44fa6b2e4 Merge branch 'develop' 2020-05-22 14:49:24 +02:00
9cc98fcf08 Merge branch 'develop' 2020-05-17 17:52:28 +02:00
67b794ce2b Merge branch 'develop' 2020-04-20 19:13:49 +02:00
31b502bb6c Merge branch 'develop' 2019-10-31 17:58:02 +01:00
7686c451e6 Merge branch 'develop' 2019-10-09 19:16:15 +02:00
04f3ce4d64 Merge branch 'develop' 2019-10-02 20:44:19 +02:00
3a6087e421 Merge branch 'hotfix-3.0.3' 2019-09-26 22:36:28 +02:00
11 changed files with 43 additions and 22 deletions

View File

@ -13,6 +13,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<!-- 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" />
@ -84,7 +85,7 @@
android:resource="@xml/widget_timetable_info" />
</receiver>
<service android:name=".ui.widgets.timetable.WidgetTimetableService"
android:permission="android.permission.BIND_REMOTEVIEWS" />
android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync" />
<activity android:name=".ui.widgets.LessonDialogActivity"
android:label=""
android:configChanges="orientation|keyboardHidden"
@ -105,7 +106,7 @@
android:resource="@xml/widget_notifications_info" />
</receiver>
<service android:name=".ui.widgets.notifications.WidgetNotificationsService"
android:permission="android.permission.BIND_REMOTEVIEWS" />
android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync" />
<!-- LUCKY NUMBER -->
<receiver android:name=".ui.widgets.luckynumber.WidgetLuckyNumberProvider"
android:label="@string/widget_lucky_number_title"
@ -202,15 +203,15 @@
____) | __/ | \ V /| | (_| __/\__ \
|_____/ \___|_| \_/ |_|\___\___||___/
-->
<service android:name=".data.api.ApiService" />
<service android:name=".data.api.ApiService" android:foregroundServiceType="dataSync" />
<service android:name=".data.firebase.MyFirebaseService"
android:exported="false">
android:exported="false" android:foregroundServiceType="dataSync">
<intent-filter android:priority="10000000">
<action android:name="com.google.firebase.MESSAGING_EVENT" />
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>
<service android:name=".sync.UpdateDownloaderService" />
<service android:name=".sync.UpdateDownloaderService" android:foregroundServiceType="dataSync" />
<!--
_____ _ _

View File

@ -1,9 +1,11 @@
<h3>Wersja 4.14, 2025-02-02</h3>
<h3>Wersja 4.14.1, 2025-02-05</h3>
<ul>
<li>USOS: <b>dodano obsługę ocen</b>.</li>
<li>USOS: obliczanie średniej za studia oraz punktów ECTS.</li>
<li>USOS: poprawiono brak planu zajęć po rozpoczęciu roku.</li>
<li>Wyłączono archiwizator profili.</li>
<li>Naprawiono zatrzymanie aplikacji na Androidzie 14.</li>
<li>Udostępniono opcję wyłączania śniegu również w lutym.</li>
</ul>
<br>
<br>

View File

@ -9,7 +9,7 @@
/*secret password - removed for source code publication*/
static toys AES_IV[16] = {
0xee, 0x23, 0xf1, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
0x58, 0x51, 0x7b, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);

View File

@ -15,6 +15,8 @@ import android.view.Gravity
import android.view.View
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.isVisible
import androidx.navigation.NavOptions
@ -829,7 +831,12 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
d(TAG, "Activity resumed")
val filter = IntentFilter()
filter.addAction(Intent.ACTION_MAIN)
registerReceiver(intentReceiver, filter)
ActivityCompat.registerReceiver(
this,
intentReceiver,
filter,
ContextCompat.RECEIVER_EXPORTED,
)
EventBus.getDefault().register(this)
super.onResume()
}

View File

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

View File

@ -66,9 +66,7 @@ class AttendanceBar : View {
}
@SuppressLint("DrawAllocation", "CanvasSize")
override fun onDraw(canvas: Canvas?) {
canvas ?: return
override fun onDraw(canvas: Canvas) {
val sum = attendancesList.sumOf { it.count }
if (sum == 0) {
return

View File

@ -26,7 +26,7 @@ class SettingsThemeCard(util: SettingsUtil) : SettingsCard(util) {
)
override fun getItems(card: MaterialAboutCard) = listOfNotNull(
if (Date.getToday().month % 11 == 1) // cool math games
if (Date.getToday().month / 3 % 4 == 0) // cool math games
util.createPropertyItem(
text = R.string.settings_theme_snowfall_text,
subText = R.string.settings_theme_snowfall_subtext,

View File

@ -388,7 +388,7 @@ class GenerateBlockTimetableDialog(
try {
val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return@withContext null
resolver.openOutputStream(uri).use {
bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
bitmap.compress(Bitmap.CompressFormat.PNG, 100, it ?: return@use)
}
uri
} catch (e: Exception) {

View File

@ -14,6 +14,8 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.viewpager.widget.ViewPager
import com.google.android.material.datepicker.MaterialDatePicker
@ -90,8 +92,18 @@ class TimetableFragment : Fragment(), CoroutineScope {
}
override fun onResume() {
super.onResume()
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE))
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_RELOAD_PAGES))
ActivityCompat.registerReceiver(
activity,
broadcastReceiver,
IntentFilter(ACTION_SCROLL_TO_DATE),
ContextCompat.RECEIVER_EXPORTED
)
ActivityCompat.registerReceiver(
activity,
broadcastReceiver,
IntentFilter(ACTION_RELOAD_PAGES),
ContextCompat.RECEIVER_EXPORTED
)
}
override fun onPause() {
super.onPause()

View File

@ -5,6 +5,7 @@
package pl.szczodrzynski.edziennik.ui.widgets.timetable
import android.app.PendingIntent
import android.app.PendingIntent.FLAG_UPDATE_CURRENT
import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider
import android.content.ComponentName
@ -395,7 +396,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
}
}
headerIntent.putExtras("fragmentId" to NavTarget.TIMETABLE)
val headerPendingIntent = PendingIntent.getActivity(app, appWidgetId, headerIntent, pendingIntentMutable())
val headerPendingIntent = PendingIntent.getActivity(app, appWidgetId, headerIntent, FLAG_UPDATE_CURRENT or pendingIntentMutable())
views.setOnClickPendingIntent(R.id.widgetTimetableHeader, headerPendingIntent)
timetables!!.put(appWidgetId, models)
@ -409,7 +410,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
// create an intent used to display the lesson details dialog
val itemIntent = Intent(app, LessonDialogActivity::class.java)
itemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK/* or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, pendingIntentMutable())
val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, FLAG_UPDATE_CURRENT or pendingIntentMutable())
views.setPendingIntentTemplate(R.id.widgetTimetableListView, itemPendingIntent)
if (!unified)

View File

@ -5,14 +5,14 @@ buildscript {
kotlin_version = '1.6.10'
release = [
versionName: "4.14",
versionCode: 4140099
versionName: "4.14.1",
versionCode: 4140199
]
setup = [
compileSdk: 33,
compileSdk: 34,
minSdk : 16,
targetSdk : 33
targetSdk : 34
]
}