|
108 | 108 | import com.zulip.android.networking.ZulipAsyncPushTask; |
109 | 109 | import com.zulip.android.networking.response.UploadResponse; |
110 | 110 | import com.zulip.android.util.ActivityTransitionAnim; |
| 111 | +import com.zulip.android.networking.util.DefaultCallback; |
111 | 112 | import com.zulip.android.util.AnimationHelper; |
112 | 113 | import com.zulip.android.util.CommonProgressDialog; |
113 | 114 | import com.zulip.android.util.Constants; |
|
133 | 134 | import okhttp3.MultipartBody; |
134 | 135 | import okhttp3.RequestBody; |
135 | 136 | import retrofit2.Call; |
136 | | -import retrofit2.Callback; |
137 | 137 | import retrofit2.Response; |
138 | 138 |
|
139 | 139 | /** |
@@ -1108,32 +1108,31 @@ private void uploadFile(final File file) { |
1108 | 1108 | // finally, execute the request |
1109 | 1109 | // create upload service client |
1110 | 1110 | Call<UploadResponse> call = ((ZulipApp) getApplicationContext()).getZulipServices().upload(body); |
1111 | | - call.enqueue(new Callback<UploadResponse>() { |
| 1111 | + call.enqueue(new DefaultCallback<UploadResponse>() { |
1112 | 1112 | @Override |
1113 | | - public void onResponse(Call<UploadResponse> call, |
1114 | | - Response<UploadResponse> response) { |
1115 | | - if (response.isSuccessful()) { |
1116 | | - String filePathOnServer = ""; |
1117 | | - UploadResponse uploadResponse = response.body(); |
1118 | | - filePathOnServer = uploadResponse.getUri(); |
1119 | | - if (!filePathOnServer.equals("")) { |
1120 | | - // remove loading message from the screen |
1121 | | - sendingMessage(false, loadingMsg); |
1122 | | - |
1123 | | - // print message to compose box |
1124 | | - messageEt.append(" [" + file.getName() + "](" + |
1125 | | - UrlHelper.addHost(filePathOnServer) + ")"); |
1126 | | - } else { |
1127 | | - // remove loading message from the screen |
1128 | | - sendingMessage(false, loadingMsg); |
1129 | | - Toast.makeText(ZulipActivity.this, R.string.failed_to_upload, Toast.LENGTH_SHORT).show(); |
1130 | | - } |
| 1113 | + public void onSuccess(Call<UploadResponse> call, Response<UploadResponse> response) { |
| 1114 | + String filePathOnServer = ""; |
| 1115 | + UploadResponse uploadResponse = response.body(); |
| 1116 | + filePathOnServer = uploadResponse.getUri(); |
| 1117 | + if (!filePathOnServer.equals("")) { |
| 1118 | + // remove loading message from the screen |
| 1119 | + sendingMessage(false, loadingMsg); |
| 1120 | + |
| 1121 | + // print message to compose box |
| 1122 | + messageEt.append(" [" + file.getName() + "](" + |
| 1123 | + UrlHelper.addHost(filePathOnServer) + ")"); |
1131 | 1124 | } else { |
1132 | 1125 | // remove loading message from the screen |
1133 | 1126 | sendingMessage(false, loadingMsg); |
1134 | 1127 | Toast.makeText(ZulipActivity.this, R.string.failed_to_upload, Toast.LENGTH_SHORT).show(); |
1135 | 1128 | } |
| 1129 | + } |
1136 | 1130 |
|
| 1131 | + @Override |
| 1132 | + public void onError(Call<UploadResponse> call, Response<UploadResponse> response) { |
| 1133 | + // remove loading message from the screen |
| 1134 | + sendingMessage(false, loadingMsg); |
| 1135 | + Toast.makeText(ZulipActivity.this, R.string.failed_to_upload, Toast.LENGTH_SHORT).show(); |
1137 | 1136 | } |
1138 | 1137 |
|
1139 | 1138 | @Override |
|
0 commit comments