diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 68bc9c0..1fd5949 100755
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,14 +5,15 @@
+
+
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_21_0_0.xml b/.idea/libraries/support_annotations_21_0_0.xml
deleted file mode 100755
index 8f7df71..0000000
--- a/.idea/libraries/support_annotations_21_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_24_1_1.xml b/.idea/libraries/support_annotations_24_1_1.xml
new file mode 100755
index 0000000..53f4232
--- /dev/null
+++ b/.idea/libraries/support_annotations_24_1_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_21_0_0.xml b/.idea/libraries/support_v4_21_0_0.xml
deleted file mode 100755
index e2011bd..0000000
--- a/.idea/libraries/support_v4_21_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_24_1_1.xml b/.idea/libraries/support_v4_24_1_1.xml
new file mode 100755
index 0000000..f101bb3
--- /dev/null
+++ b/.idea/libraries/support_v4_24_1_1.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 490d9d3..ec0b07a 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8512e8f..f456756 100755
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,8 @@
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/.idea/modules/UeControl.iml b/.idea/modules/UeControl.iml
new file mode 100755
index 0000000..5dd4b06
--- /dev/null
+++ b/.idea/modules/UeControl.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml
new file mode 100755
index 0000000..6f8d8de
--- /dev/null
+++ b/.idea/modules/app/app.iml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UeControl.iml b/UeControl.iml
deleted file mode 100755
index b20c571..0000000
--- a/UeControl.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/app-release.apk b/app/app-release.apk
index e2cd711..638e4c3 100755
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/app.iml b/app/app.iml
deleted file mode 100755
index 82cc11d..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 48b9197..6677db7 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.ericsson.uecontrol"
minSdkVersion 15
targetSdkVersion 19
- versionCode 39
- versionName "1.0.39"
+ versionCode 40
+ versionName "1.0.40"
}
buildTypes {
release {
@@ -29,10 +29,14 @@ android {
exclude 'META-INF/license.txt'
exclude 'META-INF/dependencies.txt'
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile fileTree(include: ['*.jar'], dir: 'libs')
// You must install or update the Support Repository through the SDK manager to use this dependency.
compile 'com.android.support:support-v4:+'
}
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
index 277f087..c88b719 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
@@ -165,8 +165,8 @@ public class UeControlExecutor implements Runnable{
currentlyActive = null;
}
}
- synchronized (csvLogger) {
- if (csvLogger != null) {
+ if (csvLogger != null) {
+ synchronized (csvLogger) {
csvLogger.flush();
csvLogger = null;
}
@@ -248,11 +248,12 @@ public class UeControlExecutor implements Runnable{
downloadSpeed.setHandledData(0);
}
if (uploadSpeed.isUpdated()) {
- synchronized (csvLogger) {
- if (csvLogger != null)
+ if (csvLogger != null){
+ synchronized (csvLogger) {
csvLogger.write(getRunningBehaviour().getName(),
downloadSpeed.getBitThroughput(),
uploadSpeed.getBitThroughput());
+ }
}
if (throughputListener != null)
throughputListener.throughputUpdate(
diff --git a/build.gradle b/build.gradle
index 50e899c..a2d70b4 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:2.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f67dce..e6be85e 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 29 15:23:07 CET 2015
+#Mon Aug 01 15:57:04 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip