11package com .zulip .android .activities ;
22
33import android .Manifest ;
4- import java .sql .SQLException ;
5- import java .util .Arrays ;
6- import java .util .HashMap ;
7- import java .util .List ;
8- import java .util .Locale ;
9- import java .util .concurrent .Callable ;
10- import java .util .ArrayList ;
11-
124import android .animation .Animator ;
135import android .annotation .SuppressLint ;
146import android .annotation .TargetApi ;
9890import com .zulip .android .models .Emoji ;
9991import com .zulip .android .models .Message ;
10092import com .zulip .android .models .MessageType ;
93+ import com .zulip .android .models .PeopleDrawerList ;
10194import com .zulip .android .models .Person ;
10295import com .zulip .android .models .Presence ;
103- import com .zulip .android .models .PeopleDrawerList ;
10496import com .zulip .android .models .Stream ;
10597import com .zulip .android .networking .AsyncGetEvents ;
10698import com .zulip .android .networking .AsyncSend ;
112104import com .zulip .android .util .AnimationHelper ;
113105import com .zulip .android .util .CommonProgressDialog ;
114106import com .zulip .android .util .Constants ;
115- import com .zulip .android .util .FilePathHelper ;
107+ import com .zulip .android .util .FileUtils ;
116108import com .zulip .android .util .MutedTopics ;
117109import com .zulip .android .util .RemoveViewsOnScroll ;
118110import com .zulip .android .util .SwipeRemoveLinearLayout ;
126118
127119import java .io .File ;
128120import java .io .IOException ;
121+ import java .sql .SQLException ;
129122import java .text .SimpleDateFormat ;
123+ import java .util .ArrayList ;
124+ import java .util .Arrays ;
130125import java .util .Calendar ;
131126import java .util .Date ;
127+ import java .util .HashMap ;
128+ import java .util .List ;
129+ import java .util .Locale ;
130+ import java .util .concurrent .Callable ;
132131
133132import okhttp3 .MediaType ;
134133import okhttp3 .MultipartBody ;
@@ -1066,15 +1065,15 @@ private File createPhotoFile() throws IOException {
10661065 */
10671066 private void startFileUpload () {
10681067 File file = null ;
1069- if (FilePathHelper .isLegacy (mFileUri )) {
1070- file = FilePathHelper .getTempFileFromContentUri (this , mFileUri );
1068+ if (FileUtils .isLegacy (mFileUri )) {
1069+ file = FileUtils .getTempFileFromContentUri (this , mFileUri );
10711070 } else {
10721071 // get actual file path
1073- String filePath = FilePathHelper .getPath (this , mFileUri );
1072+ String filePath = FileUtils .getPath (this , mFileUri );
10741073 if (filePath != null ) {
10751074 file = new File (filePath );
10761075 } else if ("content" .equalsIgnoreCase (mFileUri .getScheme ())) {
1077- file = FilePathHelper .getTempFileFromContentUri (this , mFileUri );
1076+ file = FileUtils .getTempFileFromContentUri (this , mFileUri );
10781077 }
10791078 }
10801079
@@ -1096,7 +1095,7 @@ private void uploadFile(final File file) {
10961095
10971096 // create RequestBody instance from file
10981097 RequestBody requestFile =
1099- RequestBody .create (MediaType .parse (getContentResolver (). getType ( mFileUri ) ), file );
1098+ RequestBody .create (MediaType .parse ("multipart/form-data" ), file );
11001099
11011100 // MultipartBody.Part is used to send also the actual file name
11021101 MultipartBody .Part body =
0 commit comments