Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7fbf467 authored by Philipp Heckel's avatar Philipp Heckel
Browse files

Fix back stack; properly update auth user via detail settings; works

parent 80570eb3

app/src/main/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 
        <activity

                android:name=".ui.DetailSettingsActivity"

                android:parentActivityName=".ui.DetailActivity">

            <meta-data

                    android:name="android.support.PARENT_ACTIVITY"

                    android:value=".ui.DetailActivity"/>

        </activity>



        <!-- Subscriber foreground service for hosts other than ntfy.sh -->

app/src/main/java/io/heckel/ntfy/db/Database.kt

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ interface SubscriptionDao { 
    @Update

    fun update(subscription: Subscription)



    @Query("UPDATE subscription SET authUserId = :authUserId WHERE id = :subscriptionId")

    fun updateSubscriptionAuthUserId(subscriptionId: Long, authUserId: Long?)



    @Query("DELETE FROM subscription WHERE id = :subscriptionId")

    fun remove(subscriptionId: Long)

app/src/main/java/io/heckel/ntfy/db/Repository.kt

+5 −1
Original line number Diff line number Diff line
@@ -78,13 +78,17 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas 
        subscriptionDao.update(subscription)

    }



    fun updateSubscriptionAuthUserId(subscriptionId: Long, authUserId: Long?) {

        subscriptionDao.updateSubscriptionAuthUserId(subscriptionId, authUserId)

    }



    @Suppress("RedundantSuspendModifier")

    @WorkerThread

    suspend fun removeSubscription(subscriptionId: Long) {

        subscriptionDao.remove(subscriptionId)

    }



    suspend fun removeAuthUserFromSubscriptions(authUserId: Long) {

    fun removeAuthUserFromSubscriptions(authUserId: Long) {

        subscriptionDao.removeAuthUserFromSubscriptions(authUserId)

    }

app/src/main/java/io/heckel/ntfy/msg/ApiService.kt

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ class ApiService { 
            .url(url)

            .addHeader("User-Agent", USER_AGENT)

            .build()



        // XXXXXXXXXXXx



        client.newCall(request).execute().use { response ->

            if (!response.isSuccessful) {

                throw Exception("Unexpected response ${response.code} when polling topic $url")

app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt

+5 −1
Original line number Diff line number Diff line
@@ -448,7 +448,10 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra 


    private fun onSettingsClick() {

        Log.d(TAG, "Opening subscription settings for ${topicShortUrl(subscriptionBaseUrl, subscriptionTopic)}")

        startActivity(Intent(this, DetailSettingsActivity::class.java))



        val intent = Intent(this, DetailSettingsActivity::class.java)

        intent.putExtra(EXTRA_SUBSCRIPTION_ID, subscriptionId)

        startActivity(intent)

    }



    private fun onDeleteClick() {
@@ -622,5 +625,6 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra 


    companion object {

        const val TAG = "NtfyDetailActivity"

        const val EXTRA_SUBSCRIPTION_ID = "subscriptionId"

    }

}