Fixes and release 1.3 (v131)

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

Author: koenidv

.idea/vcs.xml

@@ -2,15 +2,21 @@
 Android app to easily access Hesse's education portal - 
 *SPH: Schulportal Hessen / Education Portal Hesse*
 
+<details>
+
+<summary>Screenshots as of 1.2 (v120)</summary>
+
 <p float="left">
   <img src="https://play-lh.googleusercontent.com/W998xiTW5TvKZvtqZFm6hhVLo9ji97VgnDJ9Z86sMJEs53_kA0NU4ohTP9S2W1Pv7Q=w1920-h947-rw" width="200" />
   <img src="https://play-lh.googleusercontent.com/tYMyPkNZc6qIEbNMNbLksOuiLM9sPncAHFC74Nq-QB1pCetwCEls5baYFo2bhE--tTM=w1920-h947-rw" width="200" /> 
   <img src="https://play-lh.googleusercontent.com/htYdoaD9un77stFjNjDeuJ02bA8cTNpwsmv59uv6CWst8yvHsHomIPvpP-VqQfOU5Q=w1920-h947-rw" width="200" />
   <img src="https://play-lh.googleusercontent.com/W8Buymrj0ShiNaHG3CcXcVh2RcztyA1Tgm4U7xMCqF1cBQzrJyhVLRb89jOZpjXuHA=w1920-h947-rw" width="200" />
 </p>
 
+</details>
+
 ### Advantages compared to SPH's website
-- [x] The App presents way more data at a glance
+- [x] Presenting way more data at a glance
 - [x] Easier and faster to use
 - [x] Skip signing in every time 
 - [x] Works even when SPH is under maintenance or offline
@@ -19,15 +25,16 @@ Android app to easily access Hesse's education portal -
 - [x] Personal timetable (that works better than sph's)
 - [x] Personal changes in the timetable
 - [x] Overview of undone tasks & unread posts
+- [x] Send and receive messages to teachers (starting in 1.3)
 - [x] Rename and pin attachments, keep them offline
 - [x] Display posts from SPH
 
 ### Future plans
-- [ ] Implementing the messages feature (wip, decryption works)
-- [ ] More reliably support more schools (always wip, developing better debugging features)
+- [ ] Notifications
+- [ ] Manually edit courses
+- [ ] More reliably support more schools (always wip)
 - [ ] Displaying grades and attendances 
 - [ ] Submit files to assignments
-- [ ] Manually edit courses
 - [ ] Add own tasks / grades / attendances
 
 ### Contributing

README.md

@@ -12,8 +12,8 @@ android {
         applicationId "de.koenidv.sph"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 130
-        versionName "1.3-dev"
+        versionCode 131
+        versionName "1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle

@@ -29,13 +29,19 @@ import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
 import com.google.android.play.core.tasks.Task
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import de.koenidv.sph.SphPlanner.Companion.prefs
 import de.koenidv.sph.database.ChangesDb
 import de.koenidv.sph.database.FunctionTilesDb
 import de.koenidv.sph.debugging.Debugger
 import de.koenidv.sph.networking.NetworkManager
 import de.koenidv.sph.objects.FunctionTile
 import de.koenidv.sph.ui.OnboardingActivity
 import de.koenidv.sph.ui.OptionsSheet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.*
 
 //  Created by koenidv on 05.12.2020.
 
@@ -84,6 +90,47 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+
+        // If app install is at least 3 days ago,
+        // the last share snackbar is at least 12 days ago,
+        // and the app has not been shared before,
+        // show a snackbar asking the user to share the app after 30 seconds
+        if (prefs.getLong("install_time", 0) == 0L) {
+            prefs.edit().putLong("install_time", Date().time).apply()
+        } else if (Date().time - prefs.getLong("install_time", 0) > 3 * 24 * 360 * 1000 &&
+                !prefs.getBoolean("share_done", false) &&
+                Date().time - prefs.getLong("share_snackbar_time", 0) >
+                12 * 24 * 360 * 1000) {
+
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(30000)
+
+                // Create a snackbar with share action
+                val snackbar = Snackbar.make(
+                        findViewById<FragmentContainerView>(R.id.nav_host_fragment),
+                        R.string.share_prompt, Snackbar.LENGTH_INDEFINITE)
+                        .setAnchorView(R.id.nav_view)
+                        .setAction(R.string.share_action) {
+                            val sendIntent: Intent = Intent().apply {
+                                // Action: Share plain text and save action completion in prefs
+                                action = Intent.ACTION_SEND
+                                putExtra(Intent.EXTRA_TEXT, getString(R.string.share_text))
+                                this.type = "text/plain"
+                                prefs.edit().putBoolean("share_done", true).apply()
+                            }
+                            startActivity(Intent.createChooser(sendIntent, getString(R.string.share_action)))
+                        }
+                snackbar.show()
+                prefs.edit().putLong("share_snackbar_time", Date().time).apply()
+
+                // Dismiss the snackbar after 10 seconds
+                delay(10000)
+                snackbar.dismiss()
+
+            }
+        }
+
+
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -132,36 +179,40 @@ class MainActivity : AppCompatActivity() {
         /*
          * Pull to refresh
          */
-        swipeRefresh = findViewById<SwipeRefreshLayout>(R.id.swipeRefresh)
+        swipeRefresh = findViewById(R.id.swipeRefresh)
         swipeRefresh.setOnRefreshListener {
             navController.currentDestination?.id?.let { destination ->
                 // If destination is known, let network manager handle the refreshing
                 NetworkManager().handlePullToRefresh(destination, lastNavArguments) { success ->
-                    val errorSnackbar = Snackbar.make(findViewById<FragmentContainerView>(R.id.nav_host_fragment), "", Snackbar.LENGTH_LONG)
-                    errorSnackbar.setAnchorView(R.id.nav_view)
-                    // Show error message if needed
-                    when (success) {
-                        NetworkManager.FAILED_NO_NETWORK -> errorSnackbar.setText(R.string.error_offline).show()
-                        NetworkManager.FAILED_MAINTENANCE -> errorSnackbar.setText(R.string.error_maintenance).show()
-                        NetworkManager.FAILED_SERVER_ERROR -> errorSnackbar.setText(R.string.error_server).show()
-                        NetworkManager.FAILED_UNKNOWN, NetworkManager.FAILED_CANCELLED ->
-                            errorSnackbar.setText(R.string.error).show()
-                        else -> if (success != NetworkManager.SUCCESS) errorSnackbar.setText(R.string.error).show()
-                    }
-                    // If this is due to a server error, display a link to sph's status page
-                    if (success == NetworkManager.FAILED_MAINTENANCE
-                            || success == NetworkManager.FAILED_SERVER_ERROR
-                            || success == NetworkManager.FAILED_UNKNOWN) {
-                        errorSnackbar.setAction(R.string.sph_status) {
-                            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_status))))
+                    // Just to make sure we're actually running on ui thread after networking
+                    // issue fc-21432b0dd857aa2a3e29e938109bf74c to be specific
+                    runOnUiThread {
+                        val errorSnackbar = Snackbar.make(findViewById<FragmentContainerView>(R.id.nav_host_fragment), "", Snackbar.LENGTH_LONG)
+                        errorSnackbar.setAnchorView(R.id.nav_view)
+                        // Show error message if needed
+                        when (success) {
+                            NetworkManager.FAILED_NO_NETWORK -> errorSnackbar.setText(R.string.error_offline).show()
+                            NetworkManager.FAILED_MAINTENANCE -> errorSnackbar.setText(R.string.error_maintenance).show()
+                            NetworkManager.FAILED_SERVER_ERROR -> errorSnackbar.setText(R.string.error_server).show()
+                            NetworkManager.FAILED_UNKNOWN, NetworkManager.FAILED_CANCELLED ->
+                                errorSnackbar.setText(R.string.error).show()
+                            else -> if (success != NetworkManager.SUCCESS) errorSnackbar.setText(R.string.error).show()
+                        }
+                        // If this is due to a server error, display a link to sph's status page
+                        if (success == NetworkManager.FAILED_MAINTENANCE
+                                || success == NetworkManager.FAILED_SERVER_ERROR
+                                || success == NetworkManager.FAILED_UNKNOWN) {
+                            errorSnackbar.setAction(R.string.sph_status) {
+                                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_status))))
+                            }
+                        }
+                        // Indicate no longer refreshing
+                        swipeRefresh.isRefreshing = false
+                        if (success == NetworkManager.FAILED_INVALID_CREDENTIALS) {
+                            // Credentials seem to be invalid
+                            // Show sign in screen
+                            prefs.edit().remove("credsVerified").apply()
                         }
-                    }
-                    // Indicate no longer refreshing
-                    swipeRefresh.isRefreshing = false
-                    if (success == NetworkManager.FAILED_INVALID_CREDENTIALS) {
-                        // Credentials seem to be invalid
-                        // Show sign in screen
-                        prefs.edit().remove("credsVerified").apply()
                     }
                 }
             }

app/src/main/java/de/koenidv/sph/MainActivity.kt

@@ -11,7 +11,6 @@
 public class DatabaseHelper extends SQLiteOpenHelper {
 
     // todo close db on exit
-    // todo escape everything we put in the db
 
     private static DatabaseHelper instance;
 

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

@@ -62,8 +62,21 @@ class TimetableDb private constructor() {
         // If there are no courses, return an empty list
         if (unorderedList.isNullOrEmpty()) return listOf()
         // Create a list for each day containing as many lesson lists as the timetable has maximum hours per day
-        val orderedList: List<List<MutableList<TimetableEntry>>> = List(5) { day: Int ->
-            List(unorderedList.filter { it.day == day }.maxOf { it.hour }) { mutableListOf() }
+        val orderedList: List<List<MutableList<TimetableEntry>>> = try {
+            List(5) { day: Int ->
+                List(try {
+                    // Get the maximum number of lessons for this day
+                    unorderedList.filter { it.day == day }.maxOf { it.hour }
+                } catch (nse: NoSuchElementException) {
+                    // If there are no lessons for this day
+                    0
+                }) {
+                    // Mutable list for each hour per day
+                    mutableListOf()
+                }
+            }
+        } catch (nse: NoSuchElementException) {
+            List(5) { listOf(mutableListOf()) }
         }
         // Map each lesson to the corresponding day / hour list
         unorderedList.map {

app/src/main/java/de/koenidv/sph/database/TimetableDb.kt

@@ -9,9 +9,9 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import de.koenidv.sph.R
-import de.koenidv.sph.SphPlanner
 import de.koenidv.sph.SphPlanner.Companion.TAG
 import de.koenidv.sph.SphPlanner.Companion.applicationContext
+import de.koenidv.sph.SphPlanner.Companion.prefs
 import de.koenidv.sph.database.ConversationsDb
 import de.koenidv.sph.database.MessagesDb
 import de.koenidv.sph.database.UsersDb
@@ -68,13 +68,14 @@ class Messages {
                 // last=0 - Not yet sure what that does, but it is needed to not get an error
                 NetworkManager().postJsonAuthed(applicationContext().getString(R.string.url_messages),
                         body = mapOf("a" to "headers", "getType" to typeBody, "last" to "0")) { netSuccess, json ->
-                    if (netSuccess == NetworkManager.SUCCESS && json != null) {
+                    if (netSuccess == NetworkManager.SUCCESS && json != null &&
+                            json.get("rows") != "false") {
                         // The response should be a json object with two values:
                         // total - The number of messages matching our request
                         // rows - The encrypted headers for each message
 
                         cryption.decrypt(json.get("rows").toString()) { headers ->
-                            if (headers != null) {
+                            if (headers != null && headers != "") {
                                 val conversations = ConversationsDb()
 
                                 var data: JsonObject
@@ -191,7 +192,7 @@ class Messages {
                                     // Remember the time we updated this
                                     // Not updating this the first time,
                                     // but that shouldn't be an issue
-                                    SphPlanner.prefs.edit().putLong("updated_messages",
+                                    prefs.edit().putLong("updated_messages",
                                             Date().time).apply()
                                 } else {
                                     var index = 0
@@ -214,8 +215,13 @@ class Messages {
                             } else {
                                 // For some reason the decrypted data is null
                                 callback(NetworkManager.FAILED_UNKNOWN)
+                                prefs.edit().putLong("cryption_time", 0).apply()
                             }
                         }
+                    } else {
+                        // The provided data is invalid
+                        callback(NetworkManager.FAILED_UNKNOWN)
+                        prefs.edit().putLong("cryption_time", 0).apply()
                     }
                 }
             }
@@ -371,7 +377,7 @@ class Messages {
                     notifyFragments(conversationId, "contentchanged")
 
                     // Remember the time we updated this
-                    SphPlanner.prefs.edit().putLong(
+                    prefs.edit().putLong(
                             "updated_messages_$conversationId", Date().time).apply()
                 }
             }
@@ -495,7 +501,7 @@ class Messages {
                                 conversation.convId,
                                 TokenManager.userid,
                                 Message.SENDER_TYPE_STUDENT,
-                                SphPlanner.prefs.getString("real_name", "")!!,
+                                prefs.getString("real_name", "")!!,
                                 Date(), // A few seconds later than actual, shouldn't be an issue
                                 conversation.subject,
                                 message,

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

@@ -20,14 +20,11 @@ object CourseInfo {
      */
     fun getFullnameFromInternald(internalCourseId: String): String {
         // Get subject from course id
-        val subject = if (internalCourseId.contains("_"))
-            internalCourseId.substring(0, internalCourseId.indexOf("_"))
-        else internalCourseId
+        val subject = internalCourseId.substringBefore("_")
         // Get a map of full names
         val nameMap = Utility.parseStringArray(R.array.courseId_fullName)
         // Return map value if available, else subject
-        return if (nameMap.containsKey(subject)) nameMap.getValue(subject)
-        else subject.capitalize(Locale.getDefault())
+        return nameMap.getOrElse(subject, { subject.capitalize(Locale.getDefault()) })
     }
 
     /**
@@ -37,7 +34,7 @@ object CourseInfo {
         // Check if the provided id is in fact an internal one
         require(IdParser().getCourseIdType(courseId) == TYPE_INTERNAL)
         // Get subject from course id
-        val subject = courseId.substring(0, courseId.indexOf("_"))
+        val subject = courseId.substringBefore("_")
         // Get a map of short and full names
         val shortMap = Utility.parseStringArray(R.array.courseId_shortName_override)
         val nameMap = Utility.parseStringArray(R.array.courseId_fullName)

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

@@ -38,6 +38,7 @@ class RawParser {
             val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.GERMAN)
 
             // We'll need those below to construct our Change object
+            var dateString: String?
             var date: Date
             var internalId: String?
             var id_course_external: String? = null
@@ -54,10 +55,12 @@ class RawParser {
             // Extract every changes table, i.e. every available day
             for (panel in doc.select("div.panel:not(#menue_tag) div.panel-body")) {
                 // Parse date
-                // Substring: Only get "11.01.2021" from "Vertretungen am 11.01.2021" -> Chars 16-26
-                date = dateFormat.parse(
-                        panel.selectFirst("h3").text()
-                                .substring(16, 26))!!
+                // Only get "11.01.2021" from "Vertretungen am 11.01.2021" -> Chars 16-26
+                dateString = Regex("""\d{1,2}\.\d{1,2}\.\d{2,4}""")
+                        .find(panel.selectFirst("h3").text())?.value
+                date = if (dateString != null)
+                    dateFormat.parse(dateString)!!
+                else Date() // Use current date as fallback if no date was found
 
                 // We are left with a table, each row contains these columns:
                 // title (not needed), lessons (11 11 - 12), classname (Q34), old classname (Q34, mostly empty),