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

Fixed crash + align gradle version to the same we use to build the SDK

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-21 12:15:21 +01:00
parent 37fed6852d
commit 9e7d0df378
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/call/CallActivity.java
View file

@ -1174,7 +1174,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
if (status != null && lc != null) { if (status != null && lc != null) {
Call currentCall = lc.getCurrentCall(); Call currentCall = lc.getCurrentCall();
if (!currentCall.getAuthenticationTokenVerified()) { if (currentCall != null && !currentCall.getAuthenticationTokenVerified()) {
status.showZRTPDialog(currentCall); status.showZRTPDialog(currentCall);
} }
} }

4
app/src/main/java/org/linphone/chat/ChatEventsAdapter.java
View file

@ -30,7 +30,6 @@ import android.graphics.Matrix;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.media.ThumbnailUtils;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.provider.MediaStore; import android.provider.MediaStore;
@ -420,6 +419,9 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
case ParticipantMaxDeviceCountExceeded: case ParticipantMaxDeviceCountExceeded:
holder.eventMessage.setText(mContext.getString(R.string.participant_max_count_exceeded).replace("%s", displayName)); holder.eventMessage.setText(mContext.getString(R.string.participant_max_count_exceeded).replace("%s", displayName));
break; break;
case None:
default:
break;
} }
break; break;
case None: case None:

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists