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

Updated firebase + fixed crash if domains contains port information

Browse source
This commit is contained in:
Sylvain Berfini 2019-07-26 16:40:45 +02:00
parent 4ca4892378
commit c840456ff9
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -152,7 +152,7 @@ android {
dependencies { dependencies {
if (firebaseEnabled()) { if (firebaseEnabled()) {
implementation 'com.google.firebase:firebase-messaging:17.5.0' implementation 'com.google.firebase:firebase-messaging:19.0.1'
} }
implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.appcompat:appcompat:1.0.2'

4
app/src/main/AndroidManifest.xml
View file

@ -237,7 +237,9 @@
android:resource="@xml/authenticator" /> android:resource="@xml/authenticator" />
</service> </service>
<service android:name=".firebase.FirebaseMessaging"> <service android:name=".firebase.FirebaseMessaging"
android:enabled="true"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" /> <action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter> </intent-filter>

5
app/src/main/java/org/linphone/assistant/AssistantActivity.java
View file

@ -19,11 +19,6 @@ along with this program; if not, write to the Free Software
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 static org.linphone.core.AccountCreator.UsernameStatus.Invalid;
import static org.linphone.core.AccountCreator.UsernameStatus.InvalidCharacters;
import static org.linphone.core.AccountCreator.UsernameStatus.TooLong;
import static org.linphone.core.AccountCreator.UsernameStatus.TooShort;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;

5
app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
View file

@ -258,6 +258,11 @@ public class AccountSettingsFragment extends SettingsFragment {
if (newValue.isEmpty()) { if (newValue.isEmpty()) {
return; return;
} }
if (newValue.contains(":")) {
Log.e(
"[Account Settings] Do not specify port information inside domain field !");
return;
}
if (mAuthInfo != null) { if (mAuthInfo != null) {
mAuthInfo.setDomain(newValue); mAuthInfo.setDomain(newValue);