Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-10 13:02:35 +01:00
Code Issues Releases Activity

fix/weakRef (#452)

Browse Source 
* Add activity context wrapper for images

* Remove unused receiver

* Add action check

* Add image activity logging

* Do not log image url
This commit is contained in:
Allan Wang 2017-10-29 13:17:31 -04:00 committed by GitHub
parent ca12899e10
commit d82a9b9e29
4 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -156,9 +156,6 @@
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
</intent-filter>
</receiver>
<receiver
android:name=".services.NotificationReceiver"
android:enabled="true" />
<provider
android:name="android.support.v4.content.FileProvider"

7
app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
View File

@ -31,8 +31,8 @@ import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R
import com.pitchedapps.frost.utils.*
import com.sothree.slidinguppanel.SlidingUpPanelLayout
import org.jetbrains.anko.activityUiThreadWithContext
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
import java.io.File
import java.io.IOException
@ -76,7 +76,7 @@ class ImageActivity : KauBaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
L.i("Displaying image $imageUrl")
L.i("Displaying image", imageUrl)
val layout = if (!text.isNullOrBlank()) R.layout.activity_image else R.layout.activity_image_textless
setContentView(layout)
container.setBackgroundColor(Prefs.bgColor.withMinAlpha(222))
@ -179,7 +179,7 @@ class ImageActivity : KauBaseActivity() {
success = false
} finally {
L.d("Download image async finished: $success")
uiThread {
activityUiThreadWithContext {
val text = if (success) R.string.image_download_success else R.string.image_download_fail
frostSnackbar(text)
if (success) fabAction = FabStates.SHARE
@ -199,6 +199,7 @@ class ImageActivity : KauBaseActivity() {
override fun onDestroy() {
deleteTempFile()
if (!BuildConfig.DEBUG) L.d("Closing $localClassName")
super.onDestroy()
}
}

34
app/src/main/kotlin/com/pitchedapps/frost/services/NotificationReceiver.kt
View File

@ -1,34 +0,0 @@
package com.pitchedapps.frost.services
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.support.v4.app.NotificationManagerCompat
import com.pitchedapps.frost.utils.L
/**
* Created by Allan Wang on 2017-08-04.
*
* Cancels a notification
*/
private const val NOTIF_TAG_TO_CANCEL = "notif_tag_to_cancel"
private const val NOTIF_ID_TO_CANCEL = "notif_id_to_cancel"
class NotificationReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
L.d("NotificationReceiver triggered")
val notifTag = intent.getStringExtra(NOTIF_TAG_TO_CANCEL)
val notifId = intent.getIntExtra(NOTIF_ID_TO_CANCEL, -1)
if (notifId != -1) {
L.d("NotificationReceiver: Cancelling $notifTag $notifId")
NotificationManagerCompat.from(context).cancel(notifTag, notifId)
}
}
}
fun Context.getNotificationPendingCancelIntent(tag: String?, notifId: Int): PendingIntent {
val cancelIntent = Intent(this, NotificationReceiver::class.java)
.putExtra(NOTIF_TAG_TO_CANCEL, tag).putExtra(NOTIF_ID_TO_CANCEL, notifId)
return PendingIntent.getBroadcast(this, 0, cancelIntent, 0)
}

2
app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt
View File

@ -13,8 +13,8 @@ import com.pitchedapps.frost.utils.Prefs
*/
class UpdateReceiver : BroadcastReceiver() {
//todo check action warning
override fun onReceive(context: Context, intent: Intent) {
if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
L.d("Frost has updated")
context.scheduleNotifications(Prefs.notificationFreq) //Update notifications
}