App android upgrade fixes

master
haroon amjad 8 months ago
parent d6a8953909
commit c21206ba80

@ -102,6 +102,9 @@ android {
sourceCompatibility JavaVersion.VERSION_17 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = '17'
}
} }

@ -1,69 +1,69 @@
package com.hmg.hmgDr.Service; //package com.hmg.hmgDr.Service;
//
import android.app.Activity; //import android.app.Activity;
import android.app.Application; //import android.app.Application;
//
import androidx.annotation.CallSuper; //import androidx.annotation.CallSuper;
//
import com.google.gson.Gson; //import com.google.gson.Gson;
import com.google.gson.GsonBuilder; //import com.google.gson.GsonBuilder;
//
import java.util.concurrent.TimeUnit; //import java.util.concurrent.TimeUnit;
//
import io.flutter.view.FlutterMain; //import io.flutter.view.FlutterMain;
import okhttp3.ConnectionPool; //import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient; //import okhttp3.OkHttpClient;
import okhttp3.logging.HttpLoggingInterceptor; //import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Retrofit; //import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory; //import retrofit2.converter.gson.GsonConverterFactory;
//
public class AppRetrofit extends Application { //public class AppRetrofit extends Application {
private static final int MY_SOCKET_TIMEOUT_MS = 20000; // private static final int MY_SOCKET_TIMEOUT_MS = 20000;
//
@Override // @Override
@CallSuper // @CallSuper
public void onCreate() { // public void onCreate() {
super.onCreate(); // super.onCreate();
FlutterMain.startInitialization(this); // FlutterMain.startInitialization(this);
} // }
//
private Activity mCurrentActivity = null; // private Activity mCurrentActivity = null;
//
public Activity getCurrentActivity() { // public Activity getCurrentActivity() {
return mCurrentActivity; // return mCurrentActivity;
} // }
//
public void setCurrentActivity(Activity mCurrentActivity) { // public void setCurrentActivity(Activity mCurrentActivity) {
this.mCurrentActivity = mCurrentActivity; // this.mCurrentActivity = mCurrentActivity;
} // }
//
public static Retrofit getRetrofit( String baseUrl) { // public static Retrofit getRetrofit( String baseUrl) {
//
HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); // HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); // interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
Gson gson = new GsonBuilder().serializeNulls().create(); // Gson gson = new GsonBuilder().serializeNulls().create();
OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(chain -> { // OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(chain -> {
okhttp3.Request originalRequest = chain.request(); // okhttp3.Request originalRequest = chain.request();
okhttp3.Request newRequest = originalRequest.newBuilder() // okhttp3.Request newRequest = originalRequest.newBuilder()
.addHeader("Content-Type","application/json") // .addHeader("Content-Type","application/json")
.addHeader("Accept","application/json") // .addHeader("Accept","application/json")
.build(); // .build();
//
return chain.proceed(newRequest); // return chain.proceed(newRequest);
}) // })
.addInterceptor(interceptor) // .addInterceptor(interceptor)
.callTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS) // .callTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS)
.connectTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS) // .connectTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS)
.readTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS) // .readTimeout(MY_SOCKET_TIMEOUT_MS, TimeUnit.SECONDS)
.connectionPool(new ConnectionPool(0, 5 * 60 * 1000, TimeUnit.SECONDS)) // .connectionPool(new ConnectionPool(0, 5 * 60 * 1000, TimeUnit.SECONDS))
.retryOnConnectionFailure(false) // .retryOnConnectionFailure(false)
.build(); // .build();
//
//
return new Retrofit.Builder() // return new Retrofit.Builder()
.baseUrl(baseUrl) // .baseUrl(baseUrl)
.addConverterFactory(GsonConverterFactory.create(gson)) // .addConverterFactory(GsonConverterFactory.create(gson))
.client(okHttpClient) // .client(okHttpClient)
.build(); // .build();
} // }
} //}

@ -3,7 +3,7 @@ package com.hmg.hmgDr.ui;
import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel; import com.hmg.hmgDr.Model.ChangeCallStatusRequestModel;
import com.hmg.hmgDr.Model.GetSessionStatusModel; import com.hmg.hmgDr.Model.GetSessionStatusModel;
import com.hmg.hmgDr.Model.SessionStatusModel; import com.hmg.hmgDr.Model.SessionStatusModel;
import com.hmg.hmgDr.Service.AppRetrofit; //import com.hmg.hmgDr.Service.AppRetrofit;
import com.hmg.hmgDr.Service.SessionStatusAPI; import com.hmg.hmgDr.Service.SessionStatusAPI;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -27,7 +27,7 @@ public class VideoCallPresenterImpl implements VideoCallContract.VideoCallPresen
public void callClintConnected(GetSessionStatusModel statusModel) { public void callClintConnected(GetSessionStatusModel statusModel) {
sessionStatusAPI = AppRetrofit.getRetrofit(baseUrl).create(SessionStatusAPI.class); // sessionStatusAPI = AppRetrofit.getRetrofit(baseUrl).create(SessionStatusAPI.class);
Call<SessionStatusModel> call = sessionStatusAPI.getSessionStatusModelData(statusModel); Call<SessionStatusModel> call = sessionStatusAPI.getSessionStatusModelData(statusModel);
@ -50,7 +50,7 @@ public class VideoCallPresenterImpl implements VideoCallContract.VideoCallPresen
@Override @Override
public void callChangeCallStatus(ChangeCallStatusRequestModel statusModel) { public void callChangeCallStatus(ChangeCallStatusRequestModel statusModel) {
sessionStatusAPI = AppRetrofit.getRetrofit(baseUrl).create(SessionStatusAPI.class); // sessionStatusAPI = AppRetrofit.getRetrofit(baseUrl).create(SessionStatusAPI.class);
Call<SessionStatusModel> call = sessionStatusAPI.changeCallStatus(statusModel); Call<SessionStatusModel> call = sessionStatusAPI.changeCallStatus(statusModel);

@ -3,3 +3,4 @@
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
org.gradle.jvmargs=-Xmx4608m org.gradle.jvmargs=-Xmx4608m
kotlin.jvm.target.validation.mode = IGNORE

@ -15,7 +15,7 @@ version: 1.4.24+1
environment: environment:
sdk: ">=3.5.0 <4.0.0" sdk: ">=3.6.0 <4.0.0"
#dependency_overrides: #dependency_overrides:
@ -41,8 +41,9 @@ dependencies:
# connectivity: ^3.0.6 # connectivity: ^3.0.6
connectivity_plus: ^6.1.4 connectivity_plus: ^6.1.4
maps_launcher: ^3.0.0+1 maps_launcher: ^3.0.0+1
url_launcher: ^6.3.1 url_launcher: ^6.3.2
url_launcher_ios: ^6.3.2 url_launcher_ios: ^6.3.2
url_launcher_android: ^6.3.17
charts_flutter: ^0.12.0 charts_flutter: ^0.12.0
#flutter_charts: ^0.5.2 #flutter_charts: ^0.5.2
#gelin: ^0.1.6 #gelin: ^0.1.6
@ -144,6 +145,7 @@ dependency_overrides:
intl: ^0.18.1 intl: ^0.18.1
flutter_plugin_android_lifecycle: 2.0.27 flutter_plugin_android_lifecycle: 2.0.27
#hijri_picker: ^3.0.0 #hijri_picker: ^3.0.0
path_provider: ^2.1.5
dev_dependencies: dev_dependencies:

Loading…
Cancel
Save