diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
deleted file mode 100644
index 26d33521a..000000000
--- a/android/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml
index 91e7936cc..8b0863d54 100644
--- a/android/.idea/jarRepositories.xml
+++ b/android/.idea/jarRepositories.xml
@@ -31,10 +31,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
index 95e233687..2a4d5b521 100644
--- a/android/.idea/misc.xml
+++ b/android/.idea/misc.xml
@@ -1,17 +1,6 @@
-
-
-
-
-
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 365284cad..4b03508bb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
- applicationId "com.gpr.gabinetedigital"
+ applicationId "com.capacitorjs.app.testapp"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
@@ -27,13 +27,9 @@ repositories {
flatDir{
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
}
- maven {
- url "https://jitpack.io"
- }
}
dependencies {
- implementation 'com.google.firebase:firebase-config:15.0.2'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation project(':capacitor-android')
@@ -41,7 +37,6 @@ dependencies {
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
- implementation 'com.github.javiersantos:AppUpdater:2.7'
}
apply from: 'capacitor.build.gradle'
diff --git a/android/app/google-services.json b/android/app/google-services.json
deleted file mode 100644
index 0a455bcff..000000000
--- a/android/app/google-services.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "project_info": {
- "project_number": "800733765231",
- "firebase_url": "https://gabinete-digital-2020.firebaseio.com",
- "project_id": "gabinete-digital-2020",
- "storage_bucket": "gabinete-digital-2020.appspot.com"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a",
- "android_client_info": {
- "package_name": "com.gpr.gabinetedigital"
- }
- },
- "oauth_client": [
- {
- "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
deleted file mode 100644
index b5a12fdce..000000000
--- a/android/app/release/output-metadata.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "version": 2,
- "artifactType": {
- "type": "APK",
- "kind": "Directory"
- },
- "applicationId": "com.gpr.gabinetedigital",
- "variantName": "release",
- "elements": [
- {
- "type": "SINGLE",
- "filters": [],
- "versionCode": 1,
- "versionName": "1.0",
- "outputFile": "app-release.apk"
- }
- ]
-}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e55b6e225..7321c5001 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,17 +1,41 @@
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index 3e6b74d70..000000000
Binary files a/android/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/android/app/src/main/java/com/gpr/gabinetedigital/App.java b/android/app/src/main/java/com/gpr/gabinetedigital/App.java
deleted file mode 100644
index 98e7eb445..000000000
--- a/android/app/src/main/java/com/gpr/gabinetedigital/App.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gpr.gabinetedigital;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class App extends Application {
- @Override
- public void onCreate() {
- super.onCreate();
-
- FirebaseRemoteConfig remoteConfig = FirebaseRemoteConfig.getInstance();
-
- Map defaultValue = new HashMap<>();
- defaultValue.put(UpdateHelper.KEY_UPDATE_ENABLE,false);
- defaultValue.put(UpdateHelper.KEY_UPDATE_VERSION,"1.0");
- defaultValue.put(UpdateHelper.KEY_UPDATE_URL,"https://d953-41-63-166-54.ngrok.io/gabinete_digital.apk");
-
- remoteConfig.setDefaults(defaultValue);
- remoteConfig.fetch(1)
- .addOnCompleteListener(new OnCompleteListener() {
- @Override
- public void onComplete(@NonNull Task task) {
- if(task.isSuccessful()) {
- remoteConfig.activateFetched();
- }
- }
- });
-
-
- }
-}
diff --git a/android/app/src/main/java/com/gpr/gabinetedigital/MainActivity.java b/android/app/src/main/java/com/gpr/gabinetedigital/MainActivity.java
deleted file mode 100644
index dc2ee50c3..000000000
--- a/android/app/src/main/java/com/gpr/gabinetedigital/MainActivity.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gpr.gabinetedigital;
-
-import com.getcapacitor.BridgeActivity;
-
-public class MainActivity extends BridgeActivity {}
-
-
-
diff --git a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateActivity.java b/android/app/src/main/java/com/gpr/gabinetedigital/UpdateActivity.java
deleted file mode 100644
index 14f42684e..000000000
--- a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateActivity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gpr.gabinetedigital;
-
-import android.app.AlertDialog;
-import android.app.Application;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.widget.Toast;
-
-public class UpdateActivity extends Application implements UpdateHelper.onUpdateCheckListener {
-
- @Override
- public void onCreate() {
- super.onCreate();
-
- UpdateHelper.with(this)
- .onUpdateCheck(this)
- .check();
- }
-
- @Override
- public void onUpdateCheckListener(String urlApp) {
-
- AlertDialog alertDialog = new AlertDialog.Builder(this)
- .setTitle("New Version Available")
- .setMessage("Please update to new version to continue use")
- .setPositiveButton("UPDATE", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Toast.makeText(UpdateActivity.this, ""+urlApp,Toast.LENGTH_SHORT).show();
- }
- }).setNegativeButton("CANCEL", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- }
- }).create();
- alertDialog.show();
- }
-}
diff --git a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateApp.java b/android/app/src/main/java/com/gpr/gabinetedigital/UpdateApp.java
deleted file mode 100644
index c90cf255a..000000000
--- a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateApp.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gpr.gabinetedigital;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class UpdateApp extends AsyncTask {
- private Context context;
- public void setContext(Context contextf){
- context = contextf;
- }
-
- @Override
- protected Void doInBackground(String... arg0) {
- try {
- URL url = new URL(arg0[0]);
- HttpURLConnection c = (HttpURLConnection) url.openConnection();
- c.setRequestMethod("GET");
- c.setDoOutput(true);
- c.connect();
-
- String PATH = "/mnt/sdcard/Download/";
- File file = new File(PATH);
- file.mkdirs();
- File outputFile = new File(file, "update.apk");
- if(outputFile.exists()){
- outputFile.delete();
- }
- FileOutputStream fos = new FileOutputStream(outputFile);
-
- InputStream is = c.getInputStream();
-
- byte[] buffer = new byte[1024];
- int len1 = 0;
- while ((len1 = is.read(buffer)) != -1) {
- fos.write(buffer, 0, len1);
- }
- fos.close();
- is.close();
-
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(Uri.fromFile(new File("/mnt/sdcard/Download/update.apk")), "application/vnd.android.package-archive");
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // without this flag android returned a intent error!
- context.startActivity(intent);
-
-
- } catch (Exception e) {
- Log.e("UpdateAPP", "Update error! " + e.getMessage());
- }
- return null;
- }
-}
diff --git a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateHelper.java b/android/app/src/main/java/com/gpr/gabinetedigital/UpdateHelper.java
deleted file mode 100644
index dcef80115..000000000
--- a/android/app/src/main/java/com/gpr/gabinetedigital/UpdateHelper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gpr.gabinetedigital;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.text.TextUtils;
-
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
-
-public class UpdateHelper {
- public static String KEY_UPDATE_ENABLE = "is_update";
- public static String KEY_UPDATE_VERSION = "version";
- public static String KEY_UPDATE_URL = "update_url";
-
- public interface onUpdateCheckListener {
- void onUpdateCheckListener(String urlApp);
- }
-
- public static Builder with(Context context) {
- return new Builder(context);
- }
-
- private onUpdateCheckListener onUpdateCheckListener;
- private Context context;
-
- public UpdateHelper(Context context, UpdateHelper.onUpdateCheckListener onUpdateCheckListener) {
- this.onUpdateCheckListener = onUpdateCheckListener;
- this.context = context;
- }
-
- public void check() {
- FirebaseRemoteConfig remoteconfig = FirebaseRemoteConfig.getInstance();
- if(remoteconfig.getBoolean(KEY_UPDATE_ENABLE)) {
- String currentVersion = remoteconfig.getString(KEY_UPDATE_VERSION);
- String appVersion = getAppVersion(context);
- String updateURL = remoteconfig.getString(KEY_UPDATE_URL);
-
- if(!TextUtils.equals(currentVersion,appVersion) && onUpdateCheckListener != null)
- onUpdateCheckListener.onUpdateCheckListener(updateURL);
- }
- }
-
- private String getAppVersion(Context context) {
- String result ="";
-
- try {
- result = context.getPackageManager().getPackageInfo(context.getPackageName(), 0)
- .versionName;
- result = result.replaceAll("[a-ZA-Z] |-", "");
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
-
- return result;
- }
-
- public static class Builder {
- private Context context;
- private onUpdateCheckListener onUpdateCheckListener;
-
- public Builder(Context context) {
- this.context = context;
- }
-
- public Builder onUpdateCheck(onUpdateCheckListener onUpdateCheckListener) {
- this.onUpdateCheckListener = onUpdateCheckListener;
- return this;
- }
-
- public UpdateHelper build() {
- return new UpdateHelper(context, onUpdateCheckListener);
- }
-
- public UpdateHelper check() {
- UpdateHelper updateHelper = build();
- updateHelper.check();
-
- return updateHelper;
- }
-
-
- }
-}
diff --git a/android/build.gradle b/android/build.gradle
index ad085c345..2b99d5b79 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
-
+
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.1'
- classpath 'com.google.gms:google-services:4.3.5'
+ classpath 'com.android.tools.build:gradle:7.1.3'
+ classpath 'com.google.gms:google-services:4.3.10'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c4101c3e..a0f7639f7 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 2b4ce1639..2c9d0dedf 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -16,7 +16,6 @@ import { MessageModel, DeleteMessageModel } from '../../models/beast-orm';
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service';
-import * as Sentry from "@sentry/capacitor";
@Component({
@@ -100,23 +99,7 @@ export class LoginPage implements OnInit {
this.notificatinsservice.getAndpostToken(this.username);
}
- failFunction() {
- const foo: any = null;
- const bar = foo.test;
- }
-
- throwJsError() {
- throw new Error('Iam a manual error!')
- }
-
- captureSentryError(){
- Sentry.captureException('Directly capture the error with sentry');
- }
-
async Login() {
- this.failFunction();
- this.throwJsError();
- this.captureSentryError();
if (this.validateUsername()) {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index d755a7189..2627ac54c 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -5,7 +5,7 @@ export const environment = {
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
- apiWsChatUrl: 'ws://gd-chat.oapr.gov.ao/websocket',
+ apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
/* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
// apiChatUrl: 'https://www.tabularium.pt/api/v1/',