diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9cb76e2..49401bd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
+
diff --git a/.travis.yml b/.travis.yml
index 94ceb10..af5b490 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ deploy:
api_key: "c8526dab1810234341695d47e399f7b76e411445"
file: ${TRAVIS_BUILD_DIR}/app/build/outputs/apk/app-release-unsigned.apk
on:
- repo: raffysommy/Testappk12
+ repo: raffysommy/EducatioNet
branch: master
tags: true
all_branches: true
\ No newline at end of file
diff --git a/acra-4.6.1/acra-4.6.1.iml b/acra-4.6.1/acra-4.6.1.iml
new file mode 100644
index 0000000..635173f
--- /dev/null
+++ b/acra-4.6.1/acra-4.6.1.iml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/acra-4.6.1/acra-4.6.1.jar b/acra-4.6.1/acra-4.6.1.jar
new file mode 100644
index 0000000..b85f439
Binary files /dev/null and b/acra-4.6.1/acra-4.6.1.jar differ
diff --git a/acra-4.6.1/build.gradle b/acra-4.6.1/build.gradle
new file mode 100644
index 0000000..cb2fece
--- /dev/null
+++ b/acra-4.6.1/build.gradle
@@ -0,0 +1,2 @@
+configurations.create("default")
+artifacts.add("default", file('acra-4.6.1.jar'))
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index d84bf2a..1f730e2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -92,6 +92,7 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index b7be46c..9270c35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,4 +26,5 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:21.0.3'
compile project(':MQA-Android-2.7.4')
+ compile project(':acra-4.6.1')
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 67be51b..5778901 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,22 +1,22 @@
-
-
+
+
+
-
+
diff --git a/app/src/main/java/com/educationet/k12/app/ChatPage.java b/app/src/main/java/com/educationet/k12/app/ChatPage.java
index eedffa5..ce6b2ae 100644
--- a/app/src/main/java/com/educationet/k12/app/ChatPage.java
+++ b/app/src/main/java/com/educationet/k12/app/ChatPage.java
@@ -39,7 +39,7 @@ private void loadpage(){
WebView myWebView = (WebView) findViewById(R.id.chatView);
myWebView.getSettings().setJavaScriptEnabled(true);
myWebView.setWebChromeClient(new WebChromeClient());
- myWebView.loadUrl("http://chat-k12-paovalle.c9.io/?id="+user.getFirstName()+user.getLastName());
+ myWebView.loadUrl("http://node.server.educationet.tk/?id="+user.getFirstName()+user.getLastName());
}
/**
* Handler of rotation
diff --git a/app/src/main/java/com/educationet/k12/app/EducatioNet.java b/app/src/main/java/com/educationet/k12/app/EducatioNet.java
new file mode 100644
index 0000000..3271615
--- /dev/null
+++ b/app/src/main/java/com/educationet/k12/app/EducatioNet.java
@@ -0,0 +1,16 @@
+package com.educationet.k12.app;
+import android.app.Application;
+
+import org.acra.*;
+import org.acra.annotation.*;
+
+@ReportsCrashes(formUri = "https://collector.tracepot.com/0149abb9")
+public class EducatioNet extends Application {
+ @Override
+ public void onCreate() {
+ super.onCreate();
+
+ // The following line triggers the initialization of ACRA
+ ACRA.init(this);
+ }
+}
diff --git a/app/src/main/java/com/educationet/k12/app/MainActivity.java b/app/src/main/java/com/educationet/k12/app/MainActivity.java
index 5cca2ba..147f9ad 100644
--- a/app/src/main/java/com/educationet/k12/app/MainActivity.java
+++ b/app/src/main/java/com/educationet/k12/app/MainActivity.java
@@ -13,8 +13,8 @@
import android.widget.EditText;
import android.widget.Toast;
-import com.ibm.mqa.MQA;
+import com.ibm.mqa.MQA;
/**
* Login Main Activity
* @author K12-Dev-Team
@@ -22,8 +22,8 @@
* @see android.app.Activity
*/
public class MainActivity extends ActionBarActivity {
+ //public static final String APP_KEY = "a7eada52bd15b505d07f486a2a8d729bc6b4a10f";
//subclass for login execution
- public static final String APP_KEY = "a7eada52bd15b505d07f486a2a8d729bc6b4a10f";
/**
* internal class of management of the login asynchronous
*/
@@ -74,6 +74,7 @@ protected void onPostExecute(User utente) {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ /*
com.ibm.mqa.config.Configuration configuration = new com.ibm.mqa.config.Configuration.Builder(this)
.withAPIKey(APP_KEY) //Provides the quality assurance application APP_KEY
.withMode(MQA.Mode.QA) //Selects the quality assurance application mode
@@ -81,8 +82,8 @@ protected void onCreate(Bundle savedInstanceState) {
.build();
MQA.startNewSession(MainActivity.this, configuration);
+ */
setloginsaved();
-
}
/**
diff --git a/settings.gradle b/settings.gradle
index 8cfc6e8..3eb8eb7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':MQA-Android-2.7.4'
+include ':app', ':MQA-Android-2.7.4', ':acra-4.6.1'