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

Fix firebase. If the token is changed by the system while core is not yet instanciated, it was never saved and lost for ever.

Browse source
This commit is contained in:
Simon Morlat 2018-02-21 14:58:50 +01:00
parent 703934a221
commit 64131854ab
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -293,7 +293,7 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<service android:name=".firebase.FirebaseIdService"> <service android:name=".firebase.FirebaseIdService" android:exported="true">
<intent-filter> <intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/> <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter> </intent-filter>

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

@ -72,6 +72,8 @@ 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;
@ -676,6 +678,12 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
} catch (Exception e1) { } catch (Exception e1) {
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")){
final String refreshedToken = FirebaseInstanceId.getInstance().getToken();
if (refreshedToken != null) {
Log.i("[Push Notification] current token is: " + refreshedToken);
LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);
}
} }
} }

11
src/android/org/linphone/LinphonePreferences.java
View file

@ -1143,10 +1143,13 @@ public class LinphonePreferences {
if (regId != null && lc.getProxyConfigList().length > 0) { if (regId != null && lc.getProxyConfigList().length > 0) {
for (ProxyConfig lpc : lc.getProxyConfigList()) { for (ProxyConfig lpc : lc.getProxyConfigList()) {
String contactInfos = "app-id=" + appId + ";pn-type=" + getString(R.string.push_type) + ";pn-tok=" + regId + ";pn-silent=1"; String contactInfos = "app-id=" + appId + ";pn-type=" + getString(R.string.push_type) + ";pn-tok=" + regId + ";pn-silent=1";
lpc.edit(); String prevContactParams = lpc.getContactParameters();
lpc.setContactUriParameters(contactInfos); if (prevContactParams == null || prevContactParams.compareTo(contactInfos)!=0) {
lpc.done(); lpc.edit();
Log.d("Push notif infos added to proxy config " + lpc.getIdentityAddress().asStringUriOnly()); lpc.setContactUriParameters(contactInfos);
lpc.done();
Log.d("Push notif infos added to proxy config " + lpc.getIdentityAddress().asStringUriOnly());
}
} }
lc.refreshRegisters(); lc.refreshRegisters();
} }

8
src/android/org/linphone/firebase/FirebaseIdService.java
View file

@ -30,14 +30,8 @@ public class FirebaseIdService extends FirebaseInstanceIdService {
@Override @Override
public void onTokenRefresh() { public void onTokenRefresh() {
// Get updated InstanceID token. // Get updated InstanceID token.
String refreshedToken = FirebaseInstanceId.getInstance().getToken(); final String refreshedToken = FirebaseInstanceId.getInstance().getToken();
android.util.Log.i("FirebaseIdService", "[Push Notification] Refreshed token: " + refreshedToken); android.util.Log.i("FirebaseIdService", "[Push Notification] Refreshed token: " + refreshedToken);
sendRegistrationToServer(refreshedToken);
}
private void sendRegistrationToServer(final String refreshedToken) {
android.util.Log.i("FirebaseIdService", "[Push Notification] Send token to server: " + refreshedToken);
LinphoneUtils.dispatchOnUIThread(new Runnable() { LinphoneUtils.dispatchOnUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {