forked from github/szkolny
Merge branch 'develop'
This commit is contained in:
commit
df7044cc64
16
.idea/codeStyles/Project.xml
generated
16
.idea/codeStyles/Project.xml
generated
@ -1,6 +1,10 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
<code_scheme name="Project" version="173">
|
<code_scheme name="Project" version="173">
|
||||||
|
<JetCodeStyleSettings>
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
|
</JetCodeStyleSettings>
|
||||||
<codeStyleSettings language="XML">
|
<codeStyleSettings language="XML">
|
||||||
|
<option name="FORCE_REARRANGE_MODE" value="1" />
|
||||||
<indentOptions>
|
<indentOptions>
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
</indentOptions>
|
</indentOptions>
|
||||||
@ -11,7 +15,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>xmlns:android</NAME>
|
<NAME>xmlns:android</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -22,7 +25,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>xmlns:.*</NAME>
|
<NAME>xmlns:.*</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -34,7 +36,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*:id</NAME>
|
<NAME>.*:id</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -45,7 +46,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*:name</NAME>
|
<NAME>.*:name</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -56,7 +56,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>name</NAME>
|
<NAME>name</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -67,7 +66,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>style</NAME>
|
<NAME>style</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -78,7 +76,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*</NAME>
|
<NAME>.*</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -90,7 +87,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*</NAME>
|
<NAME>.*</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -102,7 +98,6 @@
|
|||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*</NAME>
|
<NAME>.*</NAME>
|
||||||
<XML_ATTRIBUTE />
|
|
||||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
@ -112,5 +107,8 @@
|
|||||||
</rules>
|
</rules>
|
||||||
</arrangement>
|
</arrangement>
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="kotlin">
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
|
</codeStyleSettings>
|
||||||
</code_scheme>
|
</code_scheme>
|
||||||
</component>
|
</component>
|
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
16
.idea/compiler.xml
generated
16
.idea/compiler.xml
generated
@ -4,14 +4,14 @@
|
|||||||
<bytecodeTargetLevel target="1.7">
|
<bytecodeTargetLevel target="1.7">
|
||||||
<module name="annotation" target="1.7" />
|
<module name="annotation" target="1.7" />
|
||||||
<module name="codegen" target="1.7" />
|
<module name="codegen" target="1.7" />
|
||||||
<module name="Szkolny.eu.agendacalendarview" target="1.8" />
|
<module name="Szkolny.eu.agendacalendarview" target="11" />
|
||||||
<module name="Szkolny.eu.app" target="1.8" />
|
<module name="Szkolny.eu.app" target="11" />
|
||||||
<module name="Szkolny.eu.cafebar" target="1.8" />
|
<module name="Szkolny.eu.cafebar" target="11" />
|
||||||
<module name="Szkolny.eu.material-about-library" target="1.8" />
|
<module name="Szkolny.eu.material-about-library" target="11" />
|
||||||
<module name="Szkolny.eu.mhttp" target="1.8" />
|
<module name="Szkolny.eu.mhttp" target="11" />
|
||||||
<module name="Szkolny.eu.nachos" target="1.8" />
|
<module name="Szkolny.eu.nachos" target="11" />
|
||||||
<module name="Szkolny.eu.szkolny-font" target="1.8" />
|
<module name="Szkolny.eu.szkolny-font" target="11" />
|
||||||
<module name="Szkolny.eu.wear" target="1.8" />
|
<module name="Szkolny.eu.wear" target="11" />
|
||||||
</bytecodeTargetLevel>
|
</bytecodeTargetLevel>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
2
.idea/discord.xml
generated
2
.idea/discord.xml
generated
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="DiscordProjectSettings">
|
<component name="DiscordProjectSettings">
|
||||||
<option name="show" value="true" />
|
<option name="show" value="PROJECT_FILES" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectNotificationSettings">
|
<component name="ProjectNotificationSettings">
|
||||||
<option name="askShowProject" value="false" />
|
<option name="askShowProject" value="false" />
|
||||||
|
1
.idea/runConfigurations.xml
generated
1
.idea/runConfigurations.xml
generated
@ -3,6 +3,7 @@
|
|||||||
<component name="RunConfigurationProducerService">
|
<component name="RunConfigurationProducerService">
|
||||||
<option name="ignoredProducers">
|
<option name="ignoredProducers">
|
||||||
<set>
|
<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.AllInPackageGradleConfigurationProducer" />
|
||||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
||||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
||||||
|
@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
apply plugin: 'kotlin-android-extensions'
|
apply plugin: 'kotlin-android-extensions'
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
apply plugin: 'io.fabric'
|
apply plugin: 'com.google.firebase.crashlytics'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
@ -54,10 +54,11 @@ android {
|
|||||||
lintOptions {
|
lintOptions {
|
||||||
checkReleaseBuilds false
|
checkReleaseBuilds false
|
||||||
}
|
}
|
||||||
dataBinding {
|
buildFeatures {
|
||||||
enabled = true
|
dataBinding = true
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
coreLibraryDesugaringEnabled true
|
||||||
sourceCompatibility '1.8'
|
sourceCompatibility '1.8'
|
||||||
targetCompatibility '1.8'
|
targetCompatibility '1.8'
|
||||||
}
|
}
|
||||||
@ -75,6 +76,7 @@ android {
|
|||||||
version "3.10.2"
|
version "3.10.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ndkVersion '21.3.6528147'
|
||||||
}
|
}
|
||||||
|
|
||||||
/*task finalizeBundleDebug(type: Copy) {
|
/*task finalizeBundleDebug(type: Copy) {
|
||||||
@ -104,6 +106,8 @@ tasks.whenTaskAdded { task ->
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
|
|
||||||
|
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
|
||||||
|
|
||||||
kapt "androidx.room:room-compiler:${versions.room}"
|
kapt "androidx.room:room-compiler:${versions.room}"
|
||||||
debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
|
debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
|
||||||
|
|
||||||
@ -114,7 +118,7 @@ dependencies {
|
|||||||
implementation "androidx.core:core-ktx:${versions.ktx}"
|
implementation "androidx.core:core-ktx:${versions.ktx}"
|
||||||
implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}"
|
implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}"
|
||||||
implementation "androidx.legacy:legacy-support-v4:${versions.legacy}"
|
implementation "androidx.legacy:legacy-support-v4:${versions.legacy}"
|
||||||
implementation "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}"
|
implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}"
|
||||||
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
|
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
|
||||||
implementation "androidx.room:room-runtime:${versions.room}"
|
implementation "androidx.room:room-runtime:${versions.room}"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
|
||||||
@ -137,7 +141,7 @@ dependencies {
|
|||||||
|
|
||||||
implementation "cat.ereza:customactivityoncrash:2.2.0"
|
implementation "cat.ereza:customactivityoncrash:2.2.0"
|
||||||
implementation "com.applandeo:material-calendar-view:1.5.0"
|
implementation "com.applandeo:material-calendar-view:1.5.0"
|
||||||
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
|
implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
|
||||||
implementation "com.daimajia.swipelayout:library:1.2.0@aar"
|
implementation "com.daimajia.swipelayout:library:1.2.0@aar"
|
||||||
implementation "com.evernote:android-job:1.2.6"
|
implementation "com.evernote:android-job:1.2.6"
|
||||||
implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
|
implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
|
||||||
@ -147,7 +151,7 @@ dependencies {
|
|||||||
implementation "com.jaredrummler:colorpicker:1.0.2"
|
implementation "com.jaredrummler:colorpicker:1.0.2"
|
||||||
implementation("com.squareup.okhttp3:okhttp") {
|
implementation("com.squareup.okhttp3:okhttp") {
|
||||||
version {
|
version {
|
||||||
strictly "3.12.2"
|
strictly "3.12.13"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
|
implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
|
||||||
@ -157,7 +161,7 @@ dependencies {
|
|||||||
implementation "me.grantland:autofittextview:0.2.1"
|
implementation "me.grantland:autofittextview:0.2.1"
|
||||||
implementation "me.leolin:ShortcutBadger:1.1.22@aar"
|
implementation "me.leolin:ShortcutBadger:1.1.22@aar"
|
||||||
implementation "org.greenrobot:eventbus:3.1.1"
|
implementation "org.greenrobot:eventbus:3.1.1"
|
||||||
implementation "org.jsoup:jsoup:1.10.1"
|
implementation "org.jsoup:jsoup:1.12.1"
|
||||||
implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
|
implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
|
||||||
//implementation "se.emilsjolander:stickylistheaders:2.7.0"
|
//implementation "se.emilsjolander:stickylistheaders:2.7.0"
|
||||||
implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
|
implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
|
||||||
@ -180,6 +184,7 @@ dependencies {
|
|||||||
//implementation "org.redundent:kotlin-xml-builder:1.5.3"
|
//implementation "org.redundent:kotlin-xml-builder:1.5.3"
|
||||||
|
|
||||||
implementation "io.github.wulkanowy:signer-android:0.1.1"
|
implementation "io.github.wulkanowy:signer-android:0.1.1"
|
||||||
|
implementation 'com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31'
|
||||||
|
|
||||||
implementation "androidx.work:work-runtime-ktx:${versions.work}"
|
implementation "androidx.work:work-runtime-ktx:${versions.work}"
|
||||||
|
|
||||||
|
@ -66,4 +66,4 @@
|
|||||||
|
|
||||||
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
|
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
|
||||||
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
|
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
|
||||||
-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; }
|
-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
<h3>Wersja 4.4.3, 2020-10-16</h3>
|
<h3>Wersja 4.5, 2021-02-21</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Mobidziennik: naprawione wysyłanie wiadomości.</li>
|
<li>Vulcan: aplikacja Szkolny.eu zaktualizowana w związku z wygaszeniem aplikacji Dzienniczek+.</li>
|
||||||
<li>Vulcan: naprawione logowanie dla dzienników w Koszalinie.</li>
|
<li><b>Mogą pojawić się brakujące funkcje, np. wysyłanie wiadomości - zostaną one wprowadzone w najbliższych dniach.</b></li>
|
||||||
<li>PPE: opcja wylogowania innych urządzeń przy logowaniu.</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
Dzięki za korzystanie ze Szkolnego!<br>
|
Dzięki za korzystanie ze Szkolnego!<br>
|
||||||
<i>© Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>
|
<i>© Kuba Szczodrzyński, Kacper Ziubryniewicz 2021</i>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
/*secret password - removed for source code publication*/
|
/*secret password - removed for source code publication*/
|
||||||
static toys AES_IV[16] = {
|
static toys AES_IV[16] = {
|
||||||
0xaa, 0x6d, 0x87, 0x46, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
0x4f, 0x43, 0x04, 0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||||
|
|
||||||
unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
|
unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
|
||||||
|
|
||||||
|
@ -294,6 +294,19 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
|
|||||||
"Vulcan"
|
"Vulcan"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val pushVulcanHebeApp = FirebaseApp.initializeApp(
|
||||||
|
this@App,
|
||||||
|
FirebaseOptions.Builder()
|
||||||
|
.setProjectId("dzienniczekplus")
|
||||||
|
.setStorageBucket("dzienniczekplus.appspot.com")
|
||||||
|
.setDatabaseUrl("https://dzienniczekplus.firebaseio.com")
|
||||||
|
.setGcmSenderId("987828170337")
|
||||||
|
.setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
|
||||||
|
.setApplicationId("1:987828170337:android:7e16404b9e5deaaa")
|
||||||
|
.build(),
|
||||||
|
"VulcanHebe"
|
||||||
|
)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
|
FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
|
||||||
val token = instanceIdResult.token
|
val token = instanceIdResult.token
|
||||||
@ -324,6 +337,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
|
|||||||
config.sync.tokenVulcanList = listOf()
|
config.sync.tokenVulcanList = listOf()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
FirebaseInstanceId.getInstance(pushVulcanHebeApp).instanceId.addOnSuccessListener { instanceIdResult ->
|
||||||
|
val token = instanceIdResult.token
|
||||||
|
d("Firebase", "Got VulcanHebe token: $token")
|
||||||
|
if (token != config.sync.tokenVulcanHebe) {
|
||||||
|
config.sync.tokenVulcanHebe = token
|
||||||
|
config.sync.tokenVulcanHebeList = listOf()
|
||||||
|
}
|
||||||
|
}
|
||||||
FirebaseMessaging.getInstance().subscribeToTopic(packageName)
|
FirebaseMessaging.getInstance().subscribeToTopic(packageName)
|
||||||
} catch (e: IllegalStateException) {
|
} catch (e: IllegalStateException) {
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
|
@ -96,30 +96,30 @@ fun List<Teacher>.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull {
|
|||||||
|
|
||||||
fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
|
fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
|
||||||
|
|
||||||
fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
|
fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
|
||||||
fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString }
|
fun JsonObject?.getString(key: String): String? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
|
||||||
fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt }
|
fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
|
||||||
fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong }
|
fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
|
||||||
fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat }
|
fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
|
||||||
fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
|
fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
|
||||||
fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
|
fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
|
||||||
fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
|
fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
|
||||||
|
|
||||||
fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue
|
fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asBoolean } ?: defaultValue
|
||||||
fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue
|
fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asString } ?: defaultValue
|
||||||
fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue
|
fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asInt } ?: defaultValue
|
||||||
fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue
|
fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asLong } ?: defaultValue
|
||||||
fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue
|
fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asFloat } ?: defaultValue
|
||||||
fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(it.isJsonNull) defaultValue else it.asCharacter } ?: defaultValue
|
fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asCharacter } ?: defaultValue
|
||||||
fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue
|
fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue
|
||||||
fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue
|
fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue
|
||||||
|
|
||||||
fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
|
fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
|
||||||
fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asString }
|
fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
|
||||||
fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asInt }
|
fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
|
||||||
fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asLong }
|
fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
|
||||||
fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asFloat }
|
fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
|
||||||
fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
|
fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
|
||||||
fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
|
fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
|
||||||
fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
|
fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
|
||||||
|
|
||||||
@ -1172,7 +1172,7 @@ fun Iterable<Float>.averageOrNull() = this.average().let { if (it.isNaN()) null
|
|||||||
fun String.copyToClipboard(context: Context) {
|
fun String.copyToClipboard(context: Context) {
|
||||||
val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
||||||
val clipData = ClipData.newPlainText("Tekst", this)
|
val clipData = ClipData.newPlainText("Tekst", this)
|
||||||
clipboard.primaryClip = clipData
|
clipboard.setPrimaryClip(clipData)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun TextView.getTextPosition(range: IntRange): Rect {
|
fun TextView.getTextPosition(range: IntRange): Rect {
|
||||||
|
@ -38,6 +38,7 @@ import org.greenrobot.eventbus.EventBus
|
|||||||
import org.greenrobot.eventbus.Subscribe
|
import org.greenrobot.eventbus.Subscribe
|
||||||
import org.greenrobot.eventbus.ThreadMode
|
import org.greenrobot.eventbus.ThreadMode
|
||||||
import pl.droidsonroids.gif.GifDrawable
|
import pl.droidsonroids.gif.GifDrawable
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
|
import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
|
||||||
import pl.szczodrzynski.edziennik.data.api.events.*
|
import pl.szczodrzynski.edziennik.data.api.events.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
@ -64,6 +65,7 @@ import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
|
|||||||
import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
|
import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
|
import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
|
import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
|
||||||
|
import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
|
import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
|
import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
|
import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
|
||||||
@ -756,6 +758,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
mainSnackbar.dismiss()
|
mainSnackbar.dismiss()
|
||||||
errorSnackbar.addError(event.error).show()
|
errorSnackbar.addError(event.error).show()
|
||||||
|
if (event.error.errorCode == ERROR_VULCAN_API_DEPRECATED) {
|
||||||
|
ErrorDetailsDialog(this, listOf(event.error))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) {
|
fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) {
|
||||||
|
@ -99,6 +99,10 @@ class ConfigSync(private val config: Config) {
|
|||||||
var tokenVulcan: String?
|
var tokenVulcan: String?
|
||||||
get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
|
get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
|
||||||
set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
|
set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
|
||||||
|
private var mTokenVulcanHebe: String? = null
|
||||||
|
var tokenVulcanHebe: String?
|
||||||
|
get() { mTokenVulcanHebe = mTokenVulcanHebe ?: config.values.get("tokenVulcanHebe", null as String?); return mTokenVulcanHebe }
|
||||||
|
set(value) { config.set("tokenVulcanHebe", value); mTokenVulcanHebe = value }
|
||||||
|
|
||||||
private var mTokenMobidziennikList: List<Int>? = null
|
private var mTokenMobidziennikList: List<Int>? = null
|
||||||
var tokenMobidziennikList: List<Int>
|
var tokenMobidziennikList: List<Int>
|
||||||
@ -112,6 +116,10 @@ class ConfigSync(private val config: Config) {
|
|||||||
var tokenVulcanList: List<Int>
|
var tokenVulcanList: List<Int>
|
||||||
get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
|
get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
|
||||||
set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
|
set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
|
||||||
|
private var mTokenVulcanHebeList: List<Int>? = null
|
||||||
|
var tokenVulcanHebeList: List<Int>
|
||||||
|
get() { mTokenVulcanHebeList = mTokenVulcanHebeList ?: config.values.getIntList("tokenVulcanHebeList", listOf()); return mTokenVulcanHebeList ?: listOf() }
|
||||||
|
set(value) { config.set("tokenVulcanHebeList", value); mTokenVulcanHebeList = value }
|
||||||
|
|
||||||
private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
|
private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
|
||||||
var registerAvailability: Map<String, RegisterAvailabilityStatus>
|
var registerAvailability: Map<String, RegisterAvailabilityStatus>
|
||||||
|
@ -95,7 +95,16 @@ const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
|
|||||||
const val VULCAN_API_APP_VERSION = "20.5.1.470"
|
const val VULCAN_API_APP_VERSION = "20.5.1.470"
|
||||||
const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
|
const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
|
||||||
const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
|
const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
|
||||||
val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
|
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 = "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 {
|
||||||
|
val base = "$VULCAN_API_DEVICE_NAME_PREFIX${Build.MODEL}"
|
||||||
|
val baseMaxLength = 50 - VULCAN_API_DEVICE_NAME_SUFFIX.length
|
||||||
|
base.take(baseMaxLength) + VULCAN_API_DEVICE_NAME_SUFFIX
|
||||||
|
}
|
||||||
|
|
||||||
const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
|
const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
|
||||||
const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
|
const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
|
||||||
@ -116,6 +125,17 @@ const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/
|
|||||||
const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
|
const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
|
||||||
const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
|
const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
|
||||||
const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
|
const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_REGISTER_NEW = "api/mobile/register/new"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_MAIN = "api/mobile/register/hebe"
|
||||||
|
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_EXAMS = "api/mobile/exam"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message"
|
||||||
|
const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status"
|
||||||
|
|
||||||
const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
|
const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
|
||||||
|
|
||||||
|
@ -170,6 +170,8 @@ const val ERROR_VULCAN_WEB_LOGGED_OUT = 350
|
|||||||
const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED = 351
|
const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED = 351
|
||||||
const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT = 352
|
const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT = 352
|
||||||
const val ERROR_VULCAN_WEB_NO_SCHOOLS = 353
|
const val ERROR_VULCAN_WEB_NO_SCHOOLS = 353
|
||||||
|
const val ERROR_VULCAN_HEBE_OTHER = 354
|
||||||
|
const val ERROR_VULCAN_API_DEPRECATED = 390
|
||||||
|
|
||||||
const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN = 401
|
const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN = 401
|
||||||
const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME = 402
|
const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME = 402
|
||||||
@ -229,5 +231,6 @@ const val ERROR_ONEDRIVE_DOWNLOAD = 930
|
|||||||
const val EXCEPTION_VULCAN_WEB_LOGIN = 931
|
const val EXCEPTION_VULCAN_WEB_LOGIN = 931
|
||||||
const val EXCEPTION_VULCAN_WEB_REQUEST = 932
|
const val EXCEPTION_VULCAN_WEB_REQUEST = 932
|
||||||
const val EXCEPTION_PODLASIE_API_REQUEST = 940
|
const val EXCEPTION_PODLASIE_API_REQUEST = 940
|
||||||
|
const val EXCEPTION_VULCAN_HEBE_REQUEST = 950
|
||||||
|
|
||||||
const val LOGIN_NO_ARGUMENTS = 1201
|
const val LOGIN_NO_ARGUMENTS = 1201
|
||||||
|
@ -17,6 +17,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLogi
|
|||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
|
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.template.login.TemplateLoginWeb
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
|
||||||
|
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.edziennik.vulcan.login.VulcanLoginWebMain
|
||||||
import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
|
import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
|
||||||
|
|
||||||
@ -98,11 +99,13 @@ val mobidziennikLoginMethods = listOf(
|
|||||||
const val LOGIN_TYPE_VULCAN = 4
|
const val LOGIN_TYPE_VULCAN = 4
|
||||||
const val LOGIN_MODE_VULCAN_API = 0
|
const val LOGIN_MODE_VULCAN_API = 0
|
||||||
const val LOGIN_MODE_VULCAN_WEB = 1
|
const val LOGIN_MODE_VULCAN_WEB = 1
|
||||||
|
const val LOGIN_MODE_VULCAN_HEBE = 2
|
||||||
const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
|
const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
|
||||||
const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
|
const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
|
||||||
const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
|
const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
|
||||||
const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
|
const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
|
||||||
const val LOGIN_METHOD_VULCAN_API = 500
|
const val LOGIN_METHOD_VULCAN_API = 500
|
||||||
|
const val LOGIN_METHOD_VULCAN_HEBE = 600
|
||||||
val vulcanLoginMethods = listOf(
|
val vulcanLoginMethods = listOf(
|
||||||
LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
|
LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
|
||||||
.withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") }
|
.withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") }
|
||||||
@ -117,9 +120,19 @@ val vulcanLoginMethods = listOf(
|
|||||||
.withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
|
.withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
|
||||||
|
|
||||||
LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
|
LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
|
||||||
.withIsPossible { _, _ -> true }
|
.withIsPossible { _, loginStore ->
|
||||||
|
loginStore.mode != LOGIN_MODE_VULCAN_HEBE
|
||||||
|
}
|
||||||
.withRequiredLoginMethod { _, loginStore ->
|
.withRequiredLoginMethod { _, loginStore ->
|
||||||
if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
|
if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
|
||||||
|
},
|
||||||
|
|
||||||
|
LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_HEBE, VulcanLoginHebe::class.java)
|
||||||
|
.withIsPossible { _, loginStore ->
|
||||||
|
loginStore.mode != LOGIN_MODE_VULCAN_API
|
||||||
|
}
|
||||||
|
.withRequiredLoginMethod { _, loginStore ->
|
||||||
|
if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -4,16 +4,16 @@
|
|||||||
|
|
||||||
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
|
||||||
|
|
||||||
import pl.szczodrzynski.edziennik.App
|
import pl.szczodrzynski.edziennik.*
|
||||||
import pl.szczodrzynski.edziennik.currentTimeUnix
|
|
||||||
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_MODE_VULCAN_API
|
||||||
import pl.szczodrzynski.edziennik.data.api.models.Data
|
import pl.szczodrzynski.edziennik.data.api.models.Data
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
|
import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Team
|
import pl.szczodrzynski.edziennik.data.db.entity.Team
|
||||||
import pl.szczodrzynski.edziennik.isNotNullNorEmpty
|
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils
|
import pl.szczodrzynski.edziennik.utils.Utils
|
||||||
import pl.szczodrzynski.edziennik.values
|
|
||||||
|
|
||||||
class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
|
class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
|
||||||
|
|
||||||
@ -26,17 +26,27 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
|
|||||||
&& apiFingerprint[symbol].isNotNullNorEmpty()
|
&& apiFingerprint[symbol].isNotNullNorEmpty()
|
||||||
&& apiPrivateKey[symbol].isNotNullNorEmpty()
|
&& apiPrivateKey[symbol].isNotNullNorEmpty()
|
||||||
&& symbol.isNotNullNorEmpty()
|
&& symbol.isNotNullNorEmpty()
|
||||||
|
fun isHebeLoginValid() = hebePublicKey.isNotNullNorEmpty()
|
||||||
|
&& hebePrivateKey.isNotNullNorEmpty()
|
||||||
|
&& symbol.isNotNullNorEmpty()
|
||||||
|
|
||||||
override fun satisfyLoginMethods() {
|
override fun satisfyLoginMethods() {
|
||||||
loginMethods.clear()
|
loginMethods.clear()
|
||||||
|
if (isWebMainLoginValid()) {
|
||||||
|
loginMethods += LOGIN_METHOD_VULCAN_WEB_MAIN
|
||||||
|
}
|
||||||
if (isApiLoginValid()) {
|
if (isApiLoginValid()) {
|
||||||
loginMethods += LOGIN_METHOD_VULCAN_API
|
loginMethods += LOGIN_METHOD_VULCAN_API
|
||||||
}
|
}
|
||||||
|
if (isHebeLoginValid()) {
|
||||||
|
loginMethods += LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// during the first sync `profile.studentClassName` is already set
|
// during the first sync `profile.studentClassName` is already set
|
||||||
if (teamList.values().none { it.type == Team.TYPE_CLASS }) {
|
if (loginStore.mode == LOGIN_MODE_VULCAN_API
|
||||||
|
&& teamList.values().none { it.type == Team.TYPE_CLASS }) {
|
||||||
profile?.studentClassName?.also { name ->
|
profile?.studentClassName?.also { name ->
|
||||||
val id = Utils.crc16(name.toByteArray()).toLong()
|
val id = Utils.crc16(name.toByteArray()).toLong()
|
||||||
|
|
||||||
@ -55,6 +65,17 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
|
|||||||
|
|
||||||
override fun generateUserCode() = "$schoolCode:$studentId"
|
override fun generateUserCode() = "$schoolCode:$studentId"
|
||||||
|
|
||||||
|
fun buildDeviceId(): String {
|
||||||
|
val deviceId = app.deviceId.padStart(16, '0')
|
||||||
|
val loginStoreId = loginStore.id.toString(16).padStart(4, '0')
|
||||||
|
val symbol = symbol?.crc16()?.toString(16)?.take(2) ?: "00"
|
||||||
|
return deviceId.substring(0..7) +
|
||||||
|
"-" + deviceId.substring(8..11) +
|
||||||
|
"-" + deviceId.substring(12..15) +
|
||||||
|
"-" + loginStoreId +
|
||||||
|
"-" + symbol + "6f72616e7a"
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A UONET+ client symbol.
|
* A UONET+ client symbol.
|
||||||
*
|
*
|
||||||
@ -139,6 +160,16 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
|
|||||||
get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
|
get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
|
||||||
set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
|
set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
|
||||||
|
|
||||||
|
private var mStudentUnitId: Int? = null
|
||||||
|
var studentUnitId: Int
|
||||||
|
get() { mStudentUnitId = mStudentUnitId ?: profile?.getStudentData("studentUnitId", 0); return mStudentUnitId ?: 0 }
|
||||||
|
set(value) { profile?.putStudentData("studentUnitId", value) ?: return; mStudentUnitId = value }
|
||||||
|
|
||||||
|
private var mStudentConstituentId: Int? = null
|
||||||
|
var studentConstituentId: Int
|
||||||
|
get() { mStudentConstituentId = mStudentConstituentId ?: profile?.getStudentData("studentConstituentId", 0); return mStudentConstituentId ?: 0 }
|
||||||
|
set(value) { profile?.putStudentData("studentConstituentId", value) ?: return; mStudentConstituentId = value }
|
||||||
|
|
||||||
private var mSemester1Id: Int? = null
|
private var mSemester1Id: Int? = null
|
||||||
var semester1Id: Int
|
var semester1Id: Int
|
||||||
get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
|
get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
|
||||||
@ -203,6 +234,32 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
|
|||||||
get() { mApiPrivateKey = mApiPrivateKey ?: loginStore.getLoginData("apiPrivateKey", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPrivateKey ?: mapOf() }
|
get() { mApiPrivateKey = mApiPrivateKey ?: loginStore.getLoginData("apiPrivateKey", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPrivateKey ?: mapOf() }
|
||||||
set(value) { loginStore.putLoginData("apiPrivateKey", app.gson.toJson(value)); mApiPrivateKey = value }
|
set(value) { loginStore.putLoginData("apiPrivateKey", app.gson.toJson(value)); mApiPrivateKey = value }
|
||||||
|
|
||||||
|
/* _ _ _ _____ _____
|
||||||
|
| | | | | | /\ | __ \_ _|
|
||||||
|
| |__| | ___| |__ ___ / \ | |__) || |
|
||||||
|
| __ |/ _ \ '_ \ / _ \ / /\ \ | ___/ | |
|
||||||
|
| | | | __/ |_) | __/ / ____ \| | _| |_
|
||||||
|
|_| |_|\___|_.__/ \___| /_/ \_\_| |____*/
|
||||||
|
private var mHebePublicKey: String? = null
|
||||||
|
var hebePublicKey: String?
|
||||||
|
get() { mHebePublicKey = mHebePublicKey ?: loginStore.getLoginData("hebePublicKey", null); return mHebePublicKey }
|
||||||
|
set(value) { loginStore.putLoginData("hebePublicKey", value); mHebePublicKey = value }
|
||||||
|
|
||||||
|
private var mHebePrivateKey: String? = null
|
||||||
|
var hebePrivateKey: String?
|
||||||
|
get() { mHebePrivateKey = mHebePrivateKey ?: loginStore.getLoginData("hebePrivateKey", null); return mHebePrivateKey }
|
||||||
|
set(value) { loginStore.putLoginData("hebePrivateKey", value); mHebePrivateKey = value }
|
||||||
|
|
||||||
|
private var mHebePublicHash: String? = null
|
||||||
|
var hebePublicHash: String?
|
||||||
|
get() { mHebePublicHash = mHebePublicHash ?: loginStore.getLoginData("hebePublicHash", null); return mHebePublicHash }
|
||||||
|
set(value) { loginStore.putLoginData("hebePublicHash", value); mHebePublicHash = value }
|
||||||
|
|
||||||
|
private var mHebeContext: String? = null
|
||||||
|
var hebeContext: String?
|
||||||
|
get() { mHebeContext = mHebeContext ?: profile?.getStudentData("hebeContext", null); return mHebeContext }
|
||||||
|
set(value) { profile?.putStudentData("hebeContext", value) ?: return; mHebeContext = value }
|
||||||
|
|
||||||
val apiUrl: String?
|
val apiUrl: String?
|
||||||
get() {
|
get() {
|
||||||
val url = when (apiToken[symbol]?.substring(0, 3)) {
|
val url = when (apiToken[symbol]?.substring(0, 3)) {
|
||||||
@ -227,7 +284,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
|
|||||||
return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null)
|
return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null)
|
||||||
}
|
}
|
||||||
|
|
||||||
val fullApiUrl: String?
|
val fullApiUrl: String
|
||||||
get() {
|
get() {
|
||||||
return "$apiUrl$schoolSymbol/"
|
return "$apiUrl$schoolSymbol/"
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData
|
|||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiAttachments
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiAttachments
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiSendMessage
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiSendMessage
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMessagesChangeStatus
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin
|
||||||
import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
|
import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
|
||||||
@ -91,6 +92,20 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getMessage(message: MessageFull) {
|
override fun getMessage(message: MessageFull) {
|
||||||
|
if (loginStore.mode != LOGIN_MODE_VULCAN_API) {
|
||||||
|
login(LOGIN_METHOD_VULCAN_HEBE) {
|
||||||
|
if (message.seen) {
|
||||||
|
EventBus.getDefault().postSticky(MessageGetEvent(message))
|
||||||
|
completed()
|
||||||
|
return@login
|
||||||
|
}
|
||||||
|
VulcanHebeMessagesChangeStatus(data, message) {
|
||||||
|
completed()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
login(LOGIN_METHOD_VULCAN_API) {
|
login(LOGIN_METHOD_VULCAN_API) {
|
||||||
if (message.attachmentIds != null) {
|
if (message.attachmentIds != null) {
|
||||||
VulcanApiMessagesChangeStatus(data, message) {
|
VulcanApiMessagesChangeStatus(data, message) {
|
||||||
|
@ -20,25 +20,46 @@ const val ENDPOINT_VULCAN_API_ATTENDANCE = 1080
|
|||||||
const val ENDPOINT_VULCAN_API_MESSAGES_INBOX = 1090
|
const val ENDPOINT_VULCAN_API_MESSAGES_INBOX = 1090
|
||||||
const val ENDPOINT_VULCAN_API_MESSAGES_SENT = 1100
|
const val ENDPOINT_VULCAN_API_MESSAGES_SENT = 1100
|
||||||
const val ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS = 2010
|
const val ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS = 2010
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_MAIN = 3000
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_ADDRESSBOOK = 3010
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_TIMETABLE = 3020
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_EXAMS = 3030
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_GRADES = 3040
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_HOMEWORK = 3060
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_ATTENDANCE = 3080
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX = 3090
|
||||||
|
const val ENDPOINT_VULCAN_HEBE_MESSAGES_SENT = 3100
|
||||||
|
|
||||||
val VulcanFeatures = listOf(
|
val VulcanFeatures = listOf(
|
||||||
// timetable
|
// timetable
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
|
||||||
ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_TIMETABLE to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
// agenda
|
// agenda
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
|
||||||
ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_EXAMS to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
// grades
|
// grades
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
|
||||||
ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API,
|
ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API,
|
||||||
ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_GRADES to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
// homework
|
// homework
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
|
||||||
ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_HOMEWORK to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
// behaviour
|
// behaviour
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf(
|
||||||
ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API
|
||||||
@ -47,6 +68,9 @@ val VulcanFeatures = listOf(
|
|||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
|
||||||
ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_ATTENDANCE to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
// messages
|
// messages
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
|
||||||
ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API
|
||||||
@ -54,6 +78,12 @@ val VulcanFeatures = listOf(
|
|||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
|
||||||
ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API)),
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_SENT to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE)),
|
||||||
|
|
||||||
// push config
|
// push config
|
||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_PUSH_CONFIG, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_PUSH_CONFIG, listOf(
|
||||||
@ -72,7 +102,11 @@ val VulcanFeatures = listOf(
|
|||||||
Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
|
||||||
ENDPOINT_VULCAN_API_UPDATE_SEMESTER to LOGIN_METHOD_VULCAN_API,
|
ENDPOINT_VULCAN_API_UPDATE_SEMESTER to LOGIN_METHOD_VULCAN_API,
|
||||||
ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API
|
ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API
|
||||||
), listOf(LOGIN_METHOD_VULCAN_API))
|
), listOf(LOGIN_METHOD_VULCAN_API)),
|
||||||
|
Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
|
||||||
|
ENDPOINT_VULCAN_HEBE_MAIN to LOGIN_METHOD_VULCAN_HEBE,
|
||||||
|
ENDPOINT_VULCAN_HEBE_ADDRESSBOOK to LOGIN_METHOD_VULCAN_HEBE
|
||||||
|
), listOf(LOGIN_METHOD_VULCAN_HEBE))
|
||||||
/*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf(
|
/*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf(
|
||||||
ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
|
ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
|
||||||
), listOf(LOGIN_METHOD_VULCAN_WEB)),
|
), listOf(LOGIN_METHOD_VULCAN_WEB)),
|
||||||
|
@ -5,9 +5,13 @@
|
|||||||
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
|
||||||
|
|
||||||
import pl.szczodrzynski.edziennik.R
|
import pl.szczodrzynski.edziennik.R
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_MODE_VULCAN_API
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.*
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.*
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Message
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils
|
import pl.szczodrzynski.edziennik.utils.Utils
|
||||||
|
|
||||||
class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
|
class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
|
||||||
@ -15,9 +19,35 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
private const val TAG = "VulcanData"
|
private const val TAG = "VulcanData"
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
private var firstSemesterSync = false
|
||||||
nextEndpoint(onSuccess)
|
private val firstSemesterSyncExclude = listOf(
|
||||||
}
|
ENDPOINT_VULCAN_HEBE_MAIN,
|
||||||
|
ENDPOINT_VULCAN_HEBE_ADDRESSBOOK,
|
||||||
|
ENDPOINT_VULCAN_HEBE_TIMETABLE,
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX,
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
|
||||||
|
)
|
||||||
|
|
||||||
|
init { run {
|
||||||
|
if (data.loginStore.mode == LOGIN_MODE_VULCAN_API) {
|
||||||
|
data.error(TAG, ERROR_VULCAN_API_DEPRECATED)
|
||||||
|
return@run
|
||||||
|
}
|
||||||
|
if (data.studentSemesterNumber == 2 && data.profile?.empty != false) {
|
||||||
|
firstSemesterSync = true
|
||||||
|
// set to sync 1st semester first
|
||||||
|
data.studentSemesterId = data.semester1Id
|
||||||
|
data.studentSemesterNumber = 1
|
||||||
|
}
|
||||||
|
nextEndpoint {
|
||||||
|
if (firstSemesterSync) {
|
||||||
|
// at the end, set back 2nd semester
|
||||||
|
data.studentSemesterId = data.semester2Id
|
||||||
|
data.studentSemesterNumber = 2
|
||||||
|
}
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
|
||||||
private fun nextEndpoint(onSuccess: () -> Unit) {
|
private fun nextEndpoint(onSuccess: () -> Unit) {
|
||||||
if (data.targetEndpointIds.isEmpty()) {
|
if (data.targetEndpointIds.isEmpty()) {
|
||||||
@ -30,7 +60,21 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
}
|
}
|
||||||
val id = data.targetEndpointIds.firstKey()
|
val id = data.targetEndpointIds.firstKey()
|
||||||
val lastSync = data.targetEndpointIds.remove(id)
|
val lastSync = data.targetEndpointIds.remove(id)
|
||||||
useEndpoint(id, lastSync) { endpointId ->
|
useEndpoint(id, lastSync) {
|
||||||
|
if (firstSemesterSync && id !in firstSemesterSyncExclude) {
|
||||||
|
// sync 2nd semester after every endpoint
|
||||||
|
data.studentSemesterId = data.semester2Id
|
||||||
|
data.studentSemesterNumber = 2
|
||||||
|
useEndpoint(id, lastSync) {
|
||||||
|
// set 1st semester back for the next endpoint
|
||||||
|
data.studentSemesterId = data.semester1Id
|
||||||
|
data.studentSemesterNumber = 1
|
||||||
|
// progress further
|
||||||
|
data.progress(data.progressStep)
|
||||||
|
nextEndpoint(onSuccess)
|
||||||
|
}
|
||||||
|
return@useEndpoint
|
||||||
|
}
|
||||||
data.progress(data.progressStep)
|
data.progress(data.progressStep)
|
||||||
nextEndpoint(onSuccess)
|
nextEndpoint(onSuccess)
|
||||||
}
|
}
|
||||||
@ -91,6 +135,51 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
|
data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
|
||||||
VulcanWebLuckyNumber(data, lastSync, onSuccess)
|
VulcanWebLuckyNumber(data, lastSync, onSuccess)
|
||||||
}
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_MAIN -> {
|
||||||
|
if (data.profile == null) {
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_student_info)
|
||||||
|
VulcanHebeMain(data, lastSync).getStudents(
|
||||||
|
profile = data.profile,
|
||||||
|
profileList = null
|
||||||
|
) {
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_ADDRESSBOOK -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_teachers)
|
||||||
|
VulcanHebeAddressbook(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_TIMETABLE -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_timetable)
|
||||||
|
VulcanHebeTimetable(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_EXAMS -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_exams)
|
||||||
|
VulcanHebeExams(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_GRADES -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_grades)
|
||||||
|
VulcanHebeGrades(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_HOMEWORK -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_homework)
|
||||||
|
VulcanHebeHomework(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
|
||||||
|
VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_RECEIVED)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_MESSAGES_SENT -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
|
||||||
|
VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_SENT)
|
||||||
|
}
|
||||||
|
ENDPOINT_VULCAN_HEBE_ATTENDANCE -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_endpoint_attendance)
|
||||||
|
VulcanHebeAttendance(data, lastSync, onSuccess)
|
||||||
|
}
|
||||||
else -> onSuccess(endpointId)
|
else -> onSuccess(endpointId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,360 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
|
||||||
|
|
||||||
|
import android.os.Build
|
||||||
|
import androidx.core.util.set
|
||||||
|
import com.google.gson.JsonArray
|
||||||
|
import com.google.gson.JsonElement
|
||||||
|
import com.google.gson.JsonObject
|
||||||
|
import im.wangchao.mhttp.Request
|
||||||
|
import im.wangchao.mhttp.Response
|
||||||
|
import im.wangchao.mhttp.body.MediaTypeUtils
|
||||||
|
import im.wangchao.mhttp.callback.JsonCallbackHandler
|
||||||
|
import io.github.wulkanowy.signer.hebe.getSignatureHeaders
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.HebeFilterType
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Subject
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Team
|
||||||
|
import pl.szczodrzynski.edziennik.utils.Utils.d
|
||||||
|
import pl.szczodrzynski.edziennik.utils.models.Date
|
||||||
|
import pl.szczodrzynski.edziennik.utils.models.Time
|
||||||
|
import java.net.HttpURLConnection
|
||||||
|
import java.net.URLEncoder
|
||||||
|
import java.time.Instant
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
import java.time.ZoneId
|
||||||
|
import java.time.ZonedDateTime
|
||||||
|
import java.time.format.DateTimeFormatter
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebe"
|
||||||
|
}
|
||||||
|
|
||||||
|
val profileId
|
||||||
|
get() = data.profile?.id ?: -1
|
||||||
|
|
||||||
|
val profile
|
||||||
|
get() = data.profile
|
||||||
|
|
||||||
|
fun getDateTime(json: JsonObject?, key: String, default: Long = System.currentTimeMillis()): Long {
|
||||||
|
val date = json.getJsonObject(key)
|
||||||
|
return date.getLong("Timestamp") ?: return default
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getDate(json: JsonObject?, key: String): Date? {
|
||||||
|
val date = json.getJsonObject(key)
|
||||||
|
return date.getString("Date")?.let { Date.fromY_m_d(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getTeacherId(json: JsonObject?, key: String): Long? {
|
||||||
|
val teacher = json.getJsonObject(key)
|
||||||
|
val teacherId = teacher.getLong("Id") ?: return null
|
||||||
|
if (data.teacherList[teacherId] == null) {
|
||||||
|
data.teacherList[teacherId] = Teacher(
|
||||||
|
data.profileId,
|
||||||
|
teacherId,
|
||||||
|
teacher.getString("Name") ?: "",
|
||||||
|
teacher.getString("Surname") ?: ""
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return teacherId
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getSubjectId(json: JsonObject?, key: String): Long? {
|
||||||
|
val subject = json.getJsonObject(key)
|
||||||
|
val subjectId = subject.getLong("Id") ?: return null
|
||||||
|
if (data.subjectList[subjectId] == null) {
|
||||||
|
data.subjectList[subjectId] = Subject(
|
||||||
|
data.profileId,
|
||||||
|
subjectId,
|
||||||
|
subject.getString("Name") ?: "",
|
||||||
|
subject.getString("Kod") ?: ""
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return subjectId
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getTeamId(json: JsonObject?, key: String): Long? {
|
||||||
|
val team = json.getJsonObject(key)
|
||||||
|
val teamId = team.getLong("Id") ?: return null
|
||||||
|
if (data.teamList[teamId] == null) {
|
||||||
|
var name = team.getString("Shortcut")
|
||||||
|
?: team.getString("Name")
|
||||||
|
?: ""
|
||||||
|
name = "${profile?.studentClassName ?: ""} $name"
|
||||||
|
data.teamList[teamId] = Team(
|
||||||
|
data.profileId,
|
||||||
|
teamId,
|
||||||
|
name,
|
||||||
|
Team.TYPE_VIRTUAL,
|
||||||
|
"${data.schoolCode}:$name",
|
||||||
|
-1
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return teamId
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getClassId(json: JsonObject?, key: String): Long? {
|
||||||
|
val team = json.getJsonObject(key)
|
||||||
|
val teamId = team.getLong("Id") ?: return null
|
||||||
|
if (data.teamList[teamId] == null) {
|
||||||
|
val name = data.profile?.studentClassName
|
||||||
|
?: team.getString("Name")
|
||||||
|
?: ""
|
||||||
|
data.teamList[teamId] = Team(
|
||||||
|
data.profileId,
|
||||||
|
teamId,
|
||||||
|
name,
|
||||||
|
Team.TYPE_CLASS,
|
||||||
|
"${data.schoolCode}:$name",
|
||||||
|
-1
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return teamId
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getLessonRange(json: JsonObject?, key: String): LessonRange? {
|
||||||
|
val timeslot = json.getJsonObject(key)
|
||||||
|
val position = timeslot.getInt("Position") ?: return null
|
||||||
|
val start = timeslot.getString("Start") ?: return null
|
||||||
|
val end = timeslot.getString("End") ?: return null
|
||||||
|
val lessonRange = LessonRange(
|
||||||
|
data.profileId,
|
||||||
|
position,
|
||||||
|
Time.fromH_m(start),
|
||||||
|
Time.fromH_m(end)
|
||||||
|
)
|
||||||
|
data.lessonRanges[position] = lessonRange
|
||||||
|
return lessonRange
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getSemester(json: JsonObject?): Int {
|
||||||
|
val periodId = json.getInt("PeriodId") ?: return 1
|
||||||
|
return if (periodId == data.semester1Id)
|
||||||
|
1
|
||||||
|
else
|
||||||
|
2
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified T> apiRequest(
|
||||||
|
tag: String,
|
||||||
|
endpoint: String,
|
||||||
|
method: Int = GET,
|
||||||
|
payload: JsonElement? = null,
|
||||||
|
baseUrl: Boolean = false,
|
||||||
|
firebaseToken: String? = null,
|
||||||
|
crossinline onSuccess: (json: T, response: Response?) -> Unit
|
||||||
|
) {
|
||||||
|
val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
|
||||||
|
|
||||||
|
d(tag, "Request: Vulcan/Hebe - $url")
|
||||||
|
|
||||||
|
val privateKey = data.hebePrivateKey
|
||||||
|
val publicHash = data.hebePublicHash
|
||||||
|
|
||||||
|
if (privateKey == null || publicHash == null) {
|
||||||
|
data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val timestamp = ZonedDateTime.now(ZoneId.of("GMT"))
|
||||||
|
val timestampMillis = timestamp.toInstant().toEpochMilli()
|
||||||
|
val timestampIso = timestamp.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"))
|
||||||
|
|
||||||
|
val finalPayload = if (payload != null) {
|
||||||
|
JsonObject(
|
||||||
|
"AppName" to VULCAN_HEBE_APP_NAME,
|
||||||
|
"AppVersion" to VULCAN_HEBE_APP_VERSION,
|
||||||
|
"CertificateId" to publicHash,
|
||||||
|
"Envelope" to payload,
|
||||||
|
"FirebaseToken" to (firebaseToken ?: data.app.config.sync.tokenVulcanHebe),
|
||||||
|
"API" to 1,
|
||||||
|
"RequestId" to UUID.randomUUID().toString(),
|
||||||
|
"Timestamp" to timestampMillis,
|
||||||
|
"TimestampFormatted" to timestampIso
|
||||||
|
)
|
||||||
|
} else null
|
||||||
|
val jsonString = finalPayload?.toString()
|
||||||
|
|
||||||
|
val headers = getSignatureHeaders(
|
||||||
|
publicHash,
|
||||||
|
privateKey,
|
||||||
|
jsonString,
|
||||||
|
endpoint,
|
||||||
|
timestamp
|
||||||
|
)
|
||||||
|
|
||||||
|
val callback = object : JsonCallbackHandler() {
|
||||||
|
override fun onSuccess(json: JsonObject?, response: Response?) {
|
||||||
|
if (json == null) {
|
||||||
|
data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
|
||||||
|
.withResponse(response)
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val status = json.getJsonObject("Status")
|
||||||
|
if (status?.getInt("Code") != 0) {
|
||||||
|
data.error(ApiError(tag, ERROR_VULCAN_HEBE_OTHER)
|
||||||
|
.withResponse(response)
|
||||||
|
.withApiResponse(json.toString()))
|
||||||
|
}
|
||||||
|
|
||||||
|
val envelope = when (T::class.java) {
|
||||||
|
JsonObject::class.java -> json.getJsonObject("Envelope") as T
|
||||||
|
JsonArray::class.java -> json.getJsonArray("Envelope") as T
|
||||||
|
java.lang.Boolean::class.java -> json.getBoolean("Envelope") as T
|
||||||
|
else -> {
|
||||||
|
data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
|
||||||
|
.withResponse(response)
|
||||||
|
.withApiResponse(json)
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
onSuccess(envelope, response)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
data.error(ApiError(tag, EXCEPTION_VULCAN_HEBE_REQUEST)
|
||||||
|
.withResponse(response)
|
||||||
|
.withThrowable(e)
|
||||||
|
.withApiResponse(json)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onFailure(response: Response?, throwable: Throwable?) {
|
||||||
|
data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
|
||||||
|
.withResponse(response)
|
||||||
|
.withThrowable(throwable)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Request.builder()
|
||||||
|
.url(url)
|
||||||
|
.userAgent(VULCAN_HEBE_USER_AGENT)
|
||||||
|
.addHeader("vOS", "Android")
|
||||||
|
.addHeader("vDeviceModel", Build.MODEL)
|
||||||
|
.addHeader("vAPI", "1")
|
||||||
|
.apply {
|
||||||
|
if (data.hebeContext != null)
|
||||||
|
addHeader("vContext", data.hebeContext)
|
||||||
|
headers.forEach {
|
||||||
|
addHeader(it.key, it.value)
|
||||||
|
}
|
||||||
|
when (method) {
|
||||||
|
GET -> get()
|
||||||
|
POST -> {
|
||||||
|
post()
|
||||||
|
setTextBody(jsonString, MediaTypeUtils.APPLICATION_JSON)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
|
||||||
|
.allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
|
||||||
|
.allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
|
||||||
|
.allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
|
||||||
|
.callback(callback)
|
||||||
|
.build()
|
||||||
|
.enqueue()
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified T> apiGet(
|
||||||
|
tag: String,
|
||||||
|
endpoint: String,
|
||||||
|
query: Map<String, String> = mapOf(),
|
||||||
|
baseUrl: Boolean = false,
|
||||||
|
firebaseToken: String? = null,
|
||||||
|
crossinline onSuccess: (json: T, response: Response?) -> Unit
|
||||||
|
) {
|
||||||
|
val queryPath = query.map {
|
||||||
|
it.key + "=" + URLEncoder.encode(it.value, "UTF-8").replace("+", "%20")
|
||||||
|
}.join("&")
|
||||||
|
apiRequest(
|
||||||
|
tag,
|
||||||
|
if (query.isNotEmpty()) "$endpoint?$queryPath" else endpoint,
|
||||||
|
baseUrl = baseUrl,
|
||||||
|
firebaseToken = firebaseToken,
|
||||||
|
onSuccess = onSuccess
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified T> apiPost(
|
||||||
|
tag: String,
|
||||||
|
endpoint: String,
|
||||||
|
payload: JsonElement,
|
||||||
|
baseUrl: Boolean = false,
|
||||||
|
firebaseToken: String? = null,
|
||||||
|
crossinline onSuccess: (json: T, response: Response?) -> Unit
|
||||||
|
) {
|
||||||
|
apiRequest(
|
||||||
|
tag,
|
||||||
|
endpoint,
|
||||||
|
method = POST,
|
||||||
|
payload,
|
||||||
|
baseUrl = baseUrl,
|
||||||
|
firebaseToken = firebaseToken,
|
||||||
|
onSuccess = onSuccess
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun apiGetList(
|
||||||
|
tag: String,
|
||||||
|
endpoint: String,
|
||||||
|
filterType: HebeFilterType? = null,
|
||||||
|
dateFrom: Date? = null,
|
||||||
|
dateTo: Date? = null,
|
||||||
|
lastSync: Long? = null,
|
||||||
|
folder: Int? = null,
|
||||||
|
params: Map<String, String> = mapOf(),
|
||||||
|
includeFilterType: Boolean = true,
|
||||||
|
onSuccess: (data: List<JsonObject>, response: Response?) -> Unit
|
||||||
|
) {
|
||||||
|
val url = if (includeFilterType && filterType != null)
|
||||||
|
"$endpoint/${filterType.endpoint}"
|
||||||
|
else endpoint
|
||||||
|
|
||||||
|
val query = params.toMutableMap()
|
||||||
|
|
||||||
|
when (filterType) {
|
||||||
|
HebeFilterType.BY_PUPIL -> {
|
||||||
|
query["unitId"] = data.studentUnitId.toString()
|
||||||
|
query["pupilId"] = data.studentId.toString()
|
||||||
|
query["periodId"] = data.studentSemesterId.toString()
|
||||||
|
}
|
||||||
|
HebeFilterType.BY_PERSON -> {
|
||||||
|
query["loginId"] = data.studentLoginId.toString()
|
||||||
|
}
|
||||||
|
HebeFilterType.BY_PERIOD -> {
|
||||||
|
query["periodId"] = data.studentSemesterId.toString()
|
||||||
|
query["pupilId"] = data.studentId.toString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dateFrom != null)
|
||||||
|
query["dateFrom"] = dateFrom.stringY_m_d
|
||||||
|
if (dateTo != null)
|
||||||
|
query["dateTo"] = dateTo.stringY_m_d
|
||||||
|
|
||||||
|
if (folder != null)
|
||||||
|
query["folder"] = folder.toString()
|
||||||
|
|
||||||
|
query["lastId"] = "-2147483648" // don't ask, it's just Vulcan
|
||||||
|
query["pageSize"] = "500"
|
||||||
|
query["lastSyncDate"] = LocalDateTime
|
||||||
|
.ofInstant(Instant.ofEpochMilli(lastSync ?: 0), ZoneId.systemDefault())
|
||||||
|
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
|
||||||
|
|
||||||
|
apiGet(tag, url, query) { json: JsonArray, response ->
|
||||||
|
onSuccess(json.map { it.asJsonObject }, response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,7 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
enum class HebeFilterType(val endpoint: String) {
|
||||||
|
BY_PUPIL("byPupil"),
|
||||||
|
BY_PERSON("byPerson"),
|
||||||
|
BY_PERIOD("byPeriod")
|
||||||
|
}
|
@ -0,0 +1,118 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import androidx.core.util.set
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ADDRESSBOOK
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ADDRESSBOOK
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_EDUCATOR
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_OTHER
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENT
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENTS_COUNCIL
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_STUDENT
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_TEACHER
|
||||||
|
import kotlin.text.replace
|
||||||
|
|
||||||
|
class VulcanHebeAddressbook(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeAddressbook"
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun String.removeUnitName(unitName: String?): String {
|
||||||
|
return (unitName ?: data.schoolShort)?.let {
|
||||||
|
this.replace("($it)", "").trim()
|
||||||
|
} ?: this
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_ADDRESSBOOK,
|
||||||
|
HebeFilterType.BY_PERSON,
|
||||||
|
lastSync = lastSync,
|
||||||
|
includeFilterType = false
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { person ->
|
||||||
|
val id = person.getString("Id") ?: return@forEach
|
||||||
|
val loginId = person.getString("LoginId") ?: return@forEach
|
||||||
|
|
||||||
|
val idType = id.split("-")
|
||||||
|
.getOrNull(0)
|
||||||
|
val idLong = id.split("-")
|
||||||
|
.getOrNull(1)
|
||||||
|
?.toLongOrNull()
|
||||||
|
?: return@forEach
|
||||||
|
|
||||||
|
val typeBase = when (idType) {
|
||||||
|
"e" -> TYPE_TEACHER
|
||||||
|
"c" -> TYPE_PARENT
|
||||||
|
"p" -> TYPE_STUDENT
|
||||||
|
else -> TYPE_OTHER
|
||||||
|
}
|
||||||
|
|
||||||
|
val name = person.getString("Name") ?: ""
|
||||||
|
val surname = person.getString("Surname") ?: ""
|
||||||
|
val namePrefix = "$surname $name - "
|
||||||
|
|
||||||
|
val teacher = data.teacherList[idLong] ?: Teacher(
|
||||||
|
data.profileId,
|
||||||
|
idLong,
|
||||||
|
name,
|
||||||
|
surname,
|
||||||
|
loginId
|
||||||
|
).also {
|
||||||
|
data.teacherList[idLong] = it
|
||||||
|
}
|
||||||
|
|
||||||
|
person.getJsonArray("Roles")?.asJsonObjectList()?.onEach { role ->
|
||||||
|
var roleText: String? = null
|
||||||
|
val unitName = role.getString("ConstituentUnitSymbol")
|
||||||
|
|
||||||
|
val personType = when (role.getInt("RoleOrder")) {
|
||||||
|
0 -> { /* Wychowawca */
|
||||||
|
roleText = role.getString("ClassSymbol")
|
||||||
|
?.removeUnitName(unitName)
|
||||||
|
TYPE_EDUCATOR
|
||||||
|
}
|
||||||
|
1 -> TYPE_TEACHER /* Nauczyciel */
|
||||||
|
2 -> return@onEach /* Pracownik */
|
||||||
|
3 -> { /* Rada rodziców */
|
||||||
|
roleText = role.getString("Address")
|
||||||
|
?.removeUnitName(unitName)
|
||||||
|
?.removePrefix(namePrefix)
|
||||||
|
?.trim()
|
||||||
|
TYPE_PARENTS_COUNCIL
|
||||||
|
}
|
||||||
|
5 -> {
|
||||||
|
roleText = role.getString("RoleName")
|
||||||
|
?.plus(" - ")
|
||||||
|
?.plus(
|
||||||
|
role.getString("Address")
|
||||||
|
?.removeUnitName(unitName)
|
||||||
|
?.removePrefix(namePrefix)
|
||||||
|
?.trim()
|
||||||
|
)
|
||||||
|
TYPE_STUDENT
|
||||||
|
}
|
||||||
|
else -> TYPE_OTHER
|
||||||
|
}
|
||||||
|
|
||||||
|
teacher.setTeacherType(personType)
|
||||||
|
teacher.typeDescription = roleText
|
||||||
|
}
|
||||||
|
|
||||||
|
if (teacher.type == 0)
|
||||||
|
teacher.setTeacherType(typeBase)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, 2 * DAY)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,143 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Kacper Ziubryniewicz 2021-2-21
|
||||||
|
*/
|
||||||
|
|
||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ATTENDANCE
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ATTENDANCE
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
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
|
||||||
|
|
||||||
|
class VulcanHebeAttendance(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeAttendance"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
val semesterNumber = data.studentSemesterNumber
|
||||||
|
val startDate = profile?.getSemesterStart(semesterNumber)
|
||||||
|
val endDate = profile?.getSemesterEnd(semesterNumber)
|
||||||
|
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_ATTENDANCE,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
dateFrom = startDate,
|
||||||
|
dateTo = endDate,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { attendance ->
|
||||||
|
val id = attendance.getLong("AuxPresenceId") ?: return@forEach
|
||||||
|
val type = attendance.getJsonObject("PresenceType") ?: return@forEach
|
||||||
|
val baseType = getBaseType(type)
|
||||||
|
val typeName = type.getString("Name") ?: return@forEach
|
||||||
|
val typeCategoryId = type.getLong("CategoryId") ?: return@forEach
|
||||||
|
val typeSymbol = type.getString("Symbol") ?: return@forEach
|
||||||
|
val typeShort = when (typeCategoryId.toInt()) {
|
||||||
|
6, 8 -> typeSymbol
|
||||||
|
else -> data.app.attendanceManager.getTypeShort(baseType)
|
||||||
|
}
|
||||||
|
val typeColor = when (typeCategoryId.toInt()) {
|
||||||
|
1 -> 0xffffffff // obecność
|
||||||
|
2 -> 0xffffa687 // nieobecność
|
||||||
|
3 -> 0xfffcc150 // nieobecność usprawiedliwiona
|
||||||
|
4 -> 0xffede049 // spóźnienie
|
||||||
|
5 -> 0xffbbdd5f // spóźnienie usprawiedliwione
|
||||||
|
6 -> 0xffa9c9fd // nieobecny z przyczyn szkolnych
|
||||||
|
7 -> 0xffddbbe5 // zwolniony
|
||||||
|
8 -> 0xffffffff // usunięty wpis
|
||||||
|
else -> null
|
||||||
|
}?.toInt()
|
||||||
|
val date = getDate(attendance, "Day") ?: return@forEach
|
||||||
|
val lessonRange = getLessonRange(attendance, "TimeSlot")
|
||||||
|
val startTime = lessonRange?.startTime
|
||||||
|
val semester = profile?.dateToSemester(date) ?: return@forEach
|
||||||
|
val teacherId = attendance.getJsonObject("TeacherPrimary")?.getLong("Id") ?: -1
|
||||||
|
val subjectId = attendance.getJsonObject("Subject")?.getLong("Id") ?: -1
|
||||||
|
val addedDate = getDateTime(attendance, "DateModify")
|
||||||
|
val lessonNumber = lessonRange?.lessonNumber
|
||||||
|
val isCounted = attendance.getBoolean("CalculatePresence")
|
||||||
|
?: (baseType != Attendance.TYPE_RELEASED)
|
||||||
|
|
||||||
|
val attendanceObject = Attendance(
|
||||||
|
profileId = profileId,
|
||||||
|
id = id,
|
||||||
|
baseType = baseType,
|
||||||
|
typeName = typeName,
|
||||||
|
typeShort = typeShort,
|
||||||
|
typeSymbol = typeSymbol,
|
||||||
|
typeColor = typeColor,
|
||||||
|
date = date,
|
||||||
|
startTime = startTime,
|
||||||
|
semester = semester,
|
||||||
|
teacherId = teacherId,
|
||||||
|
subjectId = subjectId,
|
||||||
|
addedDate = addedDate
|
||||||
|
).also {
|
||||||
|
it.lessonNumber = lessonNumber
|
||||||
|
it.isCounted = isCounted
|
||||||
|
}
|
||||||
|
|
||||||
|
data.attendanceList.add(attendanceObject)
|
||||||
|
if (baseType != Attendance.TYPE_PRESENT) {
|
||||||
|
data.metadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_ATTENDANCE,
|
||||||
|
attendanceObject.id,
|
||||||
|
profile?.empty ?: true
|
||||||
|
|| baseType == Attendance.TYPE_PRESENT_CUSTOM
|
||||||
|
|| baseType == Attendance.TYPE_UNKNOWN,
|
||||||
|
profile?.empty ?: true
|
||||||
|
|| baseType == Attendance.TYPE_PRESENT_CUSTOM
|
||||||
|
|| baseType == Attendance.TYPE_UNKNOWN
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_ATTENDANCE, SYNC_ALWAYS)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_ATTENDANCE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getBaseType(attendanceType: JsonObject): Int {
|
||||||
|
val absent = attendanceType.getBoolean("Absence") ?: false
|
||||||
|
val excused = attendanceType.getBoolean("AbsenceJustified") ?: false
|
||||||
|
return if (absent) {
|
||||||
|
if (excused)
|
||||||
|
Attendance.TYPE_ABSENT_EXCUSED
|
||||||
|
else
|
||||||
|
Attendance.TYPE_ABSENT
|
||||||
|
} else {
|
||||||
|
val belated = attendanceType.getBoolean("Late") ?: false
|
||||||
|
val released = attendanceType.getBoolean("LegalAbsence") ?: false
|
||||||
|
val present = attendanceType.getBoolean("Presence") ?: true
|
||||||
|
if (belated)
|
||||||
|
if (excused)
|
||||||
|
Attendance.TYPE_BELATED_EXCUSED
|
||||||
|
else
|
||||||
|
Attendance.TYPE_BELATED
|
||||||
|
else if (released)
|
||||||
|
Attendance.TYPE_RELEASED
|
||||||
|
else if (present)
|
||||||
|
if (attendanceType.getInt("CategoryId") != 1)
|
||||||
|
Attendance.TYPE_PRESENT_CUSTOM
|
||||||
|
else
|
||||||
|
Attendance.TYPE_PRESENT
|
||||||
|
else
|
||||||
|
Attendance.TYPE_UNKNOWN
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,78 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_EXAMS
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_EXAMS
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
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
|
||||||
|
|
||||||
|
class VulcanHebeExams(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeExams"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_EXAMS,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { exam ->
|
||||||
|
val id = exam.getLong("Id") ?: return@forEach
|
||||||
|
val eventDate = getDate(exam, "Deadline") ?: return@forEach
|
||||||
|
val subjectId = getSubjectId(exam, "Subject") ?: -1
|
||||||
|
val teacherId = getTeacherId(exam, "Creator") ?: -1
|
||||||
|
val teamId = getTeamId(exam, "Distribution")
|
||||||
|
?: getClassId(exam, "Class")
|
||||||
|
?: data.teamClass?.id
|
||||||
|
?: -1
|
||||||
|
val topic = exam.getString("Content")?.trim() ?: ""
|
||||||
|
|
||||||
|
val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
|
||||||
|
val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
|
||||||
|
|
||||||
|
val type = when (exam.getString("Type")) {
|
||||||
|
"Praca klasowa",
|
||||||
|
"Sprawdzian" -> Event.TYPE_EXAM
|
||||||
|
"Kartkówka" -> Event.TYPE_SHORT_QUIZ
|
||||||
|
else -> Event.TYPE_DEFAULT
|
||||||
|
}
|
||||||
|
|
||||||
|
val eventObject = Event(
|
||||||
|
profileId = profileId,
|
||||||
|
id = id,
|
||||||
|
date = eventDate,
|
||||||
|
time = startTime,
|
||||||
|
topic = topic,
|
||||||
|
color = null,
|
||||||
|
type = type,
|
||||||
|
teacherId = teacherId,
|
||||||
|
subjectId = subjectId,
|
||||||
|
teamId = teamId
|
||||||
|
)
|
||||||
|
|
||||||
|
data.eventList.add(eventObject)
|
||||||
|
data.metadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_EVENT,
|
||||||
|
id,
|
||||||
|
profile?.empty ?: true,
|
||||||
|
profile?.empty ?: true
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_EXAMS, SYNC_ALWAYS)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_EXAMS)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,121 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADES
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADES
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Grade
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
|
||||||
|
import java.text.DecimalFormat
|
||||||
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
|
class VulcanHebeGrades(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeGrades"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_GRADES,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { grade ->
|
||||||
|
val id = grade.getLong("Id") ?: return@forEach
|
||||||
|
|
||||||
|
val column = grade.getJsonObject("Column")
|
||||||
|
val category = column.getJsonObject("Category")
|
||||||
|
val categoryText = category.getString("Name")
|
||||||
|
|
||||||
|
val teacherId = getTeacherId(grade, "Creator") ?: -1
|
||||||
|
val subjectId = getSubjectId(column, "Subject") ?: -1
|
||||||
|
|
||||||
|
val description = column.getString("Name")
|
||||||
|
val comment = grade.getString("Comment")
|
||||||
|
var value = grade.getFloat("Value")
|
||||||
|
var weight = column.getFloat("Weight") ?: 0.0f
|
||||||
|
val numerator = grade.getFloat("Numerator ")
|
||||||
|
val denominator = grade.getFloat("Denominator")
|
||||||
|
val addedDate = getDateTime(grade, "DateModify")
|
||||||
|
|
||||||
|
var finalDescription = ""
|
||||||
|
|
||||||
|
var name = when (numerator != null && denominator != null) {
|
||||||
|
true -> {
|
||||||
|
value = numerator / denominator
|
||||||
|
finalDescription += DecimalFormat("#.##").format(numerator) +
|
||||||
|
"/" + DecimalFormat("#.##").format(denominator)
|
||||||
|
weight = 0.0f
|
||||||
|
(value * 100).roundToInt().toString() + "%"
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
if (value == null) weight = 0.0f
|
||||||
|
|
||||||
|
grade.getString("Content") ?: ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
comment?.also {
|
||||||
|
if (name == "") name = it
|
||||||
|
else finalDescription = (if (finalDescription == "") "" else " ") + it
|
||||||
|
}
|
||||||
|
|
||||||
|
description?.also {
|
||||||
|
finalDescription = (if (finalDescription == "") "" else " - ") + it
|
||||||
|
}
|
||||||
|
|
||||||
|
val columnColor = column.getInt("Color") ?: 0
|
||||||
|
val color = if (columnColor == 0)
|
||||||
|
when (name) {
|
||||||
|
"1-", "1", "1+" -> 0xffd65757
|
||||||
|
"2-", "2", "2+" -> 0xff9071b3
|
||||||
|
"3-", "3", "3+" -> 0xffd2ab24
|
||||||
|
"4-", "4", "4+" -> 0xff50b6d6
|
||||||
|
"5-", "5", "5+" -> 0xff2cbd92
|
||||||
|
"6-", "6", "6+" -> 0xff91b43c
|
||||||
|
else -> 0xff3D5F9C
|
||||||
|
}.toInt()
|
||||||
|
else
|
||||||
|
columnColor
|
||||||
|
|
||||||
|
val gradeObject = Grade(
|
||||||
|
profileId = profileId,
|
||||||
|
id = id,
|
||||||
|
name = name,
|
||||||
|
type = Grade.TYPE_NORMAL,
|
||||||
|
value = value ?: 0.0f,
|
||||||
|
weight = weight,
|
||||||
|
color = color,
|
||||||
|
category = categoryText,
|
||||||
|
description = finalDescription,
|
||||||
|
comment = null,
|
||||||
|
semester = getSemester(column),
|
||||||
|
teacherId = teacherId,
|
||||||
|
subjectId = subjectId,
|
||||||
|
addedDate = addedDate
|
||||||
|
)
|
||||||
|
|
||||||
|
data.gradeList.add(gradeObject)
|
||||||
|
data.metadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_GRADE,
|
||||||
|
id,
|
||||||
|
profile?.empty ?: true,
|
||||||
|
profile?.empty ?: true
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADES, SYNC_ALWAYS)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_GRADES)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,69 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_HOMEWORK
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_HOMEWORK
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
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.getLong
|
||||||
|
import pl.szczodrzynski.edziennik.getString
|
||||||
|
|
||||||
|
class VulcanHebeHomework(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeHomework"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_HOMEWORK,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { exam ->
|
||||||
|
val id = exam.getLong("IdHomework") ?: return@forEach
|
||||||
|
val eventDate = getDate(exam, "Deadline") ?: return@forEach
|
||||||
|
val subjectId = getSubjectId(exam, "Subject") ?: -1
|
||||||
|
val teacherId = getTeacherId(exam, "Creator") ?: -1
|
||||||
|
val teamId = data.teamClass?.id ?: -1
|
||||||
|
val topic = exam.getString("Content")?.trim() ?: ""
|
||||||
|
|
||||||
|
val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
|
||||||
|
val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
|
||||||
|
|
||||||
|
val eventObject = Event(
|
||||||
|
profileId = profileId,
|
||||||
|
id = id,
|
||||||
|
date = eventDate,
|
||||||
|
time = startTime,
|
||||||
|
topic = topic,
|
||||||
|
color = null,
|
||||||
|
type = Event.TYPE_HOMEWORK,
|
||||||
|
teacherId = teacherId,
|
||||||
|
subjectId = subjectId,
|
||||||
|
teamId = teamId
|
||||||
|
)
|
||||||
|
|
||||||
|
data.eventList.add(eventObject)
|
||||||
|
data.metadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_HOMEWORK,
|
||||||
|
id,
|
||||||
|
profile?.empty ?: true,
|
||||||
|
profile?.empty ?: true
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_HOMEWORK, SYNC_ALWAYS)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_HOMEWORK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,160 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import com.google.gson.JsonArray
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MAIN
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MAIN
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
||||||
|
import pl.szczodrzynski.edziennik.utils.models.Date
|
||||||
|
|
||||||
|
class VulcanHebeMain(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long? = null
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeMain"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getStudents(
|
||||||
|
profile: Profile?,
|
||||||
|
profileList: MutableList<Profile>?,
|
||||||
|
loginStoreId: Int? = null,
|
||||||
|
firstProfileId: Int? = null,
|
||||||
|
onEmpty: (() -> Unit)? = null,
|
||||||
|
onSuccess: () -> Unit
|
||||||
|
) {
|
||||||
|
if (profile == null && (profileList == null || loginStoreId == null || firstProfileId == null))
|
||||||
|
throw IllegalArgumentException()
|
||||||
|
|
||||||
|
apiGet(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_MAIN,
|
||||||
|
query = mapOf("lastSyncDate" to "null"),
|
||||||
|
baseUrl = profile == null
|
||||||
|
) { students: JsonArray, _ ->
|
||||||
|
if (students.isEmpty()) {
|
||||||
|
if (onEmpty != null)
|
||||||
|
onEmpty()
|
||||||
|
else
|
||||||
|
onSuccess()
|
||||||
|
return@apiGet
|
||||||
|
}
|
||||||
|
|
||||||
|
// safe to assume this will be non-null when creating a profile
|
||||||
|
var profileId = firstProfileId ?: loginStoreId ?: 1
|
||||||
|
|
||||||
|
students.forEach { studentEl ->
|
||||||
|
val student = studentEl.asJsonObject
|
||||||
|
|
||||||
|
val pupil = student.getJsonObject("Pupil")
|
||||||
|
val studentId = pupil.getInt("Id") ?: return@forEach
|
||||||
|
|
||||||
|
// check the student ID in case of not first login
|
||||||
|
if (profile != null && data.studentId != studentId)
|
||||||
|
return@forEach
|
||||||
|
|
||||||
|
val unit = student.getJsonObject("Unit")
|
||||||
|
val constituentUnit = student.getJsonObject("ConstituentUnit")
|
||||||
|
val login = student.getJsonObject("Login")
|
||||||
|
val periods = student.getJsonArray("Periods")?.map {
|
||||||
|
it.asJsonObject
|
||||||
|
} ?: listOf()
|
||||||
|
|
||||||
|
val period = periods.firstOrNull {
|
||||||
|
it.getBoolean("Current", false)
|
||||||
|
} ?: return@forEach
|
||||||
|
|
||||||
|
val periodLevel = period.getInt("Level") ?: return@forEach
|
||||||
|
val semester1 = periods.firstOrNull {
|
||||||
|
it.getInt("Level") == periodLevel && it.getInt("Number") == 1
|
||||||
|
}
|
||||||
|
val semester2 = periods.firstOrNull {
|
||||||
|
it.getInt("Level") == periodLevel && it.getInt("Number") == 2
|
||||||
|
}
|
||||||
|
|
||||||
|
val schoolSymbol = unit.getString("Symbol") ?: return@forEach
|
||||||
|
val schoolShort = constituentUnit.getString("Short") ?: return@forEach
|
||||||
|
val schoolCode = "${data.symbol}_$schoolSymbol"
|
||||||
|
|
||||||
|
val studentUnitId = unit.getInt("Id") ?: return@forEach
|
||||||
|
val studentConstituentId = constituentUnit.getInt("Id") ?: return@forEach
|
||||||
|
val studentLoginId = login.getInt("Id") ?: return@forEach
|
||||||
|
//val studentClassId = student.getInt("IdOddzial") ?: return@forEach
|
||||||
|
val studentClassName = student.getString("ClassDisplay") ?: return@forEach
|
||||||
|
val studentFirstName = pupil.getString("FirstName") ?: ""
|
||||||
|
val studentLastName = pupil.getString("Surname") ?: ""
|
||||||
|
val studentNameLong = "$studentFirstName $studentLastName".fixName()
|
||||||
|
val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
|
||||||
|
val userLogin = login.getString("Value") ?: ""
|
||||||
|
|
||||||
|
val studentSemesterId = period.getInt("Id") ?: return@forEach
|
||||||
|
val studentSemesterNumber = period.getInt("Number") ?: return@forEach
|
||||||
|
|
||||||
|
val hebeContext = student.getString("Context")
|
||||||
|
|
||||||
|
val isParent = login.getString("LoginRole").equals("opiekun", ignoreCase = true)
|
||||||
|
val accountName = if (isParent)
|
||||||
|
login.getString("DisplayName")?.fixName()
|
||||||
|
else null
|
||||||
|
|
||||||
|
val dateSemester1Start = semester1
|
||||||
|
?.getJsonObject("Start")
|
||||||
|
?.getString("Date")
|
||||||
|
?.let { Date.fromY_m_d(it) }
|
||||||
|
val dateSemester2Start = semester2
|
||||||
|
?.getJsonObject("Start")
|
||||||
|
?.getString("Date")
|
||||||
|
?.let { Date.fromY_m_d(it) }
|
||||||
|
val dateYearEnd = semester2
|
||||||
|
?.getJsonObject("End")
|
||||||
|
?.getString("Date")
|
||||||
|
?.let { Date.fromY_m_d(it) }
|
||||||
|
|
||||||
|
val newProfile = profile ?: Profile(
|
||||||
|
profileId++,
|
||||||
|
loginStoreId!!,
|
||||||
|
LOGIN_TYPE_VULCAN,
|
||||||
|
studentNameLong,
|
||||||
|
userLogin,
|
||||||
|
studentNameLong,
|
||||||
|
studentNameShort,
|
||||||
|
accountName
|
||||||
|
)
|
||||||
|
|
||||||
|
newProfile.apply {
|
||||||
|
this.studentClassName = studentClassName
|
||||||
|
studentData["symbol"] = data.symbol
|
||||||
|
|
||||||
|
studentData["studentId"] = studentId
|
||||||
|
studentData["studentUnitId"] = studentUnitId
|
||||||
|
studentData["studentConstituentId"] = studentConstituentId
|
||||||
|
studentData["studentLoginId"] = studentLoginId
|
||||||
|
studentData["studentSemesterId"] = studentSemesterId
|
||||||
|
studentData["studentSemesterNumber"] = studentSemesterNumber
|
||||||
|
studentData["semester1Id"] = semester1?.getInt("Id") ?: 0
|
||||||
|
studentData["semester2Id"] = semester2?.getInt("Id") ?: 0
|
||||||
|
studentData["schoolSymbol"] = schoolSymbol
|
||||||
|
studentData["schoolShort"] = schoolShort
|
||||||
|
studentData["schoolName"] = schoolCode
|
||||||
|
studentData["hebeContext"] = hebeContext
|
||||||
|
}
|
||||||
|
dateSemester1Start?.let {
|
||||||
|
newProfile.dateSemester1Start = it
|
||||||
|
newProfile.studentSchoolYearStart = it.year
|
||||||
|
}
|
||||||
|
dateSemester2Start?.let { newProfile.dateSemester2Start = it }
|
||||||
|
dateYearEnd?.let { newProfile.dateYearEnd = it }
|
||||||
|
|
||||||
|
if (profile != null)
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_MAIN, 1 * DAY)
|
||||||
|
|
||||||
|
profileList?.add(newProfile)
|
||||||
|
}
|
||||||
|
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,127 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import androidx.core.util.set
|
||||||
|
import com.google.gson.JsonObject
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
|
||||||
|
import pl.szczodrzynski.navlib.crc16
|
||||||
|
import kotlin.text.replace
|
||||||
|
|
||||||
|
class VulcanHebeMessages(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeMessagesInbox"
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getPersonId(json: JsonObject): Long {
|
||||||
|
val senderLoginId = json.getInt("LoginId") ?: return -1
|
||||||
|
/*if (senderLoginId == data.studentLoginId)
|
||||||
|
return -1*/
|
||||||
|
|
||||||
|
val senderName = json.getString("Address") ?: return -1
|
||||||
|
val senderNameSplit = senderName.splitName()
|
||||||
|
val senderLoginIdStr = senderLoginId.toString()
|
||||||
|
val teacher = data.teacherList.singleOrNull { it.loginId == senderLoginIdStr }
|
||||||
|
?: Teacher(
|
||||||
|
profileId,
|
||||||
|
-1 * crc16(senderName).toLong(),
|
||||||
|
senderNameSplit?.second ?: "",
|
||||||
|
senderNameSplit?.first ?: "",
|
||||||
|
senderLoginIdStr
|
||||||
|
).also {
|
||||||
|
it.setTeacherType(Teacher.TYPE_OTHER)
|
||||||
|
data.teacherList[it.id] = it
|
||||||
|
}
|
||||||
|
return teacher.id
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getMessages(messageType: Int) {
|
||||||
|
val folder = when (messageType) {
|
||||||
|
TYPE_RECEIVED -> 1
|
||||||
|
TYPE_SENT -> 2
|
||||||
|
TYPE_DELETED -> 3
|
||||||
|
else -> 1
|
||||||
|
}
|
||||||
|
val endpointId = when (messageType) {
|
||||||
|
TYPE_RECEIVED -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
|
||||||
|
TYPE_SENT -> ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
|
||||||
|
else -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
|
||||||
|
}
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_MESSAGES,
|
||||||
|
HebeFilterType.BY_PERSON,
|
||||||
|
folder = folder,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { list, _ ->
|
||||||
|
list.forEach { message ->
|
||||||
|
val id = message.getLong("Id") ?: return@forEach
|
||||||
|
val subject = message.getString("Subject") ?: return@forEach
|
||||||
|
val body = message.getString("Content") ?: return@forEach
|
||||||
|
|
||||||
|
val sender = message.getJsonObject("Sender") ?: return@forEach
|
||||||
|
|
||||||
|
val sentDate = getDateTime(message, "DateSent")
|
||||||
|
val readDate = getDateTime(message, "DateRead", default = 0)
|
||||||
|
|
||||||
|
val messageObject = Message(
|
||||||
|
profileId = profileId,
|
||||||
|
id = id,
|
||||||
|
type = messageType,
|
||||||
|
subject = subject,
|
||||||
|
body = body.replace("\n", "<br>"),
|
||||||
|
senderId = if (messageType == TYPE_RECEIVED) getPersonId(sender) else null,
|
||||||
|
addedDate = sentDate
|
||||||
|
)
|
||||||
|
|
||||||
|
val receivers = message.getJsonArray("Receiver")
|
||||||
|
?.asJsonObjectList()
|
||||||
|
?: return@forEach
|
||||||
|
val receiverReadDate =
|
||||||
|
if (receivers.size == 1) readDate
|
||||||
|
else -1
|
||||||
|
|
||||||
|
for (receiver in receivers) {
|
||||||
|
val messageRecipientObject = MessageRecipient(
|
||||||
|
profileId,
|
||||||
|
if (messageType == TYPE_SENT) getPersonId(receiver) else -1,
|
||||||
|
-1,
|
||||||
|
receiverReadDate,
|
||||||
|
id
|
||||||
|
)
|
||||||
|
data.messageRecipientList.add(messageRecipientObject)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.messageList.add(messageObject)
|
||||||
|
data.setSeenMetadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_MESSAGE,
|
||||||
|
id,
|
||||||
|
readDate > 0 || messageType == TYPE_SENT,
|
||||||
|
readDate > 0 || messageType == TYPE_SENT
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data.setSyncNext(
|
||||||
|
endpointId,
|
||||||
|
if (messageType == TYPE_RECEIVED) SYNC_ALWAYS else 1 * DAY,
|
||||||
|
if (messageType == TYPE_RECEIVED) null else DRAWER_ITEM_MESSAGES
|
||||||
|
)
|
||||||
|
onSuccess(endpointId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,62 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import org.greenrobot.eventbus.EventBus
|
||||||
|
import pl.szczodrzynski.edziennik.JsonObject
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Message
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.full.MessageFull
|
||||||
|
|
||||||
|
class VulcanHebeMessagesChangeStatus(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
private val messageObject: MessageFull,
|
||||||
|
val onSuccess: () -> Unit
|
||||||
|
) : VulcanHebe(data, null) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeMessagesChangeStatus"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
apiPost(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS,
|
||||||
|
payload = JsonObject(
|
||||||
|
"MessageId" to messageObject.id,
|
||||||
|
"LoginId" to data.studentLoginId,
|
||||||
|
"Status" to 1
|
||||||
|
)
|
||||||
|
) { _: Boolean, _ ->
|
||||||
|
|
||||||
|
if (!messageObject.seen) {
|
||||||
|
data.setSeenMetadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_MESSAGE,
|
||||||
|
messageObject.id,
|
||||||
|
true,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
)
|
||||||
|
messageObject.seen = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (messageObject.type != Message.TYPE_SENT) {
|
||||||
|
val messageRecipientObject = MessageRecipient(
|
||||||
|
profileId,
|
||||||
|
-1,
|
||||||
|
-1,
|
||||||
|
System.currentTimeMillis(),
|
||||||
|
messageObject.id
|
||||||
|
)
|
||||||
|
data.messageRecipientList.add(messageRecipientObject)
|
||||||
|
}
|
||||||
|
|
||||||
|
EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,247 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject
|
||||||
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TIMETABLE
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CANCELLED
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CHANGE
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_NORMAL
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_SOURCE
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_TARGET
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
|
||||||
|
import pl.szczodrzynski.edziennik.utils.Utils.d
|
||||||
|
import pl.szczodrzynski.edziennik.utils.models.Date
|
||||||
|
import pl.szczodrzynski.edziennik.utils.models.Week
|
||||||
|
|
||||||
|
class VulcanHebeTimetable(
|
||||||
|
override val data: DataVulcan,
|
||||||
|
override val lastSync: Long?,
|
||||||
|
val onSuccess: (endpointId: Int) -> Unit
|
||||||
|
) : VulcanHebe(data, lastSync) {
|
||||||
|
companion object {
|
||||||
|
const val TAG = "VulcanHebeTimetable"
|
||||||
|
}
|
||||||
|
|
||||||
|
private val lessonList = mutableListOf<Lesson>()
|
||||||
|
private val lessonDates = mutableSetOf<Int>()
|
||||||
|
|
||||||
|
init {
|
||||||
|
val previousWeekStart = Week.getWeekStart().stepForward(0, 0, -7)
|
||||||
|
if (Date.getToday().weekDay > 4) {
|
||||||
|
previousWeekStart.stepForward(0, 0, 7)
|
||||||
|
}
|
||||||
|
|
||||||
|
val dateFrom = data.arguments
|
||||||
|
?.getString("weekStart")
|
||||||
|
?.let { Date.fromY_m_d(it) }
|
||||||
|
?: previousWeekStart
|
||||||
|
val dateTo = dateFrom.clone().stepForward(0, 0, 13)
|
||||||
|
|
||||||
|
val lastSync = null
|
||||||
|
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_TIMETABLE,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
dateFrom = dateFrom,
|
||||||
|
dateTo = dateTo,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { lessons, _ ->
|
||||||
|
apiGetList(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES,
|
||||||
|
HebeFilterType.BY_PUPIL,
|
||||||
|
dateFrom = dateFrom,
|
||||||
|
dateTo = dateTo,
|
||||||
|
lastSync = lastSync
|
||||||
|
) { changes, _ ->
|
||||||
|
processData(lessons, changes)
|
||||||
|
|
||||||
|
// cancel lesson changes when caused by a shift
|
||||||
|
for (lesson in lessonList) {
|
||||||
|
if (lesson.type != TYPE_SHIFTED_TARGET)
|
||||||
|
continue
|
||||||
|
lessonList.firstOrNull {
|
||||||
|
it.oldDate == lesson.date
|
||||||
|
&& it.oldLessonNumber == lesson.lessonNumber
|
||||||
|
&& it.type == TYPE_CHANGE
|
||||||
|
}?.let {
|
||||||
|
it.type = TYPE_CANCELLED
|
||||||
|
it.date = null
|
||||||
|
it.lessonNumber = null
|
||||||
|
it.startTime = null
|
||||||
|
it.endTime = null
|
||||||
|
it.subjectId = null
|
||||||
|
it.teacherId = null
|
||||||
|
it.teamId = null
|
||||||
|
it.classroom = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// add TYPE_NO_LESSONS to empty dates
|
||||||
|
val date: Date = dateFrom.clone()
|
||||||
|
while (date <= dateTo) {
|
||||||
|
if (!lessonDates.contains(date.value)) {
|
||||||
|
lessonList.add(Lesson(profileId, date.value.toLong()).apply {
|
||||||
|
this.type = Lesson.TYPE_NO_LESSONS
|
||||||
|
this.date = date.clone()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
date.stepForward(0, 0, 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
d(
|
||||||
|
TAG,
|
||||||
|
"Clearing lessons between ${dateFrom.stringY_m_d} and ${dateTo.stringY_m_d}"
|
||||||
|
)
|
||||||
|
|
||||||
|
data.lessonList.addAll(lessonList)
|
||||||
|
|
||||||
|
data.setSyncNext(ENDPOINT_VULCAN_HEBE_TIMETABLE, SYNC_ALWAYS)
|
||||||
|
onSuccess(ENDPOINT_VULCAN_HEBE_TIMETABLE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun buildLesson(changes: List<JsonObject>, json: JsonObject): Pair<Lesson, Lesson?>? {
|
||||||
|
val lesson = Lesson(profileId, -1)
|
||||||
|
var lessonShift: Lesson? = null
|
||||||
|
|
||||||
|
val lessonDate = getDate(json, "Date") ?: return null
|
||||||
|
val lessonRange = getLessonRange(json, "TimeSlot")
|
||||||
|
val startTime = lessonRange?.startTime
|
||||||
|
val endTime = lessonRange?.endTime
|
||||||
|
val teacherId = getTeacherId(json, "TeacherPrimary")
|
||||||
|
val classroom = json.getJsonObject("Room").getString("Code")
|
||||||
|
val subjectId = getSubjectId(json, "Subject")
|
||||||
|
|
||||||
|
val teamId = getTeamId(json, "Distribution")
|
||||||
|
?: getClassId(json, "Clazz")
|
||||||
|
?: data.teamClass?.id
|
||||||
|
?: -1
|
||||||
|
|
||||||
|
val change = json.getJsonObject("Change")
|
||||||
|
val changeId = change.getInt("Id")
|
||||||
|
val type = when (change.getInt("Type")) {
|
||||||
|
1 -> TYPE_CANCELLED
|
||||||
|
2 -> TYPE_CHANGE
|
||||||
|
3 -> TYPE_SHIFTED_SOURCE
|
||||||
|
4 -> TYPE_CANCELLED // TODO: 2021-02-21 add showing cancellation reason
|
||||||
|
else -> TYPE_NORMAL
|
||||||
|
}
|
||||||
|
|
||||||
|
lesson.type = type
|
||||||
|
if (type == TYPE_NORMAL) {
|
||||||
|
lesson.date = lessonDate
|
||||||
|
lesson.lessonNumber = lessonRange?.lessonNumber
|
||||||
|
lesson.startTime = startTime
|
||||||
|
lesson.endTime = endTime
|
||||||
|
lesson.subjectId = subjectId
|
||||||
|
lesson.teacherId = teacherId
|
||||||
|
lesson.teamId = teamId
|
||||||
|
lesson.classroom = classroom
|
||||||
|
} else {
|
||||||
|
lesson.oldDate = lessonDate
|
||||||
|
lesson.oldLessonNumber = lessonRange?.lessonNumber
|
||||||
|
lesson.oldStartTime = startTime
|
||||||
|
lesson.oldEndTime = endTime
|
||||||
|
lesson.oldSubjectId = subjectId
|
||||||
|
lesson.oldTeacherId = teacherId
|
||||||
|
lesson.oldTeamId = teamId
|
||||||
|
lesson.oldClassroom = classroom
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type == TYPE_CHANGE || type == TYPE_SHIFTED_SOURCE) {
|
||||||
|
val changeJson = changes.firstOrNull {
|
||||||
|
it.getInt("Id") == changeId
|
||||||
|
} ?: return lesson to null
|
||||||
|
|
||||||
|
val changeLessonDate = getDate(changeJson, "LessonDate") ?: return lesson to null
|
||||||
|
val changeLessonRange = getLessonRange(changeJson, "TimeSlot") ?: lessonRange
|
||||||
|
val changeStartTime = changeLessonRange?.startTime
|
||||||
|
val changeEndTime = changeLessonRange?.endTime
|
||||||
|
val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId
|
||||||
|
val changeClassroom = changeJson.getJsonObject("Room").getString("Code") ?: classroom
|
||||||
|
val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId
|
||||||
|
|
||||||
|
val changeTeamId = getTeamId(json, "Distribution")
|
||||||
|
?: getClassId(json, "Clazz")
|
||||||
|
?: teamId
|
||||||
|
|
||||||
|
if (type != TYPE_CHANGE) {
|
||||||
|
/* lesson shifted */
|
||||||
|
lessonShift = Lesson(profileId, -1)
|
||||||
|
lessonShift.type = TYPE_SHIFTED_TARGET
|
||||||
|
|
||||||
|
// update source lesson with the target lesson date
|
||||||
|
lesson.date = changeLessonDate
|
||||||
|
lesson.lessonNumber = changeLessonRange?.lessonNumber
|
||||||
|
lesson.startTime = changeStartTime
|
||||||
|
lesson.endTime = changeEndTime
|
||||||
|
// update target lesson with the source lesson date
|
||||||
|
lessonShift.oldDate = lessonDate
|
||||||
|
lessonShift.oldLessonNumber = lessonRange?.lessonNumber
|
||||||
|
lessonShift.oldStartTime = startTime
|
||||||
|
lessonShift.oldEndTime = endTime
|
||||||
|
}
|
||||||
|
|
||||||
|
(if (type == TYPE_CHANGE) lesson else lessonShift)
|
||||||
|
?.apply {
|
||||||
|
this.date = changeLessonDate
|
||||||
|
this.lessonNumber = changeLessonRange?.lessonNumber
|
||||||
|
this.startTime = changeStartTime
|
||||||
|
this.endTime = changeEndTime
|
||||||
|
this.subjectId = changeSubjectId
|
||||||
|
this.teacherId = changeTeacherId
|
||||||
|
this.teamId = changeTeamId
|
||||||
|
this.classroom = changeClassroom
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return lesson to lessonShift
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun processData(lessons: List<JsonObject>, changes: List<JsonObject>) {
|
||||||
|
lessons.forEach { lessonJson ->
|
||||||
|
if (lessonJson.getBoolean("Visible") != true)
|
||||||
|
return@forEach
|
||||||
|
|
||||||
|
val lessonPair = buildLesson(changes, lessonJson) ?: return@forEach
|
||||||
|
val (lessonObject, lessonShift) = lessonPair
|
||||||
|
|
||||||
|
when {
|
||||||
|
lessonShift != null -> lessonShift
|
||||||
|
lessonObject.type != TYPE_NORMAL -> lessonObject
|
||||||
|
else -> null
|
||||||
|
}?.let { lesson ->
|
||||||
|
val lessonDate = lesson.displayDate ?: return@let
|
||||||
|
val seen = profile?.empty ?: true || lessonDate < Date.getToday()
|
||||||
|
data.metadataList.add(
|
||||||
|
Metadata(
|
||||||
|
profileId,
|
||||||
|
Metadata.TYPE_LESSON_CHANGE,
|
||||||
|
lesson.id,
|
||||||
|
seen,
|
||||||
|
seen
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
lessonObject.id = lessonObject.buildId()
|
||||||
|
lessonShift?.id = lessonShift?.buildId() ?: -1
|
||||||
|
|
||||||
|
lessonList.add(lessonObject)
|
||||||
|
lessonShift?.let { lessonList.add(it) }
|
||||||
|
|
||||||
|
lessonObject.displayDate?.let { lessonDates.add(it.value) }
|
||||||
|
lessonShift?.displayDate?.let { lessonDates.add(it.value) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -9,9 +9,12 @@ import pl.szczodrzynski.edziennik.*
|
|||||||
import pl.szczodrzynski.edziennik.data.api.*
|
import pl.szczodrzynski.edziennik.data.api.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMain
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
|
||||||
|
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.edziennik.vulcan.login.VulcanLoginWebMain
|
||||||
import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
|
import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
|
||||||
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
@ -25,6 +28,7 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
|
|
||||||
private val api = VulcanApi(data, null)
|
private val api = VulcanApi(data, null)
|
||||||
private val web = VulcanWebMain(data, null)
|
private val web = VulcanWebMain(data, null)
|
||||||
|
private val hebe = VulcanHebe(data, null)
|
||||||
private val profileList = mutableListOf<Profile>()
|
private val profileList = mutableListOf<Profile>()
|
||||||
private val loginStoreId = data.loginStore.id
|
private val loginStoreId = data.loginStore.id
|
||||||
private var firstProfileId = loginStoreId
|
private var firstProfileId = loginStoreId
|
||||||
@ -50,12 +54,18 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
checkSymbol(certificate)
|
checkSymbol(certificate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else if (data.loginStore.mode == LOGIN_MODE_VULCAN_API) {
|
||||||
registerDevice {
|
registerDevice {
|
||||||
EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
|
EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
|
||||||
onSuccess()
|
onSuccess()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
registerDeviceHebe {
|
||||||
|
EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkSymbol(certificate: CufsCertificate) {
|
private fun checkSymbol(certificate: CufsCertificate) {
|
||||||
@ -103,7 +113,7 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
data.apiPin = data.apiPin.toMutableMap().also {
|
data.apiPin = data.apiPin.toMutableMap().also {
|
||||||
it[symbol] = json.getString("PIN")
|
it[symbol] = json.getString("PIN")
|
||||||
}
|
}
|
||||||
registerDevice(onSuccess)
|
registerDeviceHebe(onSuccess)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -197,4 +207,21 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun registerDeviceHebe(onSuccess: () -> Unit) {
|
||||||
|
VulcanLoginHebe(data) {
|
||||||
|
VulcanHebeMain(data).getStudents(
|
||||||
|
profile = null,
|
||||||
|
profileList,
|
||||||
|
loginStoreId,
|
||||||
|
firstProfileId,
|
||||||
|
onEmpty = {
|
||||||
|
EventBus.getDefault()
|
||||||
|
.postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
|
||||||
|
onSuccess()
|
||||||
|
},
|
||||||
|
onSuccess = onSuccess
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
|
|||||||
|
|
||||||
import pl.szczodrzynski.edziennik.R
|
import pl.szczodrzynski.edziennik.R
|
||||||
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE
|
||||||
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
|
import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
|
||||||
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils
|
import pl.szczodrzynski.edziennik.utils.Utils
|
||||||
@ -54,6 +55,10 @@ class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
data.startProgress(R.string.edziennik_progress_login_vulcan_api)
|
data.startProgress(R.string.edziennik_progress_login_vulcan_api)
|
||||||
VulcanLoginApi(data) { onSuccess(loginMethodId) }
|
VulcanLoginApi(data) { onSuccess(loginMethodId) }
|
||||||
}
|
}
|
||||||
|
LOGIN_METHOD_VULCAN_HEBE -> {
|
||||||
|
data.startProgress(R.string.edziennik_progress_login_vulcan_api)
|
||||||
|
VulcanLoginHebe(data) { onSuccess(loginMethodId) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -191,18 +191,6 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val deviceId = data.app.deviceId.padStart(16, '0')
|
|
||||||
val loginStoreId = data.loginStore.id.toString(16).padStart(4, '0')
|
|
||||||
val symbol = data.symbol?.crc16()?.toString(16)?.take(2) ?: "00"
|
|
||||||
val uuid =
|
|
||||||
deviceId.substring(0..7) +
|
|
||||||
"-" + deviceId.substring(8..11) +
|
|
||||||
"-" + deviceId.substring(12..15) +
|
|
||||||
"-" + loginStoreId +
|
|
||||||
"-" + symbol + "6f72616e7a"
|
|
||||||
|
|
||||||
val deviceNameSuffix = " - nie usuwać"
|
|
||||||
|
|
||||||
val szkolnyApi = SzkolnyApi(data.app)
|
val szkolnyApi = SzkolnyApi(data.app)
|
||||||
val firebaseToken = szkolnyApi.runCatching({
|
val firebaseToken = szkolnyApi.runCatching({
|
||||||
getFirebaseToken("vulcan")
|
getFirebaseToken("vulcan")
|
||||||
@ -216,8 +204,8 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
|
|||||||
.addHeader("RequestMobileType", "RegisterDevice")
|
.addHeader("RequestMobileType", "RegisterDevice")
|
||||||
.addParameter("PIN", data.apiPin[data.symbol])
|
.addParameter("PIN", data.apiPin[data.symbol])
|
||||||
.addParameter("TokenKey", data.apiToken[data.symbol])
|
.addParameter("TokenKey", data.apiToken[data.symbol])
|
||||||
.addParameter("DeviceId", uuid)
|
.addParameter("DeviceId", data.buildDeviceId())
|
||||||
.addParameter("DeviceName", VULCAN_API_DEVICE_NAME.take(50 - deviceNameSuffix.length) + deviceNameSuffix)
|
.addParameter("DeviceName", VULCAN_API_DEVICE_NAME)
|
||||||
.addParameter("DeviceNameUser", "")
|
.addParameter("DeviceNameUser", "")
|
||||||
.addParameter("DeviceDescription", "")
|
.addParameter("DeviceDescription", "")
|
||||||
.addParameter("DeviceSystemType", "Android")
|
.addParameter("DeviceSystemType", "Android")
|
||||||
|
@ -0,0 +1,106 @@
|
|||||||
|
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject
|
||||||
|
import io.github.wulkanowy.signer.hebe.generateKeyPair
|
||||||
|
import pl.szczodrzynski.edziennik.JsonObject
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_API_DEVICE_NAME
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_REGISTER_NEW
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
|
||||||
|
import pl.szczodrzynski.edziennik.getString
|
||||||
|
import pl.szczodrzynski.edziennik.isNotNullNorEmpty
|
||||||
|
|
||||||
|
class VulcanLoginHebe(val data: DataVulcan, val onSuccess: () -> Unit) {
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "VulcanLoginHebe"
|
||||||
|
}
|
||||||
|
|
||||||
|
init { run {
|
||||||
|
// i'm sure this does something useful
|
||||||
|
// not quite sure what, though
|
||||||
|
if (data.studentSemesterNumber == 1 && data.semester1Id == 0)
|
||||||
|
data.semester1Id = data.studentSemesterNumber
|
||||||
|
if (data.studentSemesterNumber == 2 && data.semester2Id == 0)
|
||||||
|
data.semester2Id = data.studentSemesterNumber
|
||||||
|
|
||||||
|
copyFromLoginStore()
|
||||||
|
|
||||||
|
if (data.profile != null && data.isApiLoginValid()) {
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
|
||||||
|
loginWithToken()
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
|
||||||
|
private fun copyFromLoginStore() {
|
||||||
|
data.loginStore.data.apply {
|
||||||
|
// map form inputs to the symbol
|
||||||
|
if (has("symbol")) {
|
||||||
|
data.symbol = getString("symbol")
|
||||||
|
remove("symbol")
|
||||||
|
}
|
||||||
|
if (has("deviceToken")) {
|
||||||
|
data.apiToken = data.apiToken.toMutableMap().also {
|
||||||
|
it[data.symbol] = getString("deviceToken")
|
||||||
|
}
|
||||||
|
remove("deviceToken")
|
||||||
|
}
|
||||||
|
if (has("devicePin")) {
|
||||||
|
data.apiPin = data.apiPin.toMutableMap().also {
|
||||||
|
it[data.symbol] = getString("devicePin")
|
||||||
|
}
|
||||||
|
remove("devicePin")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun loginWithToken() {
|
||||||
|
val szkolnyApi = SzkolnyApi(data.app)
|
||||||
|
val hebe = VulcanHebe(data, null)
|
||||||
|
|
||||||
|
if (data.hebePublicKey == null || data.hebePrivateKey == null || data.hebePublicHash == null) {
|
||||||
|
val (publicPem, privatePem, publicHash) = generateKeyPair()
|
||||||
|
data.hebePublicKey = publicPem
|
||||||
|
data.hebePrivateKey = privatePem
|
||||||
|
data.hebePublicHash = publicHash
|
||||||
|
}
|
||||||
|
|
||||||
|
val firebaseToken = szkolnyApi.runCatching({
|
||||||
|
getFirebaseToken("vulcan")
|
||||||
|
}, onError = {
|
||||||
|
// screw errors
|
||||||
|
}) ?: data.app.config.sync.tokenVulcan
|
||||||
|
|
||||||
|
hebe.apiPost(
|
||||||
|
TAG,
|
||||||
|
VULCAN_HEBE_ENDPOINT_REGISTER_NEW,
|
||||||
|
payload = JsonObject(
|
||||||
|
"OS" to "Android",
|
||||||
|
"PIN" to data.apiPin[data.symbol],
|
||||||
|
"Certificate" to data.hebePublicKey,
|
||||||
|
"CertificateType" to "RSA_PEM",
|
||||||
|
"DeviceModel" to VULCAN_API_DEVICE_NAME,
|
||||||
|
"SecurityToken" to data.apiToken[data.symbol],
|
||||||
|
"SelfIdentifier" to data.buildDeviceId(),
|
||||||
|
"CertificateThumbprint" to data.hebePublicHash
|
||||||
|
),
|
||||||
|
baseUrl = true,
|
||||||
|
firebaseToken = firebaseToken
|
||||||
|
) { _: JsonObject, _ ->
|
||||||
|
data.apiToken = data.apiToken.toMutableMap().also {
|
||||||
|
it[data.symbol] = it[data.symbol]?.substring(0, 3)
|
||||||
|
}
|
||||||
|
data.loginStore.removeLoginData("apiPin")
|
||||||
|
onSuccess()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -46,6 +46,6 @@ object Signing {
|
|||||||
|
|
||||||
/*fun provideKey(param1: String, param2: Long): ByteArray {*/
|
/*fun provideKey(param1: String, param2: Long): ByteArray {*/
|
||||||
fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
|
fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
|
||||||
return "$param1.MTIzNDU2Nzg5MDzyYb9Lof===.$param2".sha256()
|
return "$param1.MTIzNDU2Nzg5MD5LwH9bSc===.$param2".sha256()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -167,7 +167,7 @@ class CrashActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
|
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
|
||||||
clipboard?.apply {
|
clipboard?.apply {
|
||||||
val clip = ClipData.newPlainText(getString(R.string.customactivityoncrash_error_activity_error_details_clipboard_label), errorInformation)
|
val clip = ClipData.newPlainText(getString(R.string.customactivityoncrash_error_activity_error_details_clipboard_label), errorInformation)
|
||||||
primaryClip = clip
|
setPrimaryClip(clip)
|
||||||
Toast.makeText(this@CrashActivity, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
|
Toast.makeText(this@CrashActivity, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ import kotlin.coroutines.CoroutineContext
|
|||||||
class LoginActivity : AppCompatActivity(), CoroutineScope {
|
class LoginActivity : AppCompatActivity(), CoroutineScope {
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "LoginActivity"
|
private const val TAG = "LoginActivity"
|
||||||
var thisOneIsTricky = 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private val app: App by lazy { applicationContext as App }
|
private val app: App by lazy { applicationContext as App }
|
||||||
@ -42,6 +41,8 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
val profiles = mutableListOf<LoginSummaryAdapter.Item>()
|
val profiles = mutableListOf<LoginSummaryAdapter.Item>()
|
||||||
val loginStores = mutableListOf<LoginStore>()
|
val loginStores = mutableListOf<LoginStore>()
|
||||||
|
|
||||||
|
fun getRootView() = b.root
|
||||||
|
|
||||||
override fun onBackPressed() {
|
override fun onBackPressed() {
|
||||||
val destination = nav.currentDestination ?: run {
|
val destination = nav.currentDestination ?: run {
|
||||||
nav.navigateUp()
|
nav.navigateUp()
|
||||||
@ -55,6 +56,11 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
return
|
return
|
||||||
if (destination.id == R.id.loginFinishFragment)
|
if (destination.id == R.id.loginFinishFragment)
|
||||||
return
|
return
|
||||||
|
// eggs
|
||||||
|
if (destination.id == R.id.loginPrizeFragment) {
|
||||||
|
finish()
|
||||||
|
return
|
||||||
|
}
|
||||||
if (destination.id == R.id.loginChooserFragment && loginStores.isEmpty()) {
|
if (destination.id == R.id.loginChooserFragment && loginStores.isEmpty()) {
|
||||||
setResult(Activity.RESULT_CANCELED)
|
setResult(Activity.RESULT_CANCELED)
|
||||||
finish()
|
finish()
|
||||||
@ -79,8 +85,6 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setTheme(R.style.AppTheme_Light)
|
setTheme(R.style.AppTheme_Light)
|
||||||
|
|
||||||
thisOneIsTricky = -1
|
|
||||||
|
|
||||||
navOptions = NavOptions.Builder()
|
navOptions = NavOptions.Builder()
|
||||||
.setEnterAnim(R.anim.slide_in_right)
|
.setEnterAnim(R.anim.slide_in_right)
|
||||||
.setExitAnim(R.anim.slide_out_left)
|
.setExitAnim(R.anim.slide_out_left)
|
||||||
|
@ -60,7 +60,8 @@ class LoginChooserAdapter(
|
|||||||
|
|
||||||
private val onClickListener = View.OnClickListener { view ->
|
private val onClickListener = View.OnClickListener { view ->
|
||||||
val model = view.getTag(R.string.tag_key_model)
|
val model = view.getTag(R.string.tag_key_model)
|
||||||
if (model is LoginInfo.Register && model.loginModes.size == 1) {
|
if (model is LoginInfo.Register
|
||||||
|
&& model.loginModes.count { App.devMode || !it.isDevOnly } == 1) {
|
||||||
onModeClick?.invoke(model, model.loginModes.first())
|
onModeClick?.invoke(model, model.loginModes.first())
|
||||||
return@OnClickListener
|
return@OnClickListener
|
||||||
}
|
}
|
||||||
@ -85,7 +86,9 @@ class LoginChooserAdapter(
|
|||||||
|
|
||||||
if (model.state == STATE_CLOSED) {
|
if (model.state == STATE_CLOSED) {
|
||||||
|
|
||||||
val subItems = model.items
|
val subItems = model.items.filter {
|
||||||
|
App.devMode || !it.isDevOnly
|
||||||
|
}
|
||||||
|
|
||||||
model.state = STATE_OPENED
|
model.state = STATE_OPENED
|
||||||
items.addAll(position + 1, subItems)
|
items.addAll(position + 1, subItems)
|
||||||
|
@ -4,15 +4,22 @@
|
|||||||
|
|
||||||
package pl.szczodrzynski.edziennik.ui.modules.login
|
package pl.szczodrzynski.edziennik.ui.modules.login
|
||||||
|
|
||||||
|
import android.animation.ValueAnimator
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.graphics.Color
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import android.view.animation.AccelerateDecelerateInterpolator
|
||||||
|
import android.view.animation.Animation
|
||||||
|
import android.view.animation.RotateAnimation
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import pl.szczodrzynski.edziennik.*
|
import pl.szczodrzynski.edziennik.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.*
|
import pl.szczodrzynski.edziennik.data.api.*
|
||||||
@ -26,6 +33,8 @@ import kotlin.coroutines.CoroutineContext
|
|||||||
class LoginChooserFragment : Fragment(), CoroutineScope {
|
class LoginChooserFragment : Fragment(), CoroutineScope {
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "LoginChooserFragment"
|
private const val TAG = "LoginChooserFragment"
|
||||||
|
// eggs
|
||||||
|
var isRotated = false
|
||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var app: App
|
private lateinit var app: App
|
||||||
@ -47,31 +56,33 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
|
|||||||
return b.root
|
return b.root
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
if (!isAdded) return
|
if (!isAdded) return
|
||||||
|
|
||||||
val adapter = LoginChooserAdapter(activity) { loginType, loginMode ->
|
val adapter = LoginChooserAdapter(activity, this::onLoginModeClicked)
|
||||||
launch {
|
|
||||||
if (!checkAvailability(loginType.loginType))
|
|
||||||
return@launch
|
|
||||||
|
|
||||||
if (loginMode.isPlatformSelection) {
|
|
||||||
nav.navigate(R.id.loginPlatformListFragment, Bundle(
|
|
||||||
"loginType" to loginType.loginType,
|
|
||||||
"loginMode" to loginMode.loginMode
|
|
||||||
), activity.navOptions)
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
|
|
||||||
nav.navigate(R.id.loginFormFragment, Bundle(
|
|
||||||
"loginType" to loginType.loginType,
|
|
||||||
"loginMode" to loginMode.loginMode
|
|
||||||
), activity.navOptions)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LoginInfo.chooserList = LoginInfo.chooserList
|
LoginInfo.chooserList = LoginInfo.chooserList
|
||||||
?: LoginInfo.list.toMutableList<Any>()
|
?: LoginInfo.list.toMutableList()
|
||||||
|
|
||||||
|
// eggs
|
||||||
|
if (isRotated) {
|
||||||
|
isRotated = false
|
||||||
|
LoginFormFragment.wantEggs = false
|
||||||
|
LoginInfo.chooserList = LoginInfo.list.toMutableList()
|
||||||
|
val anim = RotateAnimation(
|
||||||
|
180f,
|
||||||
|
0f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f
|
||||||
|
)
|
||||||
|
anim.interpolator = AccelerateDecelerateInterpolator()
|
||||||
|
anim.duration = 500
|
||||||
|
anim.fillAfter = true
|
||||||
|
activity.getRootView().startAnimation(anim)
|
||||||
|
}
|
||||||
|
|
||||||
adapter.items = LoginInfo.chooserList!!
|
adapter.items = LoginInfo.chooserList!!
|
||||||
b.list.adapter = adapter
|
b.list.adapter = adapter
|
||||||
@ -85,6 +96,81 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
|
|||||||
startActivity(Intent(activity, FeedbackActivity::class.java))
|
startActivity(Intent(activity, FeedbackActivity::class.java))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eggs
|
||||||
|
b.footnoteText.onClick {
|
||||||
|
if (!LoginFormFragment.wantEggs || isRotated)
|
||||||
|
return@onClick
|
||||||
|
|
||||||
|
val text = b.subtitleText.text.toString()
|
||||||
|
if (text.endsWith(".."))
|
||||||
|
b.subtitleText.text = text.substring(0, text.length - 2)
|
||||||
|
else
|
||||||
|
b.subtitleText.text = "$text..."
|
||||||
|
}
|
||||||
|
var clickCount = 0
|
||||||
|
val color = R.color.md_blue_500.resolveColor(app)
|
||||||
|
val hsv = FloatArray(3)
|
||||||
|
Color.colorToHSV(color, hsv)
|
||||||
|
val hueOriginal = hsv[0]
|
||||||
|
b.subtitleText.onClick {
|
||||||
|
if (isRotated)
|
||||||
|
return@onClick
|
||||||
|
val text = b.subtitleText.text.toString()
|
||||||
|
if (text.endsWith("..") && !text.endsWith("...")) {
|
||||||
|
clickCount++
|
||||||
|
}
|
||||||
|
if (clickCount == 5) {
|
||||||
|
val anim = ValueAnimator.ofFloat(0f, 1f)
|
||||||
|
anim.duration = 5000
|
||||||
|
anim.addUpdateListener {
|
||||||
|
hsv[0] = hueOriginal + it.animatedFraction * 3f * 360f
|
||||||
|
hsv[0] = hsv[0] % 360f
|
||||||
|
b.topLogo.drawable.setTintColor(Color.HSVToColor(Color.alpha(color), hsv))
|
||||||
|
}
|
||||||
|
anim.start()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b.topLogo.onClick {
|
||||||
|
if (clickCount != 5 || isRotated) {
|
||||||
|
clickCount = 0
|
||||||
|
return@onClick
|
||||||
|
}
|
||||||
|
isRotated = true
|
||||||
|
val anim = RotateAnimation(
|
||||||
|
0f,
|
||||||
|
180f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f
|
||||||
|
)
|
||||||
|
anim.interpolator = AccelerateDecelerateInterpolator()
|
||||||
|
anim.duration = 2000
|
||||||
|
anim.fillAfter = true
|
||||||
|
activity.getRootView().startAnimation(anim)
|
||||||
|
|
||||||
|
b.list.smoothScrollToPosition(0)
|
||||||
|
adapter.items.add(
|
||||||
|
LoginInfo.Register(
|
||||||
|
loginType = 74,
|
||||||
|
internalName = "eggs",
|
||||||
|
registerName = R.string.eggs,
|
||||||
|
registerLogo = R.drawable.face_1,
|
||||||
|
loginModes = listOf(
|
||||||
|
LoginInfo.Mode(
|
||||||
|
loginMode = 0,
|
||||||
|
name = 0,
|
||||||
|
icon = 0,
|
||||||
|
guideText = 0,
|
||||||
|
credentials = listOf(),
|
||||||
|
errorCodes = mapOf()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
adapter.notifyItemInserted(adapter.items.size - 1)
|
||||||
|
}
|
||||||
|
|
||||||
when {
|
when {
|
||||||
activity.loginStores.isNotEmpty() -> {
|
activity.loginStores.isNotEmpty() -> {
|
||||||
// we are navigated here from LoginSummary
|
// we are navigated here from LoginSummary
|
||||||
@ -106,6 +192,50 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun onLoginModeClicked(
|
||||||
|
loginType: LoginInfo.Register,
|
||||||
|
loginMode: LoginInfo.Mode
|
||||||
|
) {
|
||||||
|
if (loginType.internalName == "eggs") {
|
||||||
|
nav.navigate(R.id.loginEggsFragment, null, activity.navOptions)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
launch {
|
||||||
|
if (!checkAvailability(loginType.loginType))
|
||||||
|
return@launch
|
||||||
|
|
||||||
|
if (loginMode.isTesting || loginMode.isDevOnly) {
|
||||||
|
MaterialAlertDialogBuilder(activity)
|
||||||
|
.setTitle(R.string.login_chooser_testing_title)
|
||||||
|
.setMessage(R.string.login_chooser_testing_text)
|
||||||
|
.setPositiveButton(R.string.ok) { _, _ ->
|
||||||
|
navigateToLoginMode(loginType, loginMode)
|
||||||
|
}
|
||||||
|
.setNegativeButton(R.string.cancel, null)
|
||||||
|
.show()
|
||||||
|
return@launch
|
||||||
|
}
|
||||||
|
|
||||||
|
navigateToLoginMode(loginType, loginMode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun navigateToLoginMode(loginType: LoginInfo.Register, loginMode: LoginInfo.Mode) {
|
||||||
|
if (loginMode.isPlatformSelection) {
|
||||||
|
nav.navigate(R.id.loginPlatformListFragment, Bundle(
|
||||||
|
"loginType" to loginType.loginType,
|
||||||
|
"loginMode" to loginMode.loginMode
|
||||||
|
), activity.navOptions)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
nav.navigate(R.id.loginFormFragment, Bundle(
|
||||||
|
"loginType" to loginType.loginType,
|
||||||
|
"loginMode" to loginMode.loginMode
|
||||||
|
), activity.navOptions)
|
||||||
|
}
|
||||||
|
|
||||||
private suspend fun checkAvailability(loginType: Int): Boolean {
|
private suspend fun checkAvailability(loginType: Int): Boolean {
|
||||||
when (loginType) {
|
when (loginType) {
|
||||||
LOGIN_TYPE_LIBRUS -> "librus"
|
LOGIN_TYPE_LIBRUS -> "librus"
|
||||||
|
@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Kuba Szczodrzyński 2020-10-18.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package pl.szczodrzynski.edziennik.ui.modules.login
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.view.animation.AccelerateDecelerateInterpolator
|
||||||
|
import android.view.animation.Animation
|
||||||
|
import android.view.animation.RotateAnimation
|
||||||
|
import android.webkit.JavascriptInterface
|
||||||
|
import android.webkit.WebView
|
||||||
|
import android.webkit.WebViewClient
|
||||||
|
import android.widget.FrameLayout
|
||||||
|
import androidx.fragment.app.Fragment
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import pl.szczodrzynski.edziennik.App
|
||||||
|
import pl.szczodrzynski.edziennik.BuildConfig
|
||||||
|
import pl.szczodrzynski.edziennik.R
|
||||||
|
import pl.szczodrzynski.edziennik.md5
|
||||||
|
import kotlin.coroutines.CoroutineContext
|
||||||
|
|
||||||
|
class LoginEggsFragment : Fragment(), CoroutineScope {
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "LoginEggsFragment"
|
||||||
|
}
|
||||||
|
|
||||||
|
private lateinit var app: App
|
||||||
|
private lateinit var activity: LoginActivity
|
||||||
|
private lateinit var view: ViewGroup
|
||||||
|
private lateinit var webView: WebView
|
||||||
|
private val nav by lazy { activity.nav }
|
||||||
|
|
||||||
|
private val job: Job = Job()
|
||||||
|
override val coroutineContext: CoroutineContext
|
||||||
|
get() = job + Dispatchers.Main
|
||||||
|
|
||||||
|
// local/private variables go here
|
||||||
|
|
||||||
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
activity = (getActivity() as LoginActivity?) ?: return null
|
||||||
|
context ?: return null
|
||||||
|
app = activity.application as App
|
||||||
|
webView = WebView(activity)
|
||||||
|
view = FrameLayout(activity)
|
||||||
|
view.addView(webView)
|
||||||
|
return view
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
if (!isAdded) return
|
||||||
|
|
||||||
|
if (!LoginChooserFragment.isRotated) {
|
||||||
|
nav.navigateUp()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val anim = RotateAnimation(
|
||||||
|
180f,
|
||||||
|
0f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f
|
||||||
|
)
|
||||||
|
anim.interpolator = AccelerateDecelerateInterpolator()
|
||||||
|
anim.duration = 10
|
||||||
|
anim.fillAfter = true
|
||||||
|
activity.getRootView().startAnimation(anim)
|
||||||
|
|
||||||
|
webView.apply {
|
||||||
|
settings.apply {
|
||||||
|
javaScriptEnabled = true
|
||||||
|
}
|
||||||
|
addJavascriptInterface(object : Any() {
|
||||||
|
@Suppress("NAME_SHADOWING")
|
||||||
|
@JavascriptInterface
|
||||||
|
fun getPrize() {
|
||||||
|
val anim = RotateAnimation(
|
||||||
|
0f,
|
||||||
|
180f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF,
|
||||||
|
0.5f
|
||||||
|
)
|
||||||
|
anim.interpolator = AccelerateDecelerateInterpolator()
|
||||||
|
anim.duration = 10
|
||||||
|
anim.fillAfter = true
|
||||||
|
activity.getRootView().startAnimation(anim)
|
||||||
|
nav.navigate(R.id.loginPrizeFragment, null, activity.navOptions)
|
||||||
|
}
|
||||||
|
}, "EggInterface")
|
||||||
|
loadUrl("https://szkolny.eu/game/runner.html")
|
||||||
|
webViewClient = object : WebViewClient() {
|
||||||
|
override fun onPageFinished(view: WebView?, url: String?) {
|
||||||
|
super.onPageFinished(view, url)
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
||||||
|
val deviceId = app.deviceId.md5()
|
||||||
|
val version = BuildConfig.VERSION_NAME
|
||||||
|
val js = """initPage("$deviceId", true, "$version");"""
|
||||||
|
webView.evaluateJavascript(js) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -32,6 +32,8 @@ import kotlin.coroutines.CoroutineContext
|
|||||||
class LoginFormFragment : Fragment(), CoroutineScope {
|
class LoginFormFragment : Fragment(), CoroutineScope {
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "LoginFormFragment"
|
private const val TAG = "LoginFormFragment"
|
||||||
|
// eggs
|
||||||
|
var wantEggs = false
|
||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var app: App
|
private lateinit var app: App
|
||||||
@ -108,8 +110,13 @@ class LoginFormFragment : Fragment(), CoroutineScope {
|
|||||||
if (credential is LoginInfo.FormCheckbox) {
|
if (credential is LoginInfo.FormCheckbox) {
|
||||||
val b = LoginFormCheckboxItemBinding.inflate(layoutInflater)
|
val b = LoginFormCheckboxItemBinding.inflate(layoutInflater)
|
||||||
b.checkbox.text = app.getString(credential.name)
|
b.checkbox.text = app.getString(credential.name)
|
||||||
b.checkbox.onChange { _, _ ->
|
b.checkbox.onChange { _, isChecked ->
|
||||||
b.errorText.text = null
|
b.errorText.text = null
|
||||||
|
|
||||||
|
// eggs
|
||||||
|
if (register.internalName == "podlasie") {
|
||||||
|
wantEggs = !isChecked
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (arguments?.containsKey(credential.keyName) == true) {
|
if (arguments?.containsKey(credential.keyName) == true) {
|
||||||
b.checkbox.isChecked = arguments?.getBoolean(credential.keyName) == true
|
b.checkbox.isChecked = arguments?.getBoolean(credential.keyName) == true
|
||||||
|
@ -131,9 +131,9 @@ object LoginInfo {
|
|||||||
registerLogo = R.drawable.login_logo_vulcan,
|
registerLogo = R.drawable.login_logo_vulcan,
|
||||||
loginModes = listOf(
|
loginModes = listOf(
|
||||||
Mode(
|
Mode(
|
||||||
loginMode = LOGIN_MODE_VULCAN_API,
|
loginMode = LOGIN_MODE_VULCAN_HEBE,
|
||||||
name = R.string.login_mode_vulcan_api,
|
name = R.string.login_mode_vulcan_api,
|
||||||
icon = R.drawable.login_mode_vulcan_api,
|
icon = R.drawable.login_mode_vulcan_hebe,
|
||||||
hintText = R.string.login_mode_vulcan_api_hint,
|
hintText = R.string.login_mode_vulcan_api_hint,
|
||||||
guideText = R.string.login_mode_vulcan_api_guide,
|
guideText = R.string.login_mode_vulcan_api_guide,
|
||||||
isRecommended = true,
|
isRecommended = true,
|
||||||
@ -181,18 +181,18 @@ object LoginInfo {
|
|||||||
errorCodes = mapOf(
|
errorCodes = mapOf(
|
||||||
ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token
|
ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token
|
||||||
)
|
)
|
||||||
)/*,
|
),
|
||||||
Mode(
|
Mode(
|
||||||
loginMode = LOGIN_MODE_VULCAN_WEB,
|
loginMode = LOGIN_MODE_VULCAN_WEB,
|
||||||
name = R.string.login_mode_vulcan_web,
|
name = R.string.login_mode_vulcan_web,
|
||||||
icon = R.drawable.login_mode_vulcan_web,
|
icon = R.drawable.login_mode_vulcan_web,
|
||||||
hintText = R.string.login_mode_vulcan_web_hint,
|
hintText = R.string.login_mode_vulcan_web_hint,
|
||||||
guideText = R.string.login_mode_vulcan_web_guide,
|
guideText = R.string.login_mode_vulcan_web_guide,
|
||||||
isTesting = true,
|
isDevOnly = true,
|
||||||
isPlatformSelection = true,
|
isPlatformSelection = true,
|
||||||
credentials = listOf(
|
credentials = listOf(
|
||||||
getEmailCredential("webEmail"),
|
getEmailCredential("webEmail"),
|
||||||
Credential(
|
FormField(
|
||||||
keyName = "webUsername",
|
keyName = "webUsername",
|
||||||
name = R.string.login_hint_username,
|
name = R.string.login_hint_username,
|
||||||
icon = CommunityMaterial.Icon.cmd_account_outline,
|
icon = CommunityMaterial.Icon.cmd_account_outline,
|
||||||
@ -201,12 +201,12 @@ object LoginInfo {
|
|||||||
errorCodes = mapOf(),
|
errorCodes = mapOf(),
|
||||||
isRequired = true,
|
isRequired = true,
|
||||||
validationRegex = "[A-Z]{7}[0-9]+",
|
validationRegex = "[A-Z]{7}[0-9]+",
|
||||||
caseMode = Credential.CaseMode.UPPER_CASE
|
caseMode = FormField.CaseMode.UPPER_CASE
|
||||||
),
|
),
|
||||||
getPasswordCredential("webPassword")
|
getPasswordCredential("webPassword")
|
||||||
),
|
),
|
||||||
errorCodes = mapOf()
|
errorCodes = mapOf()
|
||||||
)*/
|
)
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
Register(
|
Register(
|
||||||
@ -398,6 +398,7 @@ object LoginInfo {
|
|||||||
|
|
||||||
val isRecommended: Boolean = false,
|
val isRecommended: Boolean = false,
|
||||||
val isTesting: Boolean = false,
|
val isTesting: Boolean = false,
|
||||||
|
val isDevOnly: Boolean = false,
|
||||||
val isPlatformSelection: Boolean = false,
|
val isPlatformSelection: Boolean = false,
|
||||||
|
|
||||||
val credentials: List<BaseCredential>,
|
val credentials: List<BaseCredential>,
|
||||||
|
@ -47,6 +47,7 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var timeoutJob: Job
|
private lateinit var timeoutJob: Job
|
||||||
|
private lateinit var adapter: LoginPlatformAdapter
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
if (!isAdded) return
|
if (!isAdded) return
|
||||||
@ -57,12 +58,7 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
|
|||||||
val loginMode = arguments?.getInt("loginMode") ?: return
|
val loginMode = arguments?.getInt("loginMode") ?: return
|
||||||
val mode = register.loginModes.firstOrNull { it.loginMode == loginMode } ?: return
|
val mode = register.loginModes.firstOrNull { it.loginMode == loginMode } ?: return
|
||||||
|
|
||||||
timeoutJob = startCoroutineTimer(5000L) {
|
adapter = LoginPlatformAdapter(activity) { platform ->
|
||||||
b.timeoutText.isVisible = true
|
|
||||||
timeoutJob.cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
val adapter = LoginPlatformAdapter(activity) { platform ->
|
|
||||||
nav.navigate(R.id.loginFormFragment, Bundle(
|
nav.navigate(R.id.loginFormFragment, Bundle(
|
||||||
"loginType" to platform.loginType,
|
"loginType" to platform.loginType,
|
||||||
"loginMode" to platform.loginMode,
|
"loginMode" to platform.loginMode,
|
||||||
@ -73,7 +69,30 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
|
|||||||
), activity.navOptions)
|
), activity.navOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
loadPlatforms(register, mode)
|
||||||
|
b.reloadButton.isVisible = App.devMode
|
||||||
|
b.reloadButton.onClick {
|
||||||
|
LoginInfo.platformList.remove(mode.name)
|
||||||
|
loadPlatforms(register, mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
b.list.apply {
|
||||||
|
setHasFixedSize(true)
|
||||||
|
layoutManager = LinearLayoutManager(context)
|
||||||
|
addItemDecoration(SimpleDividerItemDecoration(context))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun loadPlatforms(register: LoginInfo.Register, mode: LoginInfo.Mode) {
|
||||||
launch {
|
launch {
|
||||||
|
timeoutJob = startCoroutineTimer(5000L) {
|
||||||
|
b.timeoutText.isVisible = true
|
||||||
|
timeoutJob.cancel()
|
||||||
|
}
|
||||||
|
b.loadingLayout.isVisible = true
|
||||||
|
b.list.isVisible = false
|
||||||
|
b.reloadButton.isEnabled = false
|
||||||
|
|
||||||
val platforms = LoginInfo.platformList[mode.name]
|
val platforms = LoginInfo.platformList[mode.name]
|
||||||
?: run {
|
?: run {
|
||||||
api.runCatching(activity) {
|
api.runCatching(activity) {
|
||||||
@ -87,14 +106,11 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
|
|||||||
|
|
||||||
adapter.items = platforms
|
adapter.items = platforms
|
||||||
b.list.adapter = adapter
|
b.list.adapter = adapter
|
||||||
b.list.apply {
|
|
||||||
setHasFixedSize(true)
|
|
||||||
layoutManager = LinearLayoutManager(context)
|
|
||||||
addItemDecoration(SimpleDividerItemDecoration(context))
|
|
||||||
}
|
|
||||||
timeoutJob.cancel()
|
timeoutJob.cancel()
|
||||||
b.loadingLayout.isVisible = false
|
b.loadingLayout.isVisible = false
|
||||||
b.list.isVisible = true
|
b.list.isVisible = true
|
||||||
|
b.reloadButton.isEnabled = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Kuba Szczodrzyński 2020-10-18.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package pl.szczodrzynski.edziennik.ui.modules.login
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.os.Process
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import androidx.fragment.app.Fragment
|
||||||
|
import coil.api.load
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import pl.szczodrzynski.edziennik.App
|
||||||
|
import pl.szczodrzynski.edziennik.R
|
||||||
|
import pl.szczodrzynski.edziennik.databinding.LoginPrizeFragmentBinding
|
||||||
|
import pl.szczodrzynski.edziennik.onClick
|
||||||
|
import kotlin.coroutines.CoroutineContext
|
||||||
|
import kotlin.system.exitProcess
|
||||||
|
|
||||||
|
class LoginPrizeFragment : Fragment(), CoroutineScope {
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "LoginPrizeFragment"
|
||||||
|
}
|
||||||
|
|
||||||
|
private lateinit var app: App
|
||||||
|
private lateinit var activity: LoginActivity
|
||||||
|
private lateinit var b: LoginPrizeFragmentBinding
|
||||||
|
private val nav by lazy { activity.nav }
|
||||||
|
|
||||||
|
private val job: Job = Job()
|
||||||
|
override val coroutineContext: CoroutineContext
|
||||||
|
get() = job + Dispatchers.Main
|
||||||
|
|
||||||
|
// local/private variables go here
|
||||||
|
|
||||||
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
activity = (getActivity() as LoginActivity?) ?: return null
|
||||||
|
context ?: return null
|
||||||
|
app = activity.application as App
|
||||||
|
b = LoginPrizeFragmentBinding.inflate(inflater)
|
||||||
|
return b.root
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
b.button.load("https://szkolny.eu/game/button.png")
|
||||||
|
b.button.onClick {
|
||||||
|
MaterialAlertDialogBuilder(activity)
|
||||||
|
.setTitle(R.string.are_you_sure)
|
||||||
|
.setMessage(R.string.dev_mode_enable_warning)
|
||||||
|
.setPositiveButton(R.string.yes) { _, _ ->
|
||||||
|
app.config.debugMode = true
|
||||||
|
App.devMode = true
|
||||||
|
MaterialAlertDialogBuilder(activity)
|
||||||
|
.setTitle("Restart")
|
||||||
|
.setMessage("Wymagany restart aplikacji")
|
||||||
|
.setPositiveButton(R.string.ok) { _, _ ->
|
||||||
|
Process.killProcess(Process.myPid())
|
||||||
|
Runtime.getRuntime().exit(0)
|
||||||
|
exitProcess(0)
|
||||||
|
}
|
||||||
|
.setCancelable(false)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
.setNegativeButton(R.string.no) { _, _ ->
|
||||||
|
app.config.debugMode = false
|
||||||
|
App.devMode = false
|
||||||
|
activity.finish()
|
||||||
|
}
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -10,7 +10,10 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import pl.szczodrzynski.edziennik.App
|
import pl.szczodrzynski.edziennik.App
|
||||||
|
import pl.szczodrzynski.edziennik.R
|
||||||
import pl.szczodrzynski.edziennik.databinding.LoginChooserModeItemBinding
|
import pl.szczodrzynski.edziennik.databinding.LoginChooserModeItemBinding
|
||||||
|
import pl.szczodrzynski.edziennik.resolveColor
|
||||||
|
import pl.szczodrzynski.edziennik.setTintColor
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
|
import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserAdapter
|
import pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserAdapter
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
|
import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
|
||||||
@ -34,6 +37,19 @@ class ModeViewHolder(
|
|||||||
b.description.isVisible = true
|
b.description.isVisible = true
|
||||||
b.description.setText(item.hintText)
|
b.description.setText(item.hintText)
|
||||||
}
|
}
|
||||||
b.hint.isVisible = false
|
|
||||||
|
b.badge.isVisible = item.isRecommended || item.isDevOnly || item.isTesting
|
||||||
|
if (item.isRecommended) {
|
||||||
|
b.badge.setText(R.string.login_chooser_mode_recommended)
|
||||||
|
b.badge.background.setTintColor(R.color.md_blue_300.resolveColor(app))
|
||||||
|
}
|
||||||
|
if (item.isTesting) {
|
||||||
|
b.badge.setText(R.string.login_chooser_mode_testing)
|
||||||
|
b.badge.background.setTintColor(R.color.md_yellow_300.resolveColor(app))
|
||||||
|
}
|
||||||
|
if (item.isDevOnly) {
|
||||||
|
b.badge.setText(R.string.login_chooser_mode_dev_only)
|
||||||
|
b.badge.background.setTintColor(R.color.md_red_300.resolveColor(app))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BIN
app/src/main/res/drawable/login_mode_vulcan_hebe.png
Normal file
BIN
app/src/main/res/drawable/login_mode_vulcan_hebe.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.0 KiB |
@ -31,6 +31,7 @@
|
|||||||
android:textSize="24sp" />
|
android:textSize="24sp" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:id="@+id/subtitleText"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginHorizontal="24dp"
|
android:layout_marginHorizontal="24dp"
|
||||||
@ -47,13 +48,14 @@
|
|||||||
tools:listitem="@layout/login_chooser_item" />
|
tools:listitem="@layout/login_chooser_item" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:id="@+id/footnoteText"
|
||||||
style="@style/TextAppearance.AppCompat.Small"
|
style="@style/TextAppearance.AppCompat.Small"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginHorizontal="16dp"
|
android:layout_marginHorizontal="16dp"
|
||||||
android:layout_marginVertical="8dp"
|
android:layout_marginVertical="8dp"
|
||||||
android:text="@string/login_copyright_notice"
|
android:text="@string/login_copyright_notice"
|
||||||
android:textAlignment="center" />
|
android:gravity="center" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -36,6 +36,19 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:gravity="center_vertical">
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
|
<com.mikepenz.iconics.view.IconicsTextView
|
||||||
|
android:id="@+id/badge"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/bg_rounded_8dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingHorizontal="4dp"
|
||||||
|
android:paddingVertical="2dp"
|
||||||
|
android:textColor="@color/md_black_1000"
|
||||||
|
android:textSize="12sp"
|
||||||
|
tools:backgroundTint="@color/md_blue_300"
|
||||||
|
tools:text="{cmd-alert-circle-outline} Zalecane" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/name"
|
android:id="@+id/name"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@ -43,13 +56,6 @@
|
|||||||
android:textAppearance="@style/NavView.TextView.Medium"
|
android:textAppearance="@style/NavView.TextView.Medium"
|
||||||
tools:text="Zaloguj używając e-maila" />
|
tools:text="Zaloguj używając e-maila" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/hint"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textStyle="bold"
|
|
||||||
tools:text="(zalecane)" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/description"
|
android:id="@+id/description"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -78,6 +78,15 @@
|
|||||||
tools:visibility="visible" />
|
tools:visibility="visible" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/reloadButton"
|
||||||
|
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:text="@string/refresh"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
24
app/src/main/res/layout/login_prize_fragment.xml
Normal file
24
app/src/main/res/layout/login_prize_fragment.xml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
~ Copyright (c) Kuba Szczodrzyński 2020-10-18.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_margin="48dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:scaleType="fitXY"
|
||||||
|
tools:src="@tools:sample/avatars" />
|
||||||
|
</FrameLayout>
|
||||||
|
</layout>
|
@ -18,6 +18,24 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_loginChooserFragment_to_loginFormFragment"
|
android:id="@+id/action_loginChooserFragment_to_loginFormFragment"
|
||||||
app:destination="@id/loginFormFragment" />
|
app:destination="@id/loginFormFragment" />
|
||||||
|
<!-- eggs -->
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_loginChooserFragment_to_loginEggsFragment"
|
||||||
|
app:destination="@id/loginEggsFragment" />
|
||||||
|
</fragment>
|
||||||
|
<!-- eggs -->
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/loginEggsFragment"
|
||||||
|
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginEggsFragment"
|
||||||
|
android:label="LoginEggsFragment">
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_loginEggsFragment_to_loginPrizeFragment"
|
||||||
|
app:destination="@id/loginPrizeFragment" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/loginPrizeFragment"
|
||||||
|
android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginPrizeFragment"
|
||||||
|
android:label="LoginPrizeFragment">
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/loginPlatformListFragment"
|
android:id="@+id/loginPlatformListFragment"
|
||||||
|
@ -854,7 +854,7 @@
|
|||||||
<string name="settings_about_licenses_text">Open-Source-Lizenzen</string>
|
<string name="settings_about_licenses_text">Open-Source-Lizenzen</string>
|
||||||
<string name="settings_about_privacy_policy_text">Datenschutzrichtlinie</string>
|
<string name="settings_about_privacy_policy_text">Datenschutzrichtlinie</string>
|
||||||
<string name="settings_about_register_title_text">E-Klassenbuch</string>
|
<string name="settings_about_register_title_text">E-Klassenbuch</string>
|
||||||
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - 2020</string>
|
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - Februar 2021</string>
|
||||||
<string name="settings_about_update_subtext">Klicken Sie hier, um nach Aktualisierungen zu suchen</string>
|
<string name="settings_about_update_subtext">Klicken Sie hier, um nach Aktualisierungen zu suchen</string>
|
||||||
<string name="settings_about_update_text">Aktualisierung</string>
|
<string name="settings_about_update_text">Aktualisierung</string>
|
||||||
<string name="settings_about_version_text">Version</string>
|
<string name="settings_about_version_text">Version</string>
|
||||||
|
@ -856,7 +856,7 @@
|
|||||||
<string name="settings_about_licenses_text">Open-source licenses</string>
|
<string name="settings_about_licenses_text">Open-source licenses</string>
|
||||||
<string name="settings_about_privacy_policy_text">Privacy policy</string>
|
<string name="settings_about_privacy_policy_text">Privacy policy</string>
|
||||||
<string name="settings_about_register_title_text">E-register</string>
|
<string name="settings_about_register_title_text">E-register</string>
|
||||||
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - 2020</string>
|
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - February 2021</string>
|
||||||
<string name="settings_about_update_subtext">Click to check for updates</string>
|
<string name="settings_about_update_subtext">Click to check for updates</string>
|
||||||
<string name="settings_about_update_text">Update</string>
|
<string name="settings_about_update_text">Update</string>
|
||||||
<string name="settings_about_version_text">Version</string>
|
<string name="settings_about_version_text">Version</string>
|
||||||
|
@ -130,6 +130,7 @@
|
|||||||
<string name="error_341" translatable="false">ERROR_VULCAN_API_BAD_REQUEST</string>
|
<string name="error_341" translatable="false">ERROR_VULCAN_API_BAD_REQUEST</string>
|
||||||
<string name="error_342" translatable="false">ERROR_VULCAN_API_OTHER</string>
|
<string name="error_342" translatable="false">ERROR_VULCAN_API_OTHER</string>
|
||||||
<string name="error_343" translatable="false">ERROR_VULCAN_ATTACHMENT_DOWNLOAD</string>
|
<string name="error_343" translatable="false">ERROR_VULCAN_ATTACHMENT_DOWNLOAD</string>
|
||||||
|
<string name="error_390" translatable="false">ERROR_VULCAN_API_DEPRECATED</string>
|
||||||
|
|
||||||
<string name="error_401" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN</string>
|
<string name="error_401" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN</string>
|
||||||
<string name="error_402" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME</string>
|
<string name="error_402" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME</string>
|
||||||
@ -318,6 +319,7 @@
|
|||||||
<string name="error_341_reason">VULCAN®: błąd żądania, zgłoś błąd</string>
|
<string name="error_341_reason">VULCAN®: błąd żądania, zgłoś błąd</string>
|
||||||
<string name="error_342_reason">VULCAN®: inny błąd, wyślij zgłoszenie</string>
|
<string name="error_342_reason">VULCAN®: inny błąd, wyślij zgłoszenie</string>
|
||||||
<string name="error_343_reason">VULCAN®: nie znaleziono adresu załącznika</string>
|
<string name="error_343_reason">VULCAN®: nie znaleziono adresu załącznika</string>
|
||||||
|
<string name="error_390_reason">W związku z wygaszeniem aplikacji Dzienniczek+ przez firmę Vulcan, należy zalogować się ponownie.\n\nAby móc dalej korzystać z aplikacji Szkolny.eu, otwórz Ustawienia i wybierz opcję Dodaj nowego ucznia.\nNastępnie zaloguj się do dziennika Vulcan zgodnie z instrukcją.\n\nPrzepraszamy za niedogodności.</string>
|
||||||
|
|
||||||
<string name="error_401_reason">Nieprawidłowe dane logowania</string>
|
<string name="error_401_reason">Nieprawidłowe dane logowania</string>
|
||||||
<string name="error_402_reason">Nieprawidłowa nazwa szkoły</string>
|
<string name="error_402_reason">Nieprawidłowa nazwa szkoły</string>
|
||||||
|
@ -919,7 +919,7 @@
|
|||||||
<string name="settings_about_licenses_text">Licencje open-source</string>
|
<string name="settings_about_licenses_text">Licencje open-source</string>
|
||||||
<string name="settings_about_privacy_policy_text">Polityka prywatności</string>
|
<string name="settings_about_privacy_policy_text">Polityka prywatności</string>
|
||||||
<string name="settings_about_register_title_text">E-dziennik</string>
|
<string name="settings_about_register_title_text">E-dziennik</string>
|
||||||
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nwrzesień 2018 - 2020</string>
|
<string name="settings_about_title_subtext">© Kuba Szczodrzyński && Kacper Ziubryniewicz\nwrzesień 2018 - luty 2021</string>
|
||||||
<string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
|
<string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
|
||||||
<string name="settings_about_update_text">Aktualizacja</string>
|
<string name="settings_about_update_text">Aktualizacja</string>
|
||||||
<string name="settings_about_version_text">Wersja</string>
|
<string name="settings_about_version_text">Wersja</string>
|
||||||
@ -1380,4 +1380,10 @@
|
|||||||
<string name="register_unavailable_read_more">Dowiedz się więcej</string>
|
<string name="register_unavailable_read_more">Dowiedz się więcej</string>
|
||||||
<string name="settings_register_hide_sticks_from_old">Stara nie zobaczy pał</string>
|
<string name="settings_register_hide_sticks_from_old">Stara nie zobaczy pał</string>
|
||||||
<string name="login_podlasie_logout_devices">Wyloguj z pozostałych urządzeń</string>
|
<string name="login_podlasie_logout_devices">Wyloguj z pozostałych urządzeń</string>
|
||||||
|
<string name="login_chooser_testing_title">Wersja testowa</string>
|
||||||
|
<string name="login_chooser_testing_text">Wybrany sposób logowania jest jeszcze w fazie testów i może nie działać poprawnie.\n\nJeśli masz problemy z aplikacją, wybierz zalecany sposób logowania.</string>
|
||||||
|
<string name="login_chooser_mode_recommended">{cmd-information-outline} Zalecane</string>
|
||||||
|
<string name="login_chooser_mode_testing">{cmd-alert-circle-outline} Wersja testowa</string>
|
||||||
|
<string name="login_chooser_mode_dev_only">{cmd-android-studio} Wersja deweloperska</string>
|
||||||
|
<string name="eggs">\???</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
40
build.gradle
40
build.gradle
@ -2,43 +2,43 @@
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlin_version = '1.3.61'
|
kotlin_version = '1.4.30'
|
||||||
|
|
||||||
release = [
|
release = [
|
||||||
versionName: "4.4.3",
|
versionName: "4.5",
|
||||||
versionCode: 4040399
|
versionCode: 4050099
|
||||||
]
|
]
|
||||||
|
|
||||||
setup = [
|
setup = [
|
||||||
compileSdk: 28,
|
compileSdk: 30,
|
||||||
buildTools: "28.0.3",
|
buildTools: "28.0.3",
|
||||||
minSdk : 16,
|
minSdk : 16,
|
||||||
targetSdk : 28
|
targetSdk : 30
|
||||||
]
|
]
|
||||||
|
|
||||||
versions = [
|
versions = [
|
||||||
gradleAndroid : '4.1.0-rc01',
|
gradleAndroid : '4.2.0-beta04',
|
||||||
|
|
||||||
kotlin : ext.kotlin_version,
|
kotlin : ext.kotlin_version,
|
||||||
ktx : "1.2.0",
|
ktx : "1.3.2",
|
||||||
|
|
||||||
androidX : '1.0.0',
|
androidX : '1.0.0',
|
||||||
annotation : '1.1.0',
|
annotation : '1.1.0',
|
||||||
recyclerView : '1.2.0-alpha01',
|
recyclerView : '1.2.0-beta01',
|
||||||
material : '1.2.0-alpha05',
|
material : '1.3.0',
|
||||||
appcompat : '1.2.0-alpha02',
|
appcompat : '1.3.0-beta01',
|
||||||
constraintLayout : '2.0.0-beta4',
|
constraintLayout : '2.1.0-alpha2',
|
||||||
cardview : '1.0.0',
|
cardview : '1.0.0',
|
||||||
gridLayout : '1.0.0',
|
gridLayout : '1.0.0',
|
||||||
navigation : "2.0.0",
|
navigation : "2.0.0",
|
||||||
navigationFragment: "1.0.0",
|
navigationFragment: "1.0.0",
|
||||||
legacy : "1.0.0",
|
legacy : "1.0.0",
|
||||||
|
|
||||||
room : "2.2.5",
|
room : "2.2.6",
|
||||||
lifecycle : "2.2.0",
|
lifecycle : "2.3.0",
|
||||||
work : "2.3.4",
|
work : "2.5.0",
|
||||||
|
|
||||||
firebase : '17.2.2',
|
firebase : '18.0.2',
|
||||||
firebasemessaging: "20.1.3",
|
firebasemessaging: "20.1.3",
|
||||||
play_services : "17.0.0",
|
play_services : "17.0.0",
|
||||||
|
|
||||||
@ -58,9 +58,6 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
|
||||||
url 'https://maven.fabric.io/public'
|
|
||||||
}
|
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
@ -68,11 +65,8 @@ buildscript {
|
|||||||
classpath "com.android.tools.build:gradle:${versions.gradleAndroid}"
|
classpath "com.android.tools.build:gradle:${versions.gradleAndroid}"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
|
||||||
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
|
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
|
||||||
classpath 'com.google.gms:google-services:4.3.3'
|
classpath 'com.google.gms:google-services:4.3.5'
|
||||||
classpath 'io.fabric.tools:gradle:1.28.1'
|
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
|
||||||
// in the individual module build.gradle files
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
org.gradle.jvmargs=-Xmx1536m
|
org.gradle.jvmargs=-Xmx1536m
|
||||||
android.enableR8=true
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Aug 24 17:15:24 CEST 2020
|
#Wed Feb 17 14:04:38 CET 2021
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
Loading…
x
Reference in New Issue
Block a user