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

update linphone submodule and remove forced dependency on firebase

Browse source
This commit is contained in:
Simon Morlat 2018-02-22 10:15:13 +01:00
parent 4b95f7ed30
commit 2ae5908827
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/org/linphone/LinphoneManager.java
View file

@ -72,8 +72,6 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.Toast; import android.widget.Toast;
import com.google.firebase.iid.FirebaseInstanceId;
import org.linphone.call.CallActivity; import org.linphone.call.CallActivity;
import org.linphone.call.CallIncomingActivity; import org.linphone.call.CallIncomingActivity;
import org.linphone.activities.LinphoneActivity; import org.linphone.activities.LinphoneActivity;
@ -679,7 +677,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
Log.i("[Push Notification] Assuming GCM jar is not provided."); Log.i("[Push Notification] Assuming GCM jar is not provided.");
} }
}else if (getString(R.string.push_type).equals("firebase")){ }else if (getString(R.string.push_type).equals("firebase")){
final String refreshedToken = FirebaseInstanceId.getInstance().getToken(); final String refreshedToken = com.google.firebase.iid.FirebaseInstanceId.getInstance().getToken();
if (refreshedToken != null) { if (refreshedToken != null) {
Log.i("[Push Notification] current token is: " + refreshedToken); Log.i("[Push Notification] current token is: " + refreshedToken);
LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken); LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 963811044bcf6159f81f17d5cf2be754bbdeb258 Subproject commit 2e8f7dade9dc7ec316a656094fa8e115d99b197b