1
1
package com .zulip .android .activities ;
2
2
3
3
import 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
-
12
4
import android .animation .Animator ;
13
5
import android .annotation .SuppressLint ;
14
6
import android .annotation .TargetApi ;
98
90
import com .zulip .android .models .Emoji ;
99
91
import com .zulip .android .models .Message ;
100
92
import com .zulip .android .models .MessageType ;
93
+ import com .zulip .android .models .PeopleDrawerList ;
101
94
import com .zulip .android .models .Person ;
102
95
import com .zulip .android .models .Presence ;
103
- import com .zulip .android .models .PeopleDrawerList ;
104
96
import com .zulip .android .models .Stream ;
105
97
import com .zulip .android .networking .AsyncGetEvents ;
106
98
import com .zulip .android .networking .AsyncSend ;
112
104
import com .zulip .android .util .AnimationHelper ;
113
105
import com .zulip .android .util .CommonProgressDialog ;
114
106
import com .zulip .android .util .Constants ;
115
- import com .zulip .android .util .FilePathHelper ;
107
+ import com .zulip .android .util .FileUtils ;
116
108
import com .zulip .android .util .MutedTopics ;
117
109
import com .zulip .android .util .RemoveViewsOnScroll ;
118
110
import com .zulip .android .util .SwipeRemoveLinearLayout ;
126
118
127
119
import java .io .File ;
128
120
import java .io .IOException ;
121
+ import java .sql .SQLException ;
129
122
import java .text .SimpleDateFormat ;
123
+ import java .util .ArrayList ;
124
+ import java .util .Arrays ;
130
125
import java .util .Calendar ;
131
126
import java .util .Date ;
127
+ import java .util .HashMap ;
128
+ import java .util .List ;
129
+ import java .util .Locale ;
130
+ import java .util .concurrent .Callable ;
132
131
133
132
import okhttp3 .MediaType ;
134
133
import okhttp3 .MultipartBody ;
@@ -1066,15 +1065,15 @@ private File createPhotoFile() throws IOException {
1066
1065
*/
1067
1066
private void startFileUpload () {
1068
1067
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 );
1071
1070
} else {
1072
1071
// get actual file path
1073
- String filePath = FilePathHelper .getPath (this , mFileUri );
1072
+ String filePath = FileUtils .getPath (this , mFileUri );
1074
1073
if (filePath != null ) {
1075
1074
file = new File (filePath );
1076
1075
} else if ("content" .equalsIgnoreCase (mFileUri .getScheme ())) {
1077
- file = FilePathHelper .getTempFileFromContentUri (this , mFileUri );
1076
+ file = FileUtils .getTempFileFromContentUri (this , mFileUri );
1078
1077
}
1079
1078
}
1080
1079
@@ -1096,7 +1095,7 @@ private void uploadFile(final File file) {
1096
1095
1097
1096
// create RequestBody instance from file
1098
1097
RequestBody requestFile =
1099
- RequestBody .create (MediaType .parse (getContentResolver (). getType ( mFileUri ) ), file );
1098
+ RequestBody .create (MediaType .parse ("multipart/form-data" ), file );
1100
1099
1101
1100
// MultipartBody.Part is used to send also the actual file name
1102
1101
MultipartBody .Part body =
0 commit comments