Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 1299d44

Browse files
Sam1301kunall17
authored andcommitted
Use aFileChooser FileUtils class for getting path of file uri.
1 parent 716a7cf commit 1299d44

File tree

3 files changed

+592
-214
lines changed

3 files changed

+592
-214
lines changed

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package com.zulip.android.activities;
22

33
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-
124
import android.animation.Animator;
135
import android.annotation.SuppressLint;
146
import android.annotation.TargetApi;
@@ -98,9 +90,9 @@
9890
import com.zulip.android.models.Emoji;
9991
import com.zulip.android.models.Message;
10092
import com.zulip.android.models.MessageType;
93+
import com.zulip.android.models.PeopleDrawerList;
10194
import com.zulip.android.models.Person;
10295
import com.zulip.android.models.Presence;
103-
import com.zulip.android.models.PeopleDrawerList;
10496
import com.zulip.android.models.Stream;
10597
import com.zulip.android.networking.AsyncGetEvents;
10698
import com.zulip.android.networking.AsyncSend;
@@ -112,7 +104,7 @@
112104
import com.zulip.android.util.AnimationHelper;
113105
import com.zulip.android.util.CommonProgressDialog;
114106
import com.zulip.android.util.Constants;
115-
import com.zulip.android.util.FilePathHelper;
107+
import com.zulip.android.util.FileUtils;
116108
import com.zulip.android.util.MutedTopics;
117109
import com.zulip.android.util.RemoveViewsOnScroll;
118110
import com.zulip.android.util.SwipeRemoveLinearLayout;
@@ -126,9 +118,16 @@
126118

127119
import java.io.File;
128120
import java.io.IOException;
121+
import java.sql.SQLException;
129122
import java.text.SimpleDateFormat;
123+
import java.util.ArrayList;
124+
import java.util.Arrays;
130125
import java.util.Calendar;
131126
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;
132131

133132
import okhttp3.MediaType;
134133
import 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 =

app/src/main/java/com/zulip/android/util/FilePathHelper.java

Lines changed: 0 additions & 199 deletions
This file was deleted.

0 commit comments

Comments
 (0)