diff --git a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
index b590827..729d74a 100644
--- a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
@@ -20,10 +20,14 @@ import android.content.Intent
import android.os.Build
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.view.View
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import io.timelimit.android.R
+import io.timelimit.android.livedata.map
import io.timelimit.android.logic.DefaultAppLogic
+import io.timelimit.android.ui.manage.device.manage.ManipulationWarningTypeLabel
+import io.timelimit.android.ui.manage.device.manage.ManipulationWarnings
import io.timelimit.android.util.TimeTextUtil
import kotlinx.android.synthetic.main.annoy_activity.*
@@ -67,6 +71,27 @@ class AnnoyActivity : AppCompatActivity() {
getString(R.string.annoy_timer, TimeTextUtil.seconds(it.toInt(), this@AnnoyActivity))
)
})
+
+ logic.deviceEntry.map {
+ val reasonItems = (it?.let { ManipulationWarnings.getFromDevice(it) } ?: ManipulationWarnings.empty)
+ .current
+ .map {
+ getString(ManipulationWarningTypeLabel.getLabel(it))
+ }
+
+ if (reasonItems.isEmpty()) {
+ null
+ } else {
+ getString(R.string.annoy_reason, reasonItems.joinToString(separator = ", "))
+ }
+ }.observe(this, Observer {
+ if (it.isNullOrEmpty()) {
+ annoy_reason.visibility = View.GONE
+ } else {
+ annoy_reason.visibility = View.VISIBLE
+ annoy_reason.setText(it)
+ }
+ })
}
private fun shutdown() {
diff --git a/app/src/main/res/layout/annoy_activity.xml b/app/src/main/res/layout/annoy_activity.xml
index fa65b4b..a9d9806 100644
--- a/app/src/main/res/layout/annoy_activity.xml
+++ b/app/src/main/res/layout/annoy_activity.xml
@@ -14,13 +14,35 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
+ android:layout_height="match_parent">
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values-de/strings-annoy.xml b/app/src/main/res/values-de/strings-annoy.xml
index c158f85..94b4efb 100644
--- a/app/src/main/res/values-de/strings-annoy.xml
+++ b/app/src/main/res/values-de/strings-annoy.xml
@@ -20,4 +20,7 @@
Das Gerät wird in %s entsperrt.
+
+ Folgendes wurde manipuliert: %s
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-annoy.xml b/app/src/main/res/values/strings-annoy.xml
index c329c29..5a8d6b2 100644
--- a/app/src/main/res/values/strings-annoy.xml
+++ b/app/src/main/res/values/strings-annoy.xml
@@ -20,4 +20,7 @@
The device will be unlocked in %s.
+
+ This was manipulated: %s
+
\ No newline at end of file