mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-03 01:29:33 +00:00
removed Hockey dependency; removed Volley from pom.xml; added org.json.simple dependency
This commit is contained in:
1 parent
84353a8462
commit
a3403881a1
3 files changed
+54
-73
No files matched your search
@@ -1,15 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.domain.common"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.domain.shared.android"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sse.common"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.server.gateway.serialization.shared.android"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sse.shared.android"/>
|
||||
<classpathentry kind="lib" path="/google-play-services_lib/libs/google-play-services.jar"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.domain.common"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.domain.shared.android"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sse.common"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sailing.server.gateway.serialization.shared.android"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.sap.sse.shared.android"/>
|
||||
<classpathentry kind="lib" path="/google-play-services_lib/libs/google-play-services.jar"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.json.simple"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
@@ -56,20 +56,11 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>com.sap.sailing</groupId>
|
||||
<artifactId>com.google.volley</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<type>apklib</type>
|
||||
<artifactId>org.json.simple</artifactId>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>com.android.support</groupId>
|
||||
<artifactId>support-annotations</artifactId>
|
||||
<version>21.0.3</version>
|
||||
<type>aar</type>
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<dependency>
|
||||
<groupId>com.android.support</groupId>
|
||||
<artifactId>support-v4</artifactId>
|
||||
|
||||
+35
-46
@@ -1,6 +1,5 @@
|
||||
package com.sap.sailing.android.shared.ui.activities;
|
||||
|
||||
import net.hockeyapp.android.CrashManager;
|
||||
import android.app.Dialog;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
@@ -15,11 +14,11 @@ import com.sap.sailing.android.shared.data.AbstractCheckinData;
|
||||
import com.sap.sailing.android.shared.logging.ExLog;
|
||||
import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
|
||||
|
||||
public abstract class AbstractStartActivity extends CheckinDataActivity{
|
||||
public abstract class AbstractStartActivity extends CheckinDataActivity {
|
||||
|
||||
private final static String TAG = AbstractStartActivity.class.getName();
|
||||
|
||||
@Override
|
||||
private final static String TAG = AbstractStartActivity.class.getName();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.fragment_container);
|
||||
@@ -31,56 +30,46 @@ public abstract class AbstractStartActivity extends CheckinDataActivity{
|
||||
toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
|
||||
// get url if launched via url intent-filter
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
|
||||
// get url if launched via url intent-filter
|
||||
|
||||
Intent intent = getIntent();
|
||||
Uri uri = intent.getData();
|
||||
|
||||
if (uri != null) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
ExLog.i(this, TAG, "Matched URL, handling scanned or matched URL.");
|
||||
}
|
||||
|
||||
getHomeFragment().handleScannedOrUrlMatchedUri(uri);
|
||||
|
||||
}
|
||||
|
||||
if (uri != null) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
ExLog.i(this, TAG, "Matched URL, handling scanned or matched URL.");
|
||||
}
|
||||
|
||||
getHomeFragment().handleScannedOrUrlMatchedUri(uri);
|
||||
|
||||
}
|
||||
|
||||
intent.setData(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCheckinDataAvailable(AbstractCheckinData data) {
|
||||
if(data != null)
|
||||
{
|
||||
if (data != null) {
|
||||
getHomeFragment().displayUserConfirmationScreen(data);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract AbstractHomeFragment getHomeFragment();
|
||||
|
||||
@Override
|
||||
|
||||
public abstract AbstractHomeFragment getHomeFragment();
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
checkForCrashes();
|
||||
//checkForUpdates();
|
||||
|
||||
int googleServicesResultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(this);
|
||||
if (googleServicesResultCode != ConnectionResult.SUCCESS)
|
||||
{
|
||||
Dialog dialog = GooglePlayServicesUtil.getErrorDialog(googleServicesResultCode, this, 0);
|
||||
dialog.show();
|
||||
}
|
||||
super.onResume();
|
||||
// checkForUpdates();
|
||||
|
||||
int googleServicesResultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(this);
|
||||
if (googleServicesResultCode != ConnectionResult.SUCCESS) {
|
||||
Dialog dialog = GooglePlayServicesUtil.getErrorDialog(googleServicesResultCode, this, 0);
|
||||
dialog.show();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Hockeyapp integration method.
|
||||
*/
|
||||
private void checkForCrashes() {
|
||||
CrashManager.register(this, "060ff0c8a907638e3b31d3146091c87b");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user