Implemented for Haleon-EGYPT and implemented upgrade SDK PD
This commit is contained in:
@@ -31,6 +31,7 @@ import android.widget.AutoCompleteTextView;
|
||||
import android.widget.EditText;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.cardview.widget.CardView;
|
||||
@@ -80,12 +81,14 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import cpm.com.gskmtorange.GetterSetter.PD_CONFIGURATION;
|
||||
import cpm.com.gskmtorange.autoupdate.AutoUpdateActivity;
|
||||
import cpm.com.gskmtorange.constant.CommonFunctions;
|
||||
import cpm.com.gskmtorange.constant.CommonString;
|
||||
import cpm.com.gskmtorange.password.MPinActivity;
|
||||
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
|
||||
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
|
||||
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
|
||||
import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
|
||||
//import io.fabric.sdk.android.Fabric;
|
||||
|
||||
@@ -170,9 +173,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
//for lebanon
|
||||
// museridView.setText("test.lebanon1");
|
||||
// mPasswordView.setText("cpm@123");
|
||||
// for EGYPT
|
||||
// museridView.setText("test.egypt");
|
||||
// mPasswordView.setText("cpm123");
|
||||
// for EGYPT
|
||||
// museridView.setText("test.egypt");
|
||||
// mPasswordView.setText("cpm123");
|
||||
/*museridView.setText("egypt.1");
|
||||
mPasswordView.setText("cpm123");*/
|
||||
|
||||
@@ -231,8 +234,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
/* museridView.setText("test.jordan");
|
||||
mPasswordView.setText("cpm@123");*/
|
||||
|
||||
// museridView.setText("test.kuwait");
|
||||
// mPasswordView.setText("cpm@123");
|
||||
// museridView.setText("test.kuwait");
|
||||
// mPasswordView.setText("cpm@123");
|
||||
|
||||
// museridView.setText("test.oman");
|
||||
|
||||
@@ -590,7 +593,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
@Override
|
||||
protected String doInBackground(Void... params) {
|
||||
try {
|
||||
Log.e("latitudedata",lat + ","+ lon);
|
||||
Log.e("latitudedata", lat + "," + lon);
|
||||
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
||||
String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]"
|
||||
+ userid + "[/USER_ID]" + "[PASSWORD]" + password
|
||||
@@ -607,8 +610,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
request.addProperty("onXML", userauth_xml);
|
||||
Log.d("loginrequest", String.valueOf(request));
|
||||
|
||||
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
|
||||
SoapEnvelope.VER11);
|
||||
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
||||
envelope.dotNet = true;
|
||||
envelope.setOutputSoapObject(request);
|
||||
try {
|
||||
@@ -616,46 +618,20 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
CommonString.URL);
|
||||
androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
|
||||
envelope);
|
||||
} catch (Exception e){
|
||||
Log.e("httpexception",e.getMessage());
|
||||
} catch (Exception e) {
|
||||
Log.e("httpexception", e.getMessage());
|
||||
}
|
||||
/*HttpTransportSE androidHttpTransport = new HttpTransportSE(
|
||||
CommonString.URL);
|
||||
androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
|
||||
envelope);*/
|
||||
|
||||
Object result = (Object) envelope.getResponse();
|
||||
|
||||
if (result.toString()
|
||||
.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
showAlert(CommonString.MESSAGE_FAILURE);
|
||||
}
|
||||
});
|
||||
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
|
||||
runOnUiThread(() -> showAlert(CommonString.MESSAGE_FAILURE));
|
||||
|
||||
} else if (result.toString().equalsIgnoreCase(
|
||||
CommonString.KEY_FALSE)) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
showAlert(CommonString.MESSAGE_FALSE);
|
||||
}
|
||||
});
|
||||
|
||||
runOnUiThread(() -> showAlert(CommonString.MESSAGE_FALSE));
|
||||
} else if (result.toString().equalsIgnoreCase(
|
||||
CommonString.KEY_CHANGED)) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
showAlert(CommonString.MESSAGE_CHANGED);
|
||||
}
|
||||
});
|
||||
|
||||
runOnUiThread(() -> showAlert(CommonString.MESSAGE_CHANGED));
|
||||
} else {
|
||||
|
||||
XmlPullParserFactory factory = XmlPullParserFactory
|
||||
@@ -671,47 +647,52 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
|
||||
if (failureGetterSetter.getStatus().equalsIgnoreCase(
|
||||
CommonString.KEY_FAILURE)) {
|
||||
/* final AlertMessage message = new AlertMessage(
|
||||
LoginActivity.this, CommonString.METHOD_LOGIN
|
||||
+ failureGetterSetter.getErrorMsg(),
|
||||
"login", null);*/
|
||||
runOnUiThread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
// TODO Auto-generated method stub
|
||||
showAlert(CommonString.METHOD_LOGIN
|
||||
+ failureGetterSetter.getErrorMsg());
|
||||
}
|
||||
runOnUiThread(() -> {
|
||||
// TODO Auto-generated method stub
|
||||
showAlert(CommonString.METHOD_LOGIN
|
||||
+ failureGetterSetter.getErrorMsg());
|
||||
});
|
||||
} else {
|
||||
|
||||
try {
|
||||
// For String source
|
||||
|
||||
xpp.setInput(new StringReader(result.toString()));
|
||||
xpp.next();
|
||||
eventType = xpp.getEventType();
|
||||
lgs = XMLHandlers.loginXMLHandler(xpp, eventType);
|
||||
// For String source
|
||||
xpp.setInput(new StringReader(result.toString()));
|
||||
xpp.next();
|
||||
eventType = xpp.getEventType();
|
||||
lgs = XMLHandlers.loginXMLHandler(xpp, eventType);
|
||||
|
||||
} catch (XmlPullParserException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
//PD_CONFIGURATION
|
||||
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
|
||||
request.addProperty("UserName", userid);
|
||||
request.addProperty("Type", "PD_CONFIGURATION");
|
||||
request.addProperty("cultureid", "1");
|
||||
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
||||
envelope.dotNet = true;
|
||||
envelope.setOutputSoapObject(request);
|
||||
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
|
||||
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
|
||||
result = envelope.getResponse();
|
||||
xpp.setInput(new StringReader(result.toString()));
|
||||
xpp.next();
|
||||
eventType = xpp.getEventType();
|
||||
PD_CONFIGURATION pdConfiguration = XMLHandlers.PDConfigXMLHandler(xpp);
|
||||
Log.e("PD_CONFIGURATION_RESULT", result.toString());
|
||||
// PUT IN PREFERENCES
|
||||
if (pdConfiguration.getPROJECT_ID() != null && !pdConfiguration.getPROJECT_ID().isEmpty()) {
|
||||
editor.putString(CommonString.KEY_PD_PROJECT_Id, pdConfiguration.getPROJECT_ID().get(0));
|
||||
editor.putString(CommonString.KEY_PD_USER_Id, pdConfiguration.getUSER_ID().get(0));
|
||||
} else {
|
||||
return CommonString.KEY_FAILURE;
|
||||
}
|
||||
editor.putString(CommonString.KEY_USERNAME, userid);
|
||||
editor.putString(CommonString.KEY_PASSWORD, password);
|
||||
editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
|
||||
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
|
||||
//editor.putString(CommonString.KEY_DATE, "12/05/2022");
|
||||
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
|
||||
//editor.putString(CommonString.KEY_DATE, "01/25/2019");
|
||||
editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
|
||||
Log.e("countryid",lgs.getCOUNTRY_ID());
|
||||
Log.e("countryid", lgs.getCOUNTRY_ID());
|
||||
editor.commit();
|
||||
setDataFromSharedPreferences(lgs);
|
||||
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString(FirebaseAnalytics.Param.ITEM_ID, userid);
|
||||
bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, CommonString.KEY_LOGIN_DATA);
|
||||
@@ -738,38 +719,19 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
|
||||
} catch (IOException e) {
|
||||
FirebaseCrashlytics.getInstance().recordException(e);
|
||||
/* final AlertMessage message = new AlertMessage(
|
||||
LoginActivity.this,
|
||||
AlertMessage.MESSAGE_SOCKETEXCEPTION, "socket_login", e);*/
|
||||
|
||||
counter++;
|
||||
runOnUiThread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
// TODO Auto-generated method stub
|
||||
if (counter < 3) {
|
||||
new AuthenticateTask().execute();
|
||||
} else {
|
||||
showAlert(getString(R.string.nonetwork));
|
||||
counter = 1;
|
||||
}
|
||||
runOnUiThread(() -> {
|
||||
// TODO Auto-generated method stub
|
||||
if (counter < 3) {
|
||||
new AuthenticateTask().execute();
|
||||
} else {
|
||||
showAlert(getString(R.string.nonetwork));
|
||||
counter = 1;
|
||||
}
|
||||
});
|
||||
} catch (Exception e) {
|
||||
FirebaseCrashlytics.getInstance().recordException(e);
|
||||
/* final AlertMessage message = new AlertMessage(
|
||||
LoginActivity.this, AlertMessage.MESSAGE_EXCEPTION,
|
||||
"acra_login", e);*/
|
||||
// Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
|
||||
// Crashlytics.logException(e.getCause());
|
||||
// Crashlytics.logException(new Exception("My custom login Exception"));
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
showAlert(CommonString.MESSAGE_EXCEPTION);
|
||||
}
|
||||
});
|
||||
runOnUiThread(() -> showAlert(CommonString.MESSAGE_EXCEPTION));
|
||||
}
|
||||
return "";
|
||||
}
|
||||
@@ -777,13 +739,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
@Override
|
||||
protected void onPostExecute(String result) {
|
||||
super.onPostExecute(result);
|
||||
//Stop performance trace
|
||||
/// myTrace.stop();
|
||||
|
||||
if (result.equals(CommonString.KEY_SUCCESS)) {
|
||||
if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
|
||||
// manually set true for South Africa
|
||||
boolean forSA = false;
|
||||
// database.open();
|
||||
if (forSA) {
|
||||
//For SA Only
|
||||
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
|
||||
@@ -872,26 +830,23 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
cdate = arabicToenglish(cdate);
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}
|
||||
else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}
|
||||
else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
|
||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
|
||||
cdate = arabicToenglish(cdate);
|
||||
}
|
||||
return cdate;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
|
||||
Gson gson = new Gson();
|
||||
String jsonCurProduct = gson.toJson(lgs);
|
||||
@@ -935,18 +890,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
} else if (requestCode == MY_PERMISSIONS_REQUEST_STORAGE_READ) {
|
||||
checkAppPermission(Manifest.permission.ACCESS_FINE_LOCATION, MY_PERMISSIONS_REQUEST_LOCATION);
|
||||
} else {
|
||||
|
||||
// Create a Folder for Images
|
||||
|
||||
/* File file = new File(Environment.getExternalStorageDirectory(), ".GSK_MT_ORANGE_IMAGES");
|
||||
if (!file.isDirectory()) {
|
||||
file.mkdir();
|
||||
}
|
||||
File file_planogram = new File(Environment.getExternalStorageDirectory(), "GSK_MT_ORANGE_Planogram_Images");
|
||||
if (!file_planogram.isDirectory()) {
|
||||
file_planogram.mkdir();
|
||||
}*/
|
||||
|
||||
if (checkPlayServices()) {
|
||||
// Building the GoogleApi client
|
||||
buildGoogleApiClient();
|
||||
@@ -1005,7 +948,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
|
||||
}
|
||||
checkgpsEnableDevice();
|
||||
locationRequest= new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 100000)
|
||||
locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 100000)
|
||||
.setWaitForAccurateLocation(false)
|
||||
.setMinUpdateIntervalMillis(IMPLICIT_MIN_UPDATE_INTERVAL)
|
||||
.setMaxUpdateDelayMillis(1000)
|
||||
@@ -1136,7 +1079,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
||||
|
||||
@Override
|
||||
public void onConnected(Bundle bundle) {
|
||||
Log.e("onConnectdata","true" + ","+mGoogleApiClient);
|
||||
Log.e("onConnectdata", "true" + "," + mGoogleApiClient);
|
||||
/*if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
||||
// TODO: Consider calling
|
||||
// ActivityCompat#requestPermissions
|
||||
|
||||
Reference in New Issue
Block a user