Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1264815 - Add a 'showPersistentAlertNotification' method to GeckoAppShell. r=kcambridge

Browse Source
This commit is contained in:
SUN Haitao 2016-04-17 21:18:20 +08:00
parent bc7d6ef55c
commit 9b7b1f5140
7 changed files with 116 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dom/notification/Notification.cpp
View File

@ -6,6 +6,7 @@
#include "mozilla/dom/Notification.h"
#include "mozilla/JSONWriter.h"
#include "mozilla/Move.h"
#include "mozilla/OwningNonNull.h"
#include "mozilla/Preferences.h"
@ -1665,6 +1666,19 @@ Notification::IsInPrivateBrowsing()
return false;
}
namespace {
struct StringWriteFunc : public JSONWriteFunc
{
nsAString& mBuffer; // This struct must not outlive this buffer
explicit StringWriteFunc(nsAString& buffer) : mBuffer(buffer) {}
void Write(const char* aStr)
{
mBuffer.Append(NS_ConvertUTF8toUTF16(aStr));
}
};
}
void
Notification::ShowInternal()
{
@ -1716,6 +1730,7 @@ Notification::ShowInternal()
nsAutoString soundUrl;
ResolveIconAndSoundURL(iconUrl, soundUrl);
bool isPersistent = false;
nsCOMPtr<nsIObserver> observer;
if (mScope.IsEmpty()) {
// Ownership passed to observer.
@ -1730,6 +1745,7 @@ Notification::ShowInternal()
observer = new MainThreadNotificationObserver(Move(ownership));
}
} else {
isPersistent = true;
// This observer does not care about the Notification. It will be released
// at the end of this function.
//
@ -1813,6 +1829,7 @@ Notification::ShowInternal()
nsCOMPtr<nsIAlertNotification> alert =
do_CreateInstance(ALERT_NOTIFICATION_CONTRACTID);
NS_ENSURE_TRUE_VOID(alert);
nsIPrincipal* principal = GetPrincipal();
rv = alert->Init(alertName, iconUrl, mTitle, mBody,
true,
uniqueCookie,
@ -1822,7 +1839,29 @@ Notification::ShowInternal()
GetPrincipal(),
inPrivateBrowsing);
NS_ENSURE_SUCCESS_VOID(rv);
alertService->ShowAlert(alert, alertObserver);
if (isPersistent) {
nsAutoString persistentData;
JSONWriter w(MakeUnique<StringWriteFunc>(persistentData));
w.Start();
nsAutoString origin;
Notification::GetOrigin(principal, origin);
w.StringProperty("origin", NS_ConvertUTF16toUTF8(origin).get());
w.StringProperty("id", NS_ConvertUTF16toUTF8(mID).get());
nsAutoCString originSuffix;
principal->GetOriginSuffix(originSuffix);
w.StringProperty("originSuffix", originSuffix.get());
w.End();
alertService->ShowPersistentNotification(persistentData, alert, alertObserver);
} else {
alertService->ShowAlert(alert, alertObserver);
}
}
/* static */ bool

13
mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java
View File

@ -896,6 +896,19 @@ public class GeckoAppShell
}
}
@WrapForJNI(stubName = "ShowPersistentAlertNotificationWrapper")
public static void showPersistentAlertNotification(
String aPersistentData,
String aImageUrl, String aAlertTitle, String aAlertText,
String aAlertCookie, String aAlertName, String aHost) {
Intent notificationIntent = GeckoService.getIntentToCreateServices(
getApplicationContext(), "persistent-notification-click", aPersistentData);
int notificationID = aAlertName.hashCode();
PendingIntent contentIntent = PendingIntent.getService(
getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
notificationClient.add(notificationID, aImageUrl, aHost, aAlertTitle, aAlertText, contentIntent);
}
@WrapForJNI(stubName = "ShowAlertNotificationWrapper")
public static void showAlertNotification(String aImageUrl, String aAlertTitle, String aAlertText, String aAlertCookie, String aAlertName, String aHost) {
// The intent to launch when the user clicks the expanded notification

10
toolkit/components/alerts/nsAlertsService.cpp
View File

@ -252,8 +252,14 @@ NS_IMETHODIMP nsAlertsService::ShowPersistentNotification(const nsAString & aPer
rv = aAlert->GetPrincipal(getter_AddRefs(principal));
NS_ENSURE_SUCCESS(rv, rv);
mozilla::AndroidBridge::Bridge()->ShowAlertNotification(imageUrl, title, text, cookie,
aAlertListener, name, principal);
if (!aPersistentData.IsEmpty()) {
mozilla::AndroidBridge::Bridge()->ShowPersistentAlertNotification
(aPersistentData, imageUrl, title, text, cookie, name, principal);
} else {
mozilla::AndroidBridge::Bridge()->ShowAlertNotification
(imageUrl, title, text, cookie, aAlertListener, name, principal);
}
return NS_OK;
#else
// Check if there is an optional service that handles system-level notifications

16
widget/android/AndroidBridge.cpp
View File

@ -507,6 +507,22 @@ AndroidBridge::GetClipboardText(nsAString& aText)
return !!text;
}
void
AndroidBridge::ShowPersistentAlertNotification(const nsAString& aPersistentData,
const nsAString& aImageUrl,
const nsAString& aAlertTitle,
const nsAString& aAlertText,
const nsAString& aAlertCookie,
const nsAString& aAlertName,
nsIPrincipal* aPrincipal)
{
nsAutoString host;
nsAlertsUtils::GetSourceHostPort(aPrincipal, host);
GeckoAppShell::ShowPersistentAlertNotificationWrapper
(aPersistentData, aImageUrl, aAlertTitle, aAlertText, aAlertCookie, aAlertName, host);
}
void
AndroidBridge::ShowAlertNotification(const nsAString& aImageUrl,
const nsAString& aAlertTitle,

10
widget/android/AndroidBridge.h
View File

@ -177,10 +177,18 @@ public:
bool GetClipboardText(nsAString& aText);
void ShowPersistentAlertNotification(const nsAString& aPersistentData,
const nsAString& aImageUrl,
const nsAString& aAlertTitle,
const nsAString& aAlertText,
const nsAString& aAlertCookie,
const nsAString& aAlertName,
nsIPrincipal* aPrincipal);
void ShowAlertNotification(const nsAString& aImageUrl,
const nsAString& aAlertTitle,
const nsAString& aAlertText,
const nsAString& aAlertData,
const nsAString& aAlertCookie,
nsIObserver *aAlertListener,
const nsAString& aAlertName,
nsIPrincipal* aPrincipal);

8
widget/android/GeneratedJNIWrappers.cpp
View File

@ -685,6 +685,14 @@ auto GeckoAppShell::ShowAlertNotificationWrapper(mozilla::jni::String::Param a0,
return mozilla::jni::Method<ShowAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5);
}
constexpr char GeckoAppShell::ShowPersistentAlertNotificationWrapper_t::name[];
constexpr char GeckoAppShell::ShowPersistentAlertNotificationWrapper_t::signature[];
auto GeckoAppShell::ShowPersistentAlertNotificationWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, mozilla::jni::String::Param a4, mozilla::jni::String::Param a5, mozilla::jni::String::Param a6) -> void
{
return mozilla::jni::Method<ShowPersistentAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5, a6);
}
constexpr char GeckoAppShell::StartMonitoringGamepad_t::name[];
constexpr char GeckoAppShell::StartMonitoringGamepad_t::signature[];

22
widget/android/GeneratedJNIWrappers.h
View File

@ -1430,6 +1430,28 @@ public:
static auto ShowAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
struct ShowPersistentAlertNotificationWrapper_t {
typedef GeckoAppShell Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param> Args;
static constexpr char name[] = "showPersistentAlertNotification";
static constexpr char signature[] =
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V";
static const bool isStatic = true;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
};
static auto ShowPersistentAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void;
struct StartMonitoringGamepad_t {
typedef GeckoAppShell Owner;
typedef void ReturnType;