Browse Source

KYC image fixes

master
preyearegmi 6 years ago
parent
commit
5120877bf8
  1. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java
  3. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
  4. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java
  5. 44
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java

@ -150,7 +150,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
}
@Override
public Observable<UserInfoModelV2> getCachedUserInfo() {
public Observable<UserInfoModelV2> getCachedUserInfoFromDB() {
UserInfoModelV2 userInfoModelV2 = new UserInfoModelV2();
SharedPreferences sharedPreferenceEditor = GmeApplication.getStorage();

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java

@ -17,7 +17,7 @@ public interface HomeV2InteractorInterface extends BaseInteractorInterface {
Observable<UserInfoModelV2> saveUserInfo(UserInfoModelV2 userRelatedData);
Observable<UserInfoModelV2> getCachedUserInfo();
Observable<UserInfoModelV2> getCachedUserInfoFromDB();
void clearAllUserData();

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java

@ -62,7 +62,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
return Observable.empty();
}
}),
this.gateway.getCachedUserInfo())
this.gateway.getCachedUserInfoFromDB())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.take(1)
@ -73,7 +73,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
@Override
public void getRequiredCachedData() {
compositeDisposable.add(
this.gateway.getCachedUserInfo()
this.gateway.getCachedUserInfoFromDB()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribeWith(new UserInfoObserver())

1
app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java

@ -344,7 +344,6 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen
CropImage.ActivityResult result = CropImage.getActivityResult(data);
if (resultCode == RESULT_OK) {
Log.d("PHOTORESULT", "PHOTO RECIEVED AFTER CROPPING");
Uri resultUri = result.getUri();
// Bitmap bitmap;

44
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java

@ -4,13 +4,19 @@ import com.gmeremit.online.gmeremittance_native.BuildConfig;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import okhttp3.FormBody;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.logging.HttpLoggingInterceptor;
import okio.Buffer;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
@ -83,4 +89,42 @@ public class HttpClientV2 {
return deserializerGson;
}
// private RequestBody processApplicationJsonRequestBody(RequestBody requestBody, String token){
// String customReq = bodyToString(requestBody);
// try {
// JSONObject obj = new JSONObject(customReq);
// obj.put("token", token);
// return RequestBody.create(requestBody.contentType(), obj.toString());
// } catch (JSONException e) {
// e.printStackTrace();
// }
// return null;
// }
// private RequestBody processFormDataRequestBody(RequestBody requestBody, String token){
// RequestBody formBody = new FormBody.Builder()
// .add("token", token)
// .build();
// String postBodyString = bodyToString(requestBody);
// postBodyString += ((postBodyString.length() > 0) ? "&" : "") + bodyToString(formBody);
// return RequestBody.create(requestBody.contentType(), postBodyString);
// }
//
// private String bodyToString(final RequestBody request){
// try {
// final RequestBody copy = request;
// final Buffer buffer = new Buffer();
// if(copy != null)
// copy.writeTo(buffer);
// else
// return "";
// return buffer.readUtf8();
// }
// catch (final IOException e) {
// return "did not work";
// }
// }
}
Loading…
Cancel
Save