Commit ec6ae6b5 authored by Drahomír Karchňák's avatar Drahomír Karchňák

Merge branch 'devel' into 'master'

Devel

See merge request !22
parents 2deec5f9 8c477081
## Java
*.class
*.war
*.ear
hs_err_pid*
## Android Studio
*.ipr
*.iws
*.iml
.idea/
out/
## Gradle
build/
.gradle/
*.iml
gradle.properties
## OS Specific
.DS_Store
## General
*.zip
......@@ -16,8 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cz.nic.netmetr"
android:versionCode="100"
android:versionName="1.0.0"
android:installLocation="auto" >
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
......@@ -80,7 +78,6 @@
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="GOOGLEMAPS_APIKEY"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<meta-data android:name="com.crashlytics.ApiKey" android:value="RMBT_CRASHLYTICS_APIKEY"/>
<meta-data android:name="cz.nic.labs.rmbt.android.test.RMBTBugReport" android:value="RMBT_USE_BUGREPORT"/>
</application>
......
This diff is collapsed.
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
......@@ -21,16 +21,4 @@
<integer name="default_loop_min_delay">30</integer>
<integer name="default_loop_max_delay">900</integer>
<integer name="default_loop_max_movement">250</integer>
<string translatable="false" name="default_control_host">CONTROL_IPV4_HOST</string>
<string translatable="false" name="default_control_host_ipv4_only">CONTROL_IPV4_HOST</string>
<string translatable="false" name="default_control_host_ipv6_only">CONTROL_IPV6_HOST</string>
<string translatable="false" name="default_control_check_ipv4_url">CONTROL_IPV4_CHECK_HOST</string>
<string translatable="false" name="default_control_check_ipv6_url">CONTROL_IPV6_CHECK_HOST</string>
<string translatable="false" name="default_control_port">RMBT_CONTROL_PORT</string>
<string translatable="false" name="default_control_ssl">RMBT_CONTROL_SSL</string>
<string translatable="false" name="default_qos_ssl">RMBT_QOS_SSL</string>
</resources>
......@@ -47,7 +47,6 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.crashlytics.android.Crashlytics;
import com.google.android.gms.maps.model.LatLng;
import android.app.ActionBar;
......@@ -345,19 +344,19 @@ public class RMBTMainActivity extends Activity implements MapProperties, RMBTLoo
@Override
public void onCreate(final Bundle savedInstanceState)
{
//Log.i("MAIN ACTIVITY", "onCreate");
restoreInstance(savedInstanceState);
super.onCreate(savedInstanceState);
// BUG REPORT
try {
boolean bugReportEnabled = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA).metaData.getBoolean(BUG_REPORT_MANIFEST_PROPERTY, false);
if (bugReportEnabled) {
Crashlytics.start(this);
}
} catch (NameNotFoundException e) {
// nothing needed
}
// TODO - Add Sentry
// try {
// boolean bugReportEnabled = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA).metaData.getBoolean(BUG_REPORT_MANIFEST_PROPERTY, false);
// if (bugReportEnabled) {
// Crashlytics.start(this);
// }
// } catch (NameNotFoundException e) {
// // nothing needed
// }
NetworkInfoCollector.init(this);
networkInfoCollector = NetworkInfoCollector.getInstance();
......
......@@ -24,6 +24,7 @@ import org.restlet.routing.Template;
import at.alladin.rmbt.statisticServer.export.ExportDirtyResource;
import at.alladin.rmbt.statisticServer.export.ExportResource;
import at.alladin.rmbt.statisticServer.export.TestExportResource;
import at.alladin.rmbt.statisticServer.export.ImageExport;
import at.alladin.rmbt.statisticServer.report.TestReport;
public class StatisticServer extends Application
......@@ -67,7 +68,7 @@ public class StatisticServer extends Application
router.attach("/exportDirty/NetMetr-opendata-dirty-{year}-{month}.", ExportDirtyResource.class, Template.MODE_STARTS_WITH);
router.attach("/export", ExportResource.class, Template.MODE_STARTS_WITH);
// router.attach("/{lang}/{open_test_uuid}/{size}.png", ImageExport.class);
router.attach("/{lang}/{open_test_uuid}/{size}.png", ImageExport.class);
// administrative resources (access restrictions might be applied to /admin/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment