Permalink
Browse files

Bug 733320 - [WebSMS][B2G SMS] Add 'read' attribute to nsIDOMMozSmsMe…

…ssage. Part 3 - Android Backend; r=mounir
  • Loading branch information...
1 parent 9a16cf6 commit 2623d11948a2c77fda240b496f57dcee50ec7da5 @ferjm ferjm committed May 17, 2012
Showing with 27 additions and 80 deletions.
  1. +11 −35 dom/sms/src/android/SmsDatabaseService.cpp
  2. +6 −38 dom/sms/src/android/SmsService.cpp
  3. +10 −7 widget/android/AndroidJNI.cpp
@@ -1,39 +1,7 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Mounir Lamouri <mounir.lamouri@mozilla.com> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "SmsFilter.h"
#include "SmsDatabaseService.h"
@@ -132,6 +100,14 @@ SmsDatabaseService::ClearMessageList(PRInt32 aListId)
return NS_OK;
}
+NS_IMETHODIMP
+SmsDatabaseService::MarkMessageRead(PRInt32 aMessageId, bool aValue,
+ PRInt32 aRequestId, PRUint64 aProcessId)
+{
+ // TODO: This would need to be implemented as part of Bug 748391
+ return NS_OK;
+}
+
} // namespace sms
} // namespace dom
} // namespace mozilla
@@ -1,40 +1,7 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Mounir Lamouri <mounir.lamouri@mozilla.com> (Original Author)
- * Philipp von Weitershausen <philipp@weitershausen.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/sms/SmsMessage.h"
#include "SmsService.h"
@@ -86,11 +53,12 @@ SmsService::CreateSmsMessage(PRInt32 aId,
const nsAString& aReceiver,
const nsAString& aBody,
const jsval& aTimestamp,
+ const bool aRead,
JSContext* aCx,
nsIDOMMozSmsMessage** aMessage)
{
- return SmsMessage::Create(
- aId, aDelivery, aSender, aReceiver, aBody, aTimestamp, aCx, aMessage);
+ return SmsMessage::Create(aId, aDelivery, aSender, aReceiver, aBody,
+ aTimestamp, aRead, aCx, aMessage);
}
} // namespace sms
@@ -252,7 +252,7 @@ Java_org_mozilla_gecko_GeckoAppShell_notifySmsReceived(JNIEnv* jenv, jclass,
};
SmsMessageData message(0, eDeliveryState_Received, nsJNIString(aSender, jenv), EmptyString(),
- nsJNIString(aBody, jenv), aTimestamp);
+ nsJNIString(aBody, jenv), aTimestamp, false);
nsCOMPtr<nsIRunnable> runnable = new NotifySmsReceivedRunnable(message);
NS_DispatchToMainThread(runnable);
@@ -338,7 +338,7 @@ Java_org_mozilla_gecko_GeckoAppShell_notifySmsSent(JNIEnv* jenv, jclass,
SmsMessageData message(aId, eDeliveryState_Sent, EmptyString(),
nsJNIString(aReceiver, jenv),
- nsJNIString(aBody, jenv), aTimestamp);
+ nsJNIString(aBody, jenv), aTimestamp, true);
nsCOMPtr<nsIRunnable> runnable = new NotifySmsSentRunnable(message, aRequestId, aProcessId);
NS_DispatchToMainThread(runnable);
@@ -375,7 +375,7 @@ Java_org_mozilla_gecko_GeckoAppShell_notifySmsDelivered(JNIEnv* jenv, jclass,
SmsMessageData message(aId, eDeliveryState_Sent, EmptyString(),
nsJNIString(aReceiver, jenv),
- nsJNIString(aBody, jenv), aTimestamp);
+ nsJNIString(aBody, jenv), aTimestamp, true);
nsCOMPtr<nsIRunnable> runnable = new NotifySmsDeliveredRunnable(message);
NS_DispatchToMainThread(runnable);
@@ -481,8 +481,9 @@ Java_org_mozilla_gecko_GeckoAppShell_notifyGetSms(JNIEnv* jenv, jclass,
DeliveryState state = receiver.IsEmpty() ? eDeliveryState_Received
: eDeliveryState_Sent;
+ // TODO Need to add the message `read` parameter value. Bug 748391
SmsMessageData message(aId, state, nsJNIString(aSender, jenv), receiver,
- nsJNIString(aBody, jenv), aTimestamp);
+ nsJNIString(aBody, jenv), aTimestamp, true);
nsCOMPtr<nsIRunnable> runnable = new NotifyGetSmsRunnable(message, aRequestId, aProcessId);
NS_DispatchToMainThread(runnable);
@@ -736,8 +737,9 @@ Java_org_mozilla_gecko_GeckoAppShell_notifyListCreated(JNIEnv* jenv, jclass,
DeliveryState state = receiver.IsEmpty() ? eDeliveryState_Received
: eDeliveryState_Sent;
+ // TODO Need to add the message `read` parameter value. Bug 748391
SmsMessageData message(aMessageId, state, nsJNIString(aSender, jenv),
- receiver, nsJNIString(aBody, jenv), aTimestamp);
+ receiver, nsJNIString(aBody, jenv), aTimestamp, true);
nsCOMPtr<nsIRunnable> runnable =
new NotifyCreateMessageListRunnable(aListId, message, aRequestId, aProcessId);
@@ -795,9 +797,10 @@ Java_org_mozilla_gecko_GeckoAppShell_notifyGotNextMessage(JNIEnv* jenv, jclass,
nsJNIString receiver = nsJNIString(aReceiver, jenv);
DeliveryState state = receiver.IsEmpty() ? eDeliveryState_Received
: eDeliveryState_Sent;
-
+
+ // TODO Need to add the message `read` parameter value. Bug 748391
SmsMessageData message(aMessageId, state, nsJNIString(aSender, jenv),
- receiver, nsJNIString(aBody, jenv), aTimestamp);
+ receiver, nsJNIString(aBody, jenv), aTimestamp, true);
nsCOMPtr<nsIRunnable> runnable =
new NotifyGotNextMessageRunnable(message, aRequestId, aProcessId);

0 comments on commit 2623d11

Please sign in to comment.