diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 6f55845..b63a62e 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 73cb2f9..ab47358 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: 'io.fabric' +//apply plugin: 'io.fabric' android { compileSdkVersion 28 @@ -20,28 +20,29 @@ android { minSdkVersion 17 targetSdkVersion 26 - //For Egypt - versionCode 30 - versionName "4.2" + /*//For Egypt + versionCode 31 + versionName "4.3"*/ - //For UAE - /* versionCode 25 - versionName "3.7"*/ - - - //For Turkey - /* versionCode 25 - versionName "3.7"*/ - //For KSA - /* versionCode 27 - versionName "3.9"*/ - - //For SA - /* versionCode 27 + /* //For UAE + versionCode 26 versionName "3.8"*/ -// versionCode 22 -// versionName "3.4" + + /* //For Turkey + versionCode 26 + versionName "3.8"*/ + + /* //For KSA + versionCode 28 + versionName "4.0"*/ + + //For SA + versionCode 28 + versionName "3.9" + + /* versionCode 23 + versionName "3.5"*/ multiDexEnabled true @@ -84,7 +85,7 @@ dependencies { implementation 'com.google.firebase:firebase-perf:16.2.3' // Add dependency - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7' + // implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7' implementation 'com.google.firebase:firebase-core:16.0.6' testImplementation 'junit:junit:4.12' diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 23cf163..a424308 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -38,7 +38,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.appindexing.Action; import com.google.android.gms.appindexing.AppIndex; import com.google.android.gms.appindexing.Thing; @@ -567,9 +567,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } } @@ -786,9 +786,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); Intent intent = new Intent( GeoTagActivity.this, @@ -956,9 +956,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb catch (Exception e) { e.printStackTrace(); - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); Intent intent = new Intent( GeoTagActivity.this, StoreimageActivity.class); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index ae5377a..32ae18a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -38,7 +38,7 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -88,7 +88,7 @@ import cpm.com.gskmtorange.upload.UploadImageWithRetrofit; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter; import cpm.com.gskmtorange.xmlHandlers.XMLHandlers; -import io.fabric.sdk.android.Fabric; +//import io.fabric.sdk.android.Fabric; import static android.Manifest.permission.READ_CONTACTS; @@ -170,7 +170,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. // Obtain the FirebaseAnalytics instance. mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); - Fabric.with(this, new Crashlytics()); + // Fabric.with(this, new Crashlytics()); TextView tv_version = (TextView) findViewById(R.id.tv_version_code); @@ -194,7 +194,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. mPasswordView = (EditText) findViewById(R.id.password); /* museridView.setText("test.egypt"); - mPasswordView.setText("cpm123");*/ /* museridView.setText("egypt.1"); mPasswordView.setText("cpm123");*/ @@ -204,7 +203,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. /* museridView.setText("DSR_Delta_24"); mPasswordView.setText("cpm123");*/ - /* museridView.setText("mini_ka_84_1"); + /* museridView.setText("mini_ka_84_1"); mPasswordView.setText("cpm123");*/ //UAE @@ -214,7 +213,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //KSA /* museridView.setText("mohamed.o"); mPasswordView.setText("cpm@123");*/ - /* museridView.setText("testksa");123 + /* museridView.setText("testksa"); mPasswordView.setText("cpm123");*/ @@ -641,7 +640,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. bundle.putString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, "")); mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle); - Crashlytics.setUserIdentifier(userid); + // Crashlytics.setUserIdentifier(userid); return CommonString.KEY_SUCCESS; @@ -688,9 +687,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. /* 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")); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception("My custom login Exception")); runOnUiThread(new Runnable() { @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 96150d0..297f947 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -31,7 +31,7 @@ import android.webkit.WebViewClient; import android.widget.ImageView; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import java.io.File; import java.util.ArrayList; @@ -56,7 +56,7 @@ import cpm.com.gskmtorange.pharma_stores.PharmaActivityFragment; import cpm.com.gskmtorange.upload.PreviousDataUploadActivity; import cpm.com.gskmtorange.upload.UploadActivity; import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; -import io.fabric.sdk.android.Fabric; +//import io.fabric.sdk.android.Fabric; public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { @@ -91,10 +91,10 @@ public class MainActivity extends AppCompatActivity setSupportActionBar(toolbar); preferences = PreferenceManager.getDefaultSharedPreferences(this); - Crashlytics.setBool(CommonString.KEY_LOGIN_DONE, true); - Crashlytics.setString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, "")); + // Crashlytics.setBool(CommonString.KEY_LOGIN_DONE, true); + // Crashlytics.setString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, "")); - Fabric.with(this, new Crashlytics()); + //Fabric.with(this, new Crashlytics()); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); @@ -107,7 +107,7 @@ public class MainActivity extends AppCompatActivity user_name = preferences.getString(CommonString.KEY_USERNAME, null); country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null); - Crashlytics.setString(CommonString.KEY_USER_ID, user_name); + // Crashlytics.setString(CommonString.KEY_USER_ID, user_name); //user_type = preferences.getString(CommonString.KEY_USER_TYPE, null); db = new GSKOrangeDB(MainActivity.this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java index 83b7b9f..0a917d4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java @@ -28,7 +28,7 @@ import android.widget.Toast; import com.androidbuts.multispinnerfilter.KeyPairBoolData; import com.androidbuts.multispinnerfilter.MultiSpinnerSearch; import com.androidbuts.multispinnerfilter.SpinnerListener; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import java.io.File; import java.util.ArrayList; @@ -408,9 +408,9 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV startActivityForResult(intent, 0); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java index c9a7ac2..3feb121 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java @@ -27,7 +27,7 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -352,16 +352,16 @@ public class ConversationActivity extends AppCompatActivity { flag_success = false; strflag = CommonString.MESSAGE_SOCKETEXCEPTION; } catch (XmlPullParserException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); flag_success = false; strflag = CommonString.MESSAGE_XmlPull; } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); flag_success = false; strflag = CommonString.MESSAGE_EXCEPTION; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java index f282750..d10fb50 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java @@ -23,7 +23,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -315,16 +315,16 @@ public class DeliveryCallActivity extends AppCompatActivity implements View.OnCl } catch (MalformedURLException e) { e.printStackTrace(); } catch (IOException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java index 2f6b985..786e623 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java @@ -33,7 +33,7 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -392,9 +392,9 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V startActivityForResult(intent, request_code); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java index 89cec91..1bb2e63 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java @@ -24,7 +24,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.SoapFault; @@ -345,9 +345,9 @@ public class MessageActivity extends AppCompatActivity { publishProgress(data); } catch (XmlPullParserException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); resultHttp = getString(R.string.nonetwork); flag = false; @@ -361,9 +361,9 @@ public class MessageActivity extends AppCompatActivity { flag = false; } catch ( Exception e){ - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); resultHttp = getString(R.string.nonetwork); flag = false; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index b390d9a..5364196 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -34,7 +34,7 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -355,9 +355,9 @@ public class NonWorkingReason extends AppCompatActivity implements startActivityForResult(intent, 0); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } } @@ -844,9 +844,9 @@ public class NonWorkingReason extends AppCompatActivity implements } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); ResultFlag = false; strflag = CommonString.MESSAGE_EXCEPTION; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java index c659df5..63106f7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java @@ -29,7 +29,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.SoapFault; @@ -212,9 +212,9 @@ public class PlanogramPDFActivity extends AppCompatActivity { publishProgress(data); } catch (XmlPullParserException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); resultHttp = getString(R.string.nonetwork); flag = false; @@ -228,9 +228,9 @@ public class PlanogramPDFActivity extends AppCompatActivity { flag = false; } catch ( Exception e){ - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); resultHttp = getString(R.string.nonetwork); flag = false; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 5656222..9979cc4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -47,7 +47,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -2083,9 +2083,9 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli str = CommonString.MESSAGE_XmlPull; return CommonString.MESSAGE_XmlPull; } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); ResultFlag = false; str = CommonString.MESSAGE_EXCEPTION; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index bb6f142..c75639b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -37,7 +37,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -640,9 +640,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } catch (Exception e) { e.printStackTrace(); - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); } } @@ -829,15 +829,12 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic request.addProperty("onXML", current_xml); - SoapSerializationEnvelope envelope = new SoapSerializationEnvelope( - SoapEnvelope.VER11); + SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); envelope.dotNet = true; envelope.setOutputSoapObject(request); - HttpTransportSE androidHttpTransport = new HttpTransportSE( - CommonString.URL); - androidHttpTransport.call( - CommonString.SOAP_ACTION + service, envelope); + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + service, envelope); Object result = (Object) envelope.getResponse(); if (result.toString().equalsIgnoreCase( @@ -899,18 +896,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } catch (XmlPullParserException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); ResultFlag = false; strflag = CommonString.MESSAGE_XmlPull; } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); ResultFlag = false; strflag = CommonString.MESSAGE_EXCEPTION; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index c270384..85e88e6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -15,7 +15,7 @@ import android.view.Window; import android.widget.ProgressBar; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -2086,9 +2086,9 @@ public class DownloadActivity extends AppCompatActivity { str = CommonString.MESSAGE_XmlPull; return CommonString.MESSAGE_XmlPull; } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); ResultFlag = false; str = CommonString.MESSAGE_EXCEPTION; @@ -2135,7 +2135,7 @@ public class DownloadActivity extends AppCompatActivity { .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - Crashlytics.setBool(CommonString.KEY_DOWNLOAD_DONE, true); + // Crashlytics.setBool(CommonString.KEY_DOWNLOAD_DONE, true); /* Intent i = new Intent(activity, StorelistActivity.class); activity.startActivity(i); activity.finish();*/ diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java index 655b4b5..7c40459 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java @@ -18,7 +18,7 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.squareup.okhttp.MediaType; import com.squareup.okhttp.MultipartBuilder; import com.squareup.okhttp.RequestBody; @@ -288,9 +288,9 @@ public class ServiceActivityFragment extends Fragment { } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); System.out.println(e.getMessage()); } } @@ -349,8 +349,8 @@ public class ServiceActivityFragment extends Fragment { @Override public void onFailure(Throwable t) { - Crashlytics.logException(t); - Crashlytics.logException(new Exception(t.getCause())); + // Crashlytics.logException(t); + // Crashlytics.logException(new Exception(t.getCause())); isvalid = true; if (t instanceof UnknownHostException) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java index e26ffb0..c518ff9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java @@ -22,7 +22,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -357,9 +357,9 @@ public class ChangePasswordActivity extends AppCompatActivity implements View.On /* 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")); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception("My custom login Exception")); runOnUiThread(new Runnable() { @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java index 2ed9472..0290264 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java @@ -35,7 +35,7 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.Toast; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -721,7 +721,7 @@ public class MPinActivity extends AppCompatActivity implements bundle.putString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, "")); mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle); - Crashlytics.setUserIdentifier(userId); + // Crashlytics.setUserIdentifier(userId); return CommonString.KEY_SUCCESS; @@ -768,9 +768,9 @@ public class MPinActivity extends AppCompatActivity implements /* final AlertMessage message = new AlertMessage( MPinActivity.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")); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception("My custom login Exception")); runOnUiThread(new Runnable() { @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 9f7869e..b1fe661 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -15,7 +15,7 @@ import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -2117,14 +2117,14 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } catch (IOException e) { e.printStackTrace(); } catch (XmlPullParserException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 7eacba3..3cd5b17 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -20,7 +20,7 @@ import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.gson.JsonSyntaxException; import com.squareup.okhttp.MultipartBuilder; import com.squareup.okhttp.RequestBody; @@ -2405,16 +2405,16 @@ public class UploadActivity extends AppCompatActivity { } catch (MalformedURLException e) { e.printStackTrace(); } catch (IOException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + //Crashlytics.logException(e.getCause()); + //Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 758476a..88f76b8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -13,7 +13,7 @@ import android.graphics.RectF; import android.os.AsyncTask; import android.util.Log; -import com.crashlytics.android.Crashlytics; +//import com.crashlytics.android.Crashlytics; import com.google.gson.JsonSyntaxException; import com.squareup.okhttp.MultipartBuilder; import com.squareup.okhttp.OkHttpClient; @@ -770,16 +770,16 @@ public class UploadImageWithRetrofit { } catch (MalformedURLException e) { e.printStackTrace(); } catch (IOException e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); } catch (Exception e) { - Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - Crashlytics.logException(e.getCause()); - Crashlytics.logException(new Exception(e.getCause())); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception(e.getCause())); e.printStackTrace(); } if (statusUpdated) {