yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-05 10:49:26 +02:00
Code Issues Projects Releases Wiki Activity

Add option to show exception from the background task logic main loop

Browse source
This commit is contained in:
Jonas Lochmann 2019-09-09 00:00:00 +00:00
parent 422e823c29
commit 6dbb7579e8
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
5 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
View file

@ -49,6 +49,7 @@ import java.util.*
class BackgroundTaskLogic(val appLogic: AppLogic) {
var pauseBackgroundLoop = false
val lastLoopException = MutableLiveData<Exception?>().apply { value = null }
companion object {
private const val CHECK_PERMISSION_INTERVAL = 10 * 1000L // all 10 seconds
@ -531,6 +532,7 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
}
} catch (ex: SecurityException) {
// this is handled by an other main loop (with a delay)
lastLoopException.postValue(ex)
appLogic.platformIntegration.setAppStatusMessage(AppStatusMessage(
appLogic.context.getString(R.string.background_logic_error),
@ -542,6 +544,8 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
Log.w(LOG_TAG, "exception during running main loop", ex)
}
lastLoopException.postValue(ex)
appLogic.platformIntegration.setAppStatusMessage(AppStatusMessage(
appLogic.context.getString(R.string.background_logic_error),
appLogic.context.getString(R.string.background_logic_error_internal)

14
app/src/main/java/io/timelimit/android/ui/diagnose/DiagnoseMainFragment.kt
View file

@ -20,15 +20,18 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation
import io.timelimit.android.R
import io.timelimit.android.databinding.FragmentDiagnoseMainBinding
import io.timelimit.android.extensions.safeNavigate
import io.timelimit.android.logic.DefaultAppLogic
class DiagnoseMainFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val binding = FragmentDiagnoseMainBinding.inflate(inflater, container, false)
val navigation = Navigation.findNavController(container!!)
val logic = DefaultAppLogic.with(context!!)
binding.diagnoseClockButton.setOnClickListener {
navigation.safeNavigate(
@ -65,6 +68,17 @@ class DiagnoseMainFragment : Fragment() {
)
}
logic.backgroundTaskLogic.lastLoopException.observe(this, Observer { ex ->
if (ex != null) {
binding.diagnoseBgTaskLoopExButton.isEnabled = true
binding.diagnoseBgTaskLoopExButton.setOnClickListener {
DiagnoseExceptionDialogFragment.newInstance(ex).show(fragmentManager!!)
}
} else {
binding.diagnoseBgTaskLoopExButton.isEnabled = false
}
})
return binding.root
}
}

7
app/src/main/res/layout/fragment_diagnose_main.xml
View file

@ -56,6 +56,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/diagnose_bg_task_loop_ex_button"
android:text="@string/diagnose_bg_task_loop_ex"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>

2
app/src/main/res/values-de/strings-diagnose.xml
View file

@ -56,4 +56,6 @@
<string name="diagnose_exf_lom">Sperrung nach Manipulationen deaktivieren</string>
<string name="diagnose_exf_slb">Apps auf Systemebene sperren</string>
<string name="diagnose_exf_mau">Nutzer nach Manipulation nerven</string>
<string name="diagnose_bg_task_loop_ex">Hintergrundaufgabenschleifenfehler</string>
</resources>

2
app/src/main/res/values/strings-diagnose.xml
View file

@ -56,4 +56,6 @@
<string name="diagnose_exf_lom">Disable locking after manipulations</string>
<string name="diagnose_exf_slb">Block Apps at system level</string>
<string name="diagnose_exf_mau">Annoy user after manipulation</string>
<string name="diagnose_bg_task_loop_ex">Background task loop exception</string>
</resources>