From d305a6bd49285ff15dc5e59c82ada6d69eea497b Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 14 Nov 2016 14:41:10 +0100
Subject: [PATCH] Change time used for popup for a timestamp

---
 src/org/linphone/LinphoneActivity.java |  8 +++++---
 src/org/linphone/LinphoneManager.java  | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 763e7d1e9..a6985bf37 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -19,12 +19,14 @@ package org.linphone;
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 import org.linphone.LinphoneManager.AddressType;
@@ -1740,11 +1742,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void displayInappNotification(String date) {
-		long now = Calendar.getInstance().getTimeInMillis();
-		if (LinphonePreferences.instance().getInappPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getInappPopupTime()) < now) {
+		Timestamp now = new Timestamp(new Date().getTime());
+		if (LinphonePreferences.instance().getInappPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getInappPopupTime()) < now.getTime()) {
 			return;
 		} else {
-			long newDate = now + (getResources().getInteger(R.integer.time_between_inapp_notification)*60);
+			long newDate = now.getTime() + getResources().getInteger(R.integer.time_between_inapp_notification);
 			LinphonePreferences.instance().setInappPopupTime(String.valueOf(newDate));
 		}
 		if(isTrialAccount){
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index dc879a959..761f757a6 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -29,8 +29,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -1449,9 +1451,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	public void isAccountWithAlias(){
 		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
-			long now = Calendar.getInstance().getTimeInMillis();
+			Timestamp now = new Timestamp(new Date().getTime());
 			if (LinphonePreferences.instance().getLinkPopupTime() == null
-					|| Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) {
+					|| Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now.getTime()) {
 				accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
 				accountCreator.isAccountUsed();
 			}
@@ -1461,8 +1463,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	}
 
 	private void askLinkWithPhoneNumber(){
-		long now = Calendar.getInstance().getTimeInMillis();
-		long newDate = now + (LinphoneActivity.instance().getResources().getInteger(R.integer.popup_time_interval)*60);
+		Timestamp now = new Timestamp(new Date().getTime());
+		long newDate = now.getTime() + LinphoneActivity.instance().getResources().getInteger(R.integer.popup_time_interval);
 
 		LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate));