Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change time used for popup for a timestamp

Browse source
This commit is contained in:
Erwan Croze 2016-11-14 14:41:10 +01:00
parent 2f27cbfafb
commit d305a6bd49
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/org/linphone/LinphoneActivity.java
View file

@ -19,12 +19,14 @@ package org.linphone;
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.List; import java.util.List;
import org.linphone.LinphoneManager.AddressType; import org.linphone.LinphoneManager.AddressType;
@ -1740,11 +1742,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
} }
public void displayInappNotification(String date) { public void displayInappNotification(String date) {
long now = Calendar.getInstance().getTimeInMillis(); Timestamp now = new Timestamp(new Date().getTime());
if (LinphonePreferences.instance().getInappPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getInappPopupTime()) < now) { if (LinphonePreferences.instance().getInappPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getInappPopupTime()) < now.getTime()) {
return; return;
} else { } 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)); LinphonePreferences.instance().setInappPopupTime(String.valueOf(newDate));
} }
if(isTrialAccount){ if(isTrialAccount){

10
src/org/linphone/LinphoneManager.java
View file

@ -29,8 +29,10 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@ -1449,9 +1451,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void isAccountWithAlias(){ public void isAccountWithAlias(){
if(LinphoneManager.getLc().getDefaultProxyConfig() != null) { if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
long now = Calendar.getInstance().getTimeInMillis(); Timestamp now = new Timestamp(new Date().getTime());
if (LinphonePreferences.instance().getLinkPopupTime() == null 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.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
accountCreator.isAccountUsed(); accountCreator.isAccountUsed();
} }
@ -1461,8 +1463,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
private void askLinkWithPhoneNumber(){ private void askLinkWithPhoneNumber(){
long now = Calendar.getInstance().getTimeInMillis(); Timestamp now = new Timestamp(new Date().getTime());
long newDate = now + (LinphoneActivity.instance().getResources().getInteger(R.integer.popup_time_interval)*60); long newDate = now.getTime() + LinphoneActivity.instance().getResources().getInteger(R.integer.popup_time_interval);
LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate)); LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate));