Experimental support without studygroups

Signed-off-by: koenidv <[email protected]>

Author: koenidv

app/src/main/java/de/koenidv/sph/database/DatabaseHelper.java

@@ -63,7 +63,7 @@ public void onCreate(SQLiteDatabase db) {
                 "id_course TEXT, id_post TEXT, name TEXT, date INTEGER, url TEXT, size TEXT," +
                 "type TEXT, pinned INTEGER, lastUse INTEGER)");
         // Create tasks table
-        db.execSQL("CREATE TABLE postTasks(task_id TEXT PRIMARY KEY, id_course TEXT, id_post TEXT," +
+        db.execSQL("CREATE TABLE tasks(task_id TEXT PRIMARY KEY, id_course TEXT, id_post TEXT," +
                 "description TEXT, date INTEGER, isdone INTEGER, pinned INTEGER, dueDate INTEGER)");
         // Create link attachments table
         db.execSQL("CREATE TABLE linkAttachments(attachment_id TEXT PRIMARY KEY," +
@@ -76,7 +76,7 @@ public void onCreate(SQLiteDatabase db) {
     //upgrade Database
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldversion, int newversion) {
-        if (oldversion < 2) {
+        if (oldversion == 1 && newversion == 2) {
             db.execSQL("ALTER TABLE postTasks RENAME TO tasks");
         }
     }

app/src/main/java/de/koenidv/sph/networking/CookieStore.kt

@@ -35,10 +35,10 @@ object CookieStore : CookieJar {
      * @return List of cookies for the specified domain
      */
     override fun loadForRequest(url: HttpUrl): List<Cookie> {
-        if (url.host().contains("schulportal.hessen.de"))
-            return cookies["schulportal.hessen.de"] ?: ArrayList()
+        return if (url.host().contains("schulportal.hessen.de"))
+            cookies["schulportal.hessen.de"] ?: ArrayList()
         else
-            return cookies[url.host()] ?: ArrayList()
+            cookies[url.host()] ?: ArrayList()
 
     }
 

app/src/main/java/de/koenidv/sph/networking/NetworkManager.kt

@@ -156,13 +156,13 @@ class NetworkManager {
                 // Save parsed courses from timetable
                 coursesDb.save(RawParser().parseCoursesFromTimetable(responseTimetable!!))
                 // Secondly, load those courses from study groups to find out where the user belongs
-                loadSiteWithToken("https://start.schulportal.hessen.de/lerngruppen.php", onComplete = { successStudygroups: Int, responseStudygroups: String? ->
+                loadSiteWithToken(applicationContext().getString(R.string.url_studygroups), onComplete = { successStudygroups: Int, responseStudygroups: String? ->
                     if (successStudygroups == SUCCESS) {
                         // Save parsed courses from study groups
                         coursesDb.setNulledNotFavorite()
                         coursesDb.save(RawParser().parseCoursesFromStudygroups(responseStudygroups!!))
                         // Lastly, load courses again from posts overview to get number ids
-                        loadSiteWithToken("https://start.schulportal.hessen.de/meinunterricht.php", onComplete = { successOverview: Int, responseOverview: String? ->
+                        loadSiteWithToken(applicationContext().getString(R.string.url_allposts), onComplete = { successOverview: Int, responseOverview: String? ->
                             if (successOverview == SUCCESS) {
                                 // Save parsed courses from posts overview
                                 coursesDb.save(RawParser().parseCoursesFromPostsoverview(responseOverview!!))

app/src/main/java/de/koenidv/sph/parsing/IdParser.kt

@@ -1,5 +1,6 @@
 package de.koenidv.sph.parsing
 
+import de.koenidv.sph.R
 import de.koenidv.sph.database.CoursesDb
 import de.koenidv.sph.objects.Course
 import java.text.SimpleDateFormat
@@ -156,6 +157,14 @@ class IdParser {
         return classType + "_" + teacherId.toLowerCase(Locale.ROOT) + "_" + filteredCourses.size + 1
     }
 
+    fun getCourseIdPrefixWithNamedId(namedId: String, teacherId: String): String? {
+        val prefixMap = Utility().parseStringArray(R.array.namedid_course_prefixes)
+        return if (prefixMap.containsKey(namedId.substring(0, namedId.indexOf(" "))))
+            (prefixMap[namedId.substring(0, namedId.indexOf(" "))] +
+                    "_" + teacherId).toLowerCase(Locale.ROOT)
+        else null
+    }
+
     /**
      * Estimates the type of an course id
      * @param courseId Id to check

app/src/main/java/de/koenidv/sph/parsing/RawParser.kt

@@ -2,9 +2,11 @@ package de.koenidv.sph.parsing
 
 import android.annotation.SuppressLint
 import android.graphics.Color
+import android.util.Log
 import android.widget.Toast
 import androidx.core.graphics.toColorInt
 import de.koenidv.sph.R
+import de.koenidv.sph.SphPlanner.Companion.TAG
 import de.koenidv.sph.SphPlanner.Companion.applicationContext
 import de.koenidv.sph.database.CoursesDb
 import de.koenidv.sph.objects.*
@@ -230,47 +232,56 @@ class RawParser {
      */
     fun parseCoursesFromStudygroups(rawResponse: String): List<Course> {
         val courses = mutableListOf<Course>()
-        // Remove stuff we don't need
-        // There are multiple tables in this page, we'll just take the first one
-        val rawContent = rawResponse.substring(rawResponse.indexOf("<tbody>") + 7, rawResponse.indexOf("</tbody>"))
 
-        /*
+        // Return empty list if content is invalid
+        try {
+
+            // Remove stuff we don't need
+            // There are multiple tables in this page, we'll just take the first one
+            val rawContent = rawResponse.substring(rawResponse.indexOf("<tbody>") + 7, rawResponse.indexOf("</tbody>"))
+
+            /*
          * It seems as if the sph id index is in the same order as the timetable
          * i.e. Q3Gvac03 - GYM is the 3rd History GK in the timetable
          * This means that the internal id's should be in the same order as they're taken from it
          * Let's just hope the best
          */
 
-        val rawContents = rawContent.split("<tr").toMutableList()
-        rawContents.removeFirst()
+            val rawContents = rawContent.split("<tr").toMutableList()
+            rawContents.removeFirst()
+
+            var namedId: String
+            var uniformNamedId: String
+            var sphId: String
+            var teacherId: String
+            var internalId: String
+            val nameColorMap = Utility().parseStringArray(R.array.course_colors)
+
+            // Get data from each table row and save the courses
+            for (entry in rawContents) {
+                namedId = entry.substring(Utility().ordinalIndexOf(entry, "<td>", 1) + 4, entry.indexOf("<small>") - 1).trim()
+                uniformNamedId = CourseParser().parseNamedId(namedId)
+                sphId = entry.substring(entry.indexOf("<small>") + 8, entry.indexOf("</small>") - 1)
+                teacherId = entry.substring(Utility().ordinalIndexOf(entry, "<td>", 2))
+                teacherId = teacherId.substring(teacherId.indexOf("(") + 1, teacherId.indexOf(")")).toLowerCase(Locale.ROOT)
+                internalId = IdParser().getCourseIdWithSph(sphId, teacherId, entry.contains("LK"))
 
-        var namedId: String
-        var uniformNamedId: String
-        var sphId: String
-        var teacherId: String
-        var internalId: String
-        val nameColorMap = Utility().parseStringArray(R.array.course_colors)
+                courses.add(Course(
+                        courseId = internalId,
+                        sph_id = sphId,
+                        named_id = uniformNamedId,
+                        id_teacher = teacherId,
+                        fullname = CourseParser().getFullnameFromInternald(internalId),
+                        isFavorite = true,
+                        isLK = entry.contains("LK"),
+                        color = (nameColorMap[uniformNamedId.substring(0, uniformNamedId.indexOf(" "))]
+                                ?: nameColorMap["default"])!!.toColorInt()
+                ))
+            }
 
-        // Get data from each table row and save the courses
-        for (entry in rawContents) {
-            namedId = entry.substring(Utility().ordinalIndexOf(entry, "<td>", 1) + 4, entry.indexOf("<small>") - 1).trim()
-            uniformNamedId = CourseParser().parseNamedId(namedId)
-            sphId = entry.substring(entry.indexOf("<small>") + 8, entry.indexOf("</small>") - 1)
-            teacherId = entry.substring(Utility().ordinalIndexOf(entry, "<td>", 2))
-            teacherId = teacherId.substring(teacherId.indexOf("(") + 1, teacherId.indexOf(")")).toLowerCase(Locale.ROOT)
-            internalId = IdParser().getCourseIdWithSph(sphId, teacherId, entry.contains("LK"))
-
-            courses.add(Course(
-                    courseId = internalId,
-                    sph_id = sphId,
-                    named_id = uniformNamedId,
-                    id_teacher = teacherId,
-                    fullname = CourseParser().getFullnameFromInternald(internalId),
-                    isFavorite = true,
-                    isLK = entry.contains("LK"),
-                    color = (nameColorMap[namedId.substring(0, namedId.indexOf(" "))]
-                            ?: nameColorMap["default"])!!.toColorInt()
-            ))
+        } catch (e: StringIndexOutOfBoundsException) {
+            Log.d(TAG, "Studygroups parsing failed!")
+            Log.d(TAG, e.stackTraceToString())
         }
 
         return courses
@@ -283,56 +294,93 @@ class RawParser {
      */
     fun parseCoursesFromPostsoverview(rawResponse: String): List<Course> {
         val courses = mutableListOf<Course>()
-        // Remove stuff we don't need, get second menu <ul>
-        @Suppress("VARIABLE_WITH_REDUNDANT_INITIALIZER") var rawContent = rawResponse.substring(rawResponse.indexOf("<ul role=\"menu\"") + 15)
-        rawContent = rawContent.substring(rawContent.indexOf("<ul role=\"menu\""))
-        rawContent = rawContent.substring(0, rawContent.indexOf("</ul>"))
-
-        val rawContents = rawContent.split("<li >").toMutableList()
-        rawContents.removeFirst() // Trash
-        rawContents.removeFirst() // Overview link
+        // Get the courses table
+        val table = Jsoup.parse(rawResponse).select("#aktuell tbody")
 
         var courseName: String
-        var uniformCourseName: String
+        var uniformNamedId: String
         var numberId: String
+        var teacherId: String
+        var isLK: Boolean
         var similiarCourses: List<Course>
-        // Get values from list
-        for (entry in rawContents) {
-            if (entry.contains("a=sus_view&id=")) {
-                numberId = entry.substring(entry.indexOf("a=sus_view&id=") + 14)
-                numberId = numberId.substring(0, numberId.indexOf("\""))
-                courseName = entry.substring(entry.indexOf("</span>") + 7, entry.indexOf("</a>")).trim()
-
-                // todo create new courses with teacher_id instead of using old ones: might not be available
-
-                // Make named id from post overview uniform
-                uniformCourseName = CourseParser().parseNamedId(courseName)
-
-                // Get courses that might be the same as this one
-                similiarCourses = CoursesDb.getInstance().getByNamedId(uniformCourseName).toMutableList()
-                if (courseName.contains("""\(.*\)""".toRegex())) { // if contains text in brackets
-                    val courseToAdd = CoursesDb.getInstance().getBySphId(courseName.substring(courseName.indexOf("(") + 1, courseName.lastIndexOf(")")).replace("-GYM", " - GYM"))
-                    if (courseToAdd != null) similiarCourses.add(courseToAdd)
-                }
+        val nameColorMap = Utility().parseStringArray(R.array.course_colors)
+        // Get values from table
+        for (row in table.select("tr")) {
+            numberId = row.attr("data-book")
+            courseName = row.select("span.name").text()
+            teacherId = row.select("span.teacher button")
+                    .first().ownText().toLowerCase(Locale.ROOT)
+            isLK = courseName.contains("LK")
+
+            // Make named id from post overview uniform
+            uniformNamedId = CourseParser().parseNamedId(courseName)
+
+            // Get courses that might be the same as this one
+            similiarCourses = CoursesDb.getInstance().getByNamedId(uniformNamedId).toMutableList()
+
+            // If no similiar course was found, try getting all courses with the same subject and teacher
+            var courseIdPrefix: String? = null
+            if (similiarCourses.isEmpty()) {
+                courseIdPrefix = IdParser().getCourseIdPrefixWithNamedId(uniformNamedId, teacherId)
+                if (courseIdPrefix != null)
+                    similiarCourses.addAll(CoursesDb.getInstance().getByInternalPrefix(courseIdPrefix)
+                            .filter { it.isLK == null || it.isLK == isLK })
+            }
 
-                // Make sure no course is in the list twice
-                // This might happen because we add both by NamedId and SphId
-                similiarCourses = similiarCourses.distinct()
 
-                when {
-                    similiarCourses.size == 1 -> {
-                        // Only one similiar course, this should be it.
-                        similiarCourses[0].number_id = numberId
-                        courses.add(similiarCourses[0])
-                    }
-                    similiarCourses.isEmpty() -> {
-                        // todo create new course with this namedid & numberid
-                        Toast.makeText(applicationContext(), "No valid course", Toast.LENGTH_SHORT).show()
+            if (courseName.contains("""\(.*\)""".toRegex())) { // if contains text in brackets
+                val courseToAdd = CoursesDb.getInstance().getBySphId(courseName.substring(courseName.indexOf("(") + 1, courseName.lastIndexOf(")")).replace("-GYM", " - GYM"))
+                if (courseToAdd != null) similiarCourses.add(courseToAdd)
+            }
+
+            // Make sure no course is in the list twice
+            // This might happen because we add both by NamedId and SphId
+            similiarCourses = similiarCourses.distinct()
+
+            when {
+                similiarCourses.size == 1 -> {
+                    // Only one similiar course, this should be it.
+                    similiarCourses[0].apply {
+                        number_id = numberId
+                        named_id = uniformNamedId
+                        isFavorite = true
+                        fullname = CourseParser().getFullnameFromInternald(similiarCourses[0].courseId)
+                        color = (nameColorMap[
+                                uniformNamedId
+                                        .substring(0, uniformNamedId.indexOf(" "))]
+                                ?: nameColorMap["default"])!!.toColorInt()
                     }
-                    similiarCourses.size > 1 -> {
-                        // todo handle multiple similiar courses
-                        Toast.makeText(applicationContext(), "Too many courses", Toast.LENGTH_SHORT).show()
+                    courses.add(similiarCourses[0])
+                }
+                similiarCourses.isEmpty() -> {
+                    // Create new course with this namedid & numberid
+                    // If no course could be found, there is no other course with the same internal prefix
+                    // (We tried getting every course by that)
+                    // This means we can just use the prefix - if available with an index 1
+                    if (courseIdPrefix != null) {
+                        courses.add(Course(
+                                courseId = courseIdPrefix + "_1",
+                                named_id = uniformNamedId,
+                                fullname = CourseParser().getFullnameFromInternald(courseIdPrefix + "_1"),
+                                number_id = numberId,
+                                id_teacher = teacherId,
+                                isFavorite = true,
+                                isLK = isLK,
+                                color = (nameColorMap[
+                                        uniformNamedId
+                                                .substring(0, uniformNamedId.indexOf(" "))]
+                                        ?: nameColorMap["default"])!!.toColorInt()
+                        ))
                     }
+                    Log.d(TAG, "No valid course for $uniformNamedId")
+                }
+                similiarCourses.size > 1 -> {
+                    // todo handle multiple similiar courses
+                    Toast.makeText(applicationContext(), "Too many courses", Toast.LENGTH_LONG).show()
+                    Log.d(TAG, "Too many courses for $uniformNamedId")
+                    // currently adds first course
+                    similiarCourses[0].number_id = numberId
+                    courses.add(similiarCourses[0])
                 }
             }
         }

app/src/main/java/de/koenidv/sph/ui/OnboardingSigninFragment.kt

@@ -27,6 +27,7 @@ import de.koenidv.sph.networking.NetworkManager
 import de.koenidv.sph.networking.TokenManager
 import de.koenidv.sph.parsing.RawParser
 import okhttp3.OkHttpClient
+import java.util.*
 
 
 class OnboardingSigninFragment : Fragment() {
@@ -57,7 +58,6 @@ class OnboardingSigninFragment : Fragment() {
             val signinButton = view.findViewById<ExtendedFloatingActionButton>(R.id.signinButton)
 
             signinButton.shrink()
-            // todo default selection for GMB
 
             // Load school names and ids to display them in a spinner
             // Hide loading icon and show contents once done
@@ -155,13 +155,17 @@ class OnboardingSigninFragment : Fragment() {
                 textlayout1.visibility = View.GONE
                 textlayout2.visibility = View.GONE
                 signinButton.visibility = View.GONE
-                (requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(view.windowToken, 0)
+                // Hide keyboard
+                (requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager)
+                        .hideSoftInputFromWindow(view.windowToken, 0)
                 // Hide the password
                 passText.transformationMethod = PasswordTransformationMethod()
 
 
                 prefs.edit()
-                        .putString("user", userText.text.toString().replace(" ", "."))
+                        .putString("user", userText.text.toString()
+                                .replace(" ", ".")
+                                .toLowerCase(Locale.ROOT))
                         .putString("password", passText.text.toString())
                         // We'll assume schools have been loaded, as ui won't let the user get here otherwise
                         // We could mitigate this by checking for schoolIds.isNotEmpty()..
@@ -212,6 +216,11 @@ class OnboardingSigninFragment : Fragment() {
                     }
                 }
             }
+
+            // Restore credentials if sign in failed before
+            userText.setText(prefs.getString("user", ""))
+            passText.setText(prefs.getString("password", ""))
+
             return view
         }
     }