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

Added spinner while downloading incoming file

Browse source
This commit is contained in:
Sylvain Berfini 2019-02-21 09:08:16 +01:00
parent 548128ea48
commit a3c14faeb0
4 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/LinphoneManager.java
View file

@ -181,7 +181,6 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
private BroadcastReceiver mKeepAliveReceiver;
private BroadcastReceiver mHookReceiver;
private BroadcastReceiver mCallReceiver;
private BroadcastReceiver mNetworkReceiver;
private IntentFilter mKeepAliveIntentFilter;
private IntentFilter mHookIntentFilter;
private IntentFilter mCallIntentFilter;
@ -669,13 +668,6 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
} catch (RuntimeException e) {
Log.e("[Manager] Destroy Core Runtime Exception: " + e);
} finally {
try {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
mServiceContext.unregisterReceiver(mNetworkReceiver);
}
} catch (Exception e) {
Log.e("[Manager] unregister receiver exception: " + e);
}
try {
mServiceContext.unregisterReceiver(mHookReceiver);
} catch (Exception e) {

17
app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
View file

@ -74,7 +74,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
public final LinearLayout background;
public final RelativeLayout avatarLayout;
public final ProgressBar sendInProgress;
public final ProgressBar downloadInProgress, sendInProgress;
public final TextView timeText;
public final ImageView outgoingImdn;
public final TextView messageText;
@ -108,6 +108,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
background = view.findViewById(R.id.background);
avatarLayout = view.findViewById(R.id.avatar_layout);
downloadInProgress = view.findViewById(R.id.download_in_progress);
sendInProgress = view.findViewById(R.id.send_in_progress);
timeText = view.findViewById(R.id.time);
outgoingImdn = view.findViewById(R.id.imdn);
@ -136,6 +137,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
outgoingImdn.setVisibility(View.GONE);
avatarLayout.setVisibility(View.GONE);
sendInProgress.setVisibility(View.GONE);
downloadInProgress.setVisibility(View.GONE);
pictures.setVisibility(View.GONE);
pictures.removeAllViews();
@ -176,6 +178,10 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
// Can't anchor incoming messages, setting this to align max width with LIME icon
bubbleLayout.setPadding(
0, 0, (int) ImageUtils.dpToPixels(LinphoneActivity.instance(), 16), 0);
if (status == ChatMessage.State.InProgress) {
downloadInProgress.setVisibility(View.VISIBLE);
}
}
if (contact == null) {
@ -221,12 +227,9 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
LayoutInflater.from(mContext)
.inflate(R.layout.chat_bubble_content, null, false);
if (c.isFile()
|| (c.isFileTransfer()
&& message
.isOutgoing())) { // If message is outgoing, even if content
// is file transfer we have the file
// available
if (c.isFile() || (c.isFileTransfer() && message.isOutgoing())) {
// If message is outgoing, even if content
// is file transfer we have the file available
String filePath = c.getFilePath();
View v;

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

@ -455,8 +455,8 @@ public class ChatMessagesFragment extends Fragment
if (message.getAppdata() != null && !message.isOutgoing()) {
File file = new File(message.getAppdata());
if (file.exists()) {
file.delete(); // Delete downloaded file from incoming message that will
// be deleted
// Delete downloaded file from incoming message that will be deleted
file.delete();
}
}
}

12
app/src/main/res/layout/chat_bubble.xml
View file

@ -109,6 +109,15 @@
</LinearLayout>
<ProgressBar
android:id="@+id/download_in_progress"
android:visibility="gone"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_toRightOf="@id/background"
android:layout_alignBottom="@id/background"
android:indeterminateTint="@color/colorA" />
<RelativeLayout
android:id="@+id/message_sender_avatar"
android:layout_width="wrap_content"
@ -160,8 +169,7 @@
android:layout_alignParentRight="true"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:indeterminateTint="@color/colorA"
android:src="@drawable/imdn_received" />
android:indeterminateTint="@color/colorA" />
</RelativeLayout>