Skip to content

Commit fab390f

Browse files
committed
Rename currentActivity to activityToScreenshot.
1 parent ee3c5ff commit fab390f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/NotificationFeedbackTrigger.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object NotificationFeedbackTrigger : Application.ActivityLifecycleCallbacks {
3131
private var isEnabled = false
3232
private var hasRequestedPermission = false
3333

34-
internal var currentActivity: Activity? = null // Activity to be used for screenshot
34+
internal var activityToScreenshot: Activity? = null
3535

3636
/**
3737
* Initialize the notification trigger for this application.
@@ -122,19 +122,19 @@ object NotificationFeedbackTrigger : Application.ActivityLifecycleCallbacks {
122122
* @param activity the [Activity] object
123123
*/
124124
fun enable(activity: Activity) {
125-
currentActivity = activity
125+
activityToScreenshot = activity
126126
isEnabled = true
127127
showNotification(activity)
128128
}
129129

130130
/** Hide notifications. */
131131
fun disable() {
132-
val activity = currentActivity
132+
val activity = activityToScreenshot
133133
if (activity != null) {
134134
cancelNotification(activity)
135135
}
136136
isEnabled = false
137-
currentActivity = null
137+
activityToScreenshot = null
138138
}
139139

140140
private fun showNotification(context: Context) {
@@ -169,15 +169,15 @@ object NotificationFeedbackTrigger : Application.ActivityLifecycleCallbacks {
169169
if (isEnabled) {
170170
if (activity !is TakeScreenshotAndTriggerFeedbackActivity) {
171171
Log.d(TAG, "setting current activity")
172-
currentActivity = activity
172+
activityToScreenshot = activity
173173
}
174174
}
175175
}
176176

177177
override fun onActivityDestroyed(activity: Activity) {
178-
if (activity == currentActivity) {
178+
if (activity == activityToScreenshot) {
179179
Log.d(TAG, "clearing current activity")
180-
currentActivity = null
180+
activityToScreenshot = null
181181
}
182182
}
183183

@@ -192,9 +192,9 @@ object NotificationFeedbackTrigger : Application.ActivityLifecycleCallbacks {
192192
class TakeScreenshotAndTriggerFeedbackActivity : Activity() {
193193
override fun onCreate(savedInstanceState: Bundle?) {
194194
super.onCreate(savedInstanceState)
195-
val activity = NotificationFeedbackTrigger.currentActivity // points to the previous activity
195+
val activity = NotificationFeedbackTrigger.activityToScreenshot
196196
if (activity == null) {
197-
Log.e(TAG, "Can't take screenshot because current activity is unknown")
197+
Log.e(TAG, "Can't take screenshot because activity is unknown")
198198
return
199199
}
200200
takeScreenshot(activity)

0 commit comments

Comments
 (0)