,
This commit is contained in:
2
.idea/deploymentTargetDropDown.xml
generated
2
.idea/deploymentTargetDropDown.xml
generated
@@ -12,7 +12,7 @@
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</targetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2023-12-05T11:34:20.505603Z" />
|
||||
<timeTargetWasSelectedWithDropDown value="2023-12-11T15:12:23.637532Z" />
|
||||
<targetsSelectedWithDialog>
|
||||
<Target>
|
||||
<type value="QUICK_BOOT_TARGET" />
|
||||
|
||||
@@ -13,8 +13,8 @@ android {
|
||||
applicationId "com.app.simplitend"
|
||||
minSdk 24
|
||||
targetSdk 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
versionCode 2
|
||||
versionName "1.0.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -16,7 +16,8 @@ public abstract class RetrofitHelper {
|
||||
// private static final String BASE_URL = "https://simplitend.betadelivery.com/";
|
||||
|
||||
// Staging BASE URL
|
||||
private static final String BASE_URL = "https://simplitendapp.betadelivery.com/";
|
||||
// private static final String BASE_URL = "https://simplitendapp.betadelivery.com/";
|
||||
private static final String BASE_URL = "https://staging.simplitend.com/";
|
||||
|
||||
public static final String IMAGE_BASE_URL = BASE_URL + "storage/upload/";
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ public class SocketHelper {
|
||||
|
||||
private static final String TAG = "SOCKET_CHAT_TAG";
|
||||
|
||||
public static final String kHost = "http://simplitendapp.betadelivery.com:3002/";
|
||||
public static final String kHost = "https://staging.simplitend.com:3002/";
|
||||
|
||||
private static SocketHelper instance;
|
||||
private Socket mSocket;
|
||||
|
||||
@@ -21,7 +21,7 @@ public class ChatViewModel extends ViewModel {
|
||||
|
||||
public ChatViewModel() {
|
||||
this.apiService = new Retrofit.Builder()
|
||||
.baseUrl("https://simplitendapp.betadelivery.com/")
|
||||
.baseUrl("https://staging.simplitend.com/")
|
||||
.addConverterFactory(GsonConverterFactory.create())
|
||||
.build().create(ChatsApiService.class);
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ public class LocationService extends Service implements LocationClient.DefaultLo
|
||||
switch (intent.getAction()){
|
||||
case ACTION_START_LOCATION_UPDATES:
|
||||
int minInterval = intent.getIntExtra(LOCATION_UPDATE_MIN_INTERVAL, 0);
|
||||
Log.d("location_update", "onStartCommand: " + minInterval);
|
||||
if (minInterval != 0){
|
||||
removeLocationUpdates();
|
||||
startLocationUpdates(minInterval);
|
||||
|
||||
@@ -82,9 +82,9 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver {
|
||||
locationServiceIntent.setAction(LocationService.ACTION_START_LOCATION_UPDATES);
|
||||
locationServiceIntent.putExtra(LOCATION_UPDATE_MIN_INTERVAL, LOCATION_INTERVAL_BASE_TIME);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
context.startForegroundService(intent);
|
||||
context.startForegroundService(locationServiceIntent);
|
||||
} else {
|
||||
context.startService(intent);
|
||||
context.startService(locationServiceIntent);
|
||||
}
|
||||
break;
|
||||
case Geofence.GEOFENCE_TRANSITION_EXIT:
|
||||
|
||||
@@ -118,7 +118,6 @@
|
||||
android:autofillHints="name"
|
||||
android:inputType="textCapSentences"
|
||||
|
||||
android:digits="@string/allowed_alphabets_with_space"
|
||||
android:singleLine="true"
|
||||
|
||||
android:maxLength="255"
|
||||
|
||||
Reference in New Issue
Block a user