From 72a2ecc131353dc7ee85d28bd2777ebea74d0d41 Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Wed, 10 Oct 2018 16:21:06 +0200 Subject: [PATCH 1/8] Update gitignore file --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13be7e9..b924da0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ gen/ # Gradle files .gradle/ build/ +.idea/ # Local configuration file (sdk path, etc) local.properties @@ -71,11 +72,8 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -<<<<<<< HEAD /trainSMART-android.iml /.idea/workspace.xml -======= .idea/compiler.xml .idea/workspace.xml .idea/workspace.xml ->>>>>>> d4fb715fac2036da43fe1d69a048e184408d40a3 From 744e23c2ce967f2a87bff19bc6945a9473cfe71a Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Wed, 10 Oct 2018 16:21:21 +0200 Subject: [PATCH 2/8] Add vmmc.iml file --- app/app.iml | 10 +++++++++- vmmc.iml | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 vmmc.iml diff --git a/app/app.iml b/app/app.iml index 90f3340..f87840d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -86,22 +86,30 @@ + + + + + + + + + - diff --git a/vmmc.iml b/vmmc.iml new file mode 100644 index 0000000..2e6d879 --- /dev/null +++ b/vmmc.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From 4aa0ac6451ff6b909215d0fe9ec41fe37d0afcb9 Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 10:54:59 +0200 Subject: [PATCH 3/8] Fix AndroidManifest --- app/src/main/AndroidManifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0d8127f..2f0b66c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,11 +3,11 @@ package="org.itech.vmmc" android:installLocation="internalOnly" > - + - - - + + + From 742fe3c0819ccc6fba6d28a02f97098cff62e235 Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 11:32:39 +0200 Subject: [PATCH 4/8] Update generated files --- .idea/libraries/android_arch_core_runtime_1_1_0.xml | 4 ++-- .../libraries/android_arch_lifecycle_livedata_core_1_1_0.xml | 4 ++-- .idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml | 4 ++-- .idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml | 4 ++-- .../com_android_support_animated_vector_drawable_27_1_1.xml | 4 ++-- .idea/libraries/com_android_support_appcompat_v7_27_1_1.xml | 4 ++-- .../libraries/com_android_support_recyclerview_v7_27_1_1.xml | 4 ++-- .idea/libraries/com_android_support_support_compat_27_1_1.xml | 4 ++-- .../libraries/com_android_support_support_core_ui_27_1_1.xml | 4 ++-- .../com_android_support_support_core_utils_27_1_1.xml | 4 ++-- .../libraries/com_android_support_support_fragment_27_1_1.xml | 4 ++-- .../com_android_support_support_media_compat_27_1_1.xml | 4 ++-- .idea/libraries/com_android_support_support_v13_27_1_1.xml | 4 ++-- .idea/libraries/com_android_support_support_v4_27_1_1.xml | 4 ++-- .../com_android_support_support_vector_drawable_27_1_1.xml | 4 ++-- vmmc.iml | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.idea/libraries/android_arch_core_runtime_1_1_0.xml b/.idea/libraries/android_arch_core_runtime_1_1_0.xml index db5ef1a..01374cd 100644 --- a/.idea/libraries/android_arch_core_runtime_1_1_0.xml +++ b/.idea/libraries/android_arch_core_runtime_1_1_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml index 2028f85..65f4aba 100644 --- a/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml +++ b/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml index ae81936..d727095 100644 --- a/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml +++ b/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml index d50fc48..3b686fc 100644 --- a/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml +++ b/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml index 1a695b6..dd6321a 100644 --- a/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml +++ b/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml index 0fd5696..0a9b0fa 100644 --- a/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml +++ b/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml b/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml index a8cbb57..e122217 100644 --- a/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml +++ b/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_compat_27_1_1.xml b/.idea/libraries/com_android_support_support_compat_27_1_1.xml index 3d94216..715e411 100644 --- a/.idea/libraries/com_android_support_support_compat_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_compat_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml index aae698e..e9b99d2 100644 --- a/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml index 6968e87..405f3c0 100644 --- a/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/com_android_support_support_fragment_27_1_1.xml index 6599418..cba8f21 100644 --- a/.idea/libraries/com_android_support_support_fragment_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_fragment_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml b/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml index 4a39c4d..a8108f6 100644 --- a/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_v13_27_1_1.xml b/.idea/libraries/com_android_support_support_v13_27_1_1.xml index a222561..7303c3a 100644 --- a/.idea/libraries/com_android_support_support_v13_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_v13_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_v4_27_1_1.xml b/.idea/libraries/com_android_support_support_v4_27_1_1.xml index ed55c0a..fdd3b4e 100644 --- a/.idea/libraries/com_android_support_support_v4_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_v4_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml index aa7b82c..5992ac8 100644 --- a/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml +++ b/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/vmmc.iml b/vmmc.iml index 2e6d879..39447a7 100644 --- a/vmmc.iml +++ b/vmmc.iml @@ -8,7 +8,7 @@ - + From f1d8b577bedffbf74ca51486896e702eb44fb45a Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 12:29:33 +0200 Subject: [PATCH 5/8] Request permissions on startup User will be asked for permissions to: - manage phone calls - access devices locaton - access phone storage If user will deny any of it the app will close. --- app/app.iml | 1 + .../java/org/itech/vmmc/MainActivity.java | 70 ++++++++++------- .../itech/vmmc/RuntimePermissionsHelper.java | 75 +++++++++++++++++++ 3 files changed, 117 insertions(+), 29 deletions(-) create mode 100644 app/src/main/java/org/itech/vmmc/RuntimePermissionsHelper.java diff --git a/app/app.iml b/app/app.iml index f87840d..7a863e0 100644 --- a/app/app.iml +++ b/app/app.iml @@ -87,6 +87,7 @@ + diff --git a/app/src/main/java/org/itech/vmmc/MainActivity.java b/app/src/main/java/org/itech/vmmc/MainActivity.java index f114c32..8da68ba 100644 --- a/app/src/main/java/org/itech/vmmc/MainActivity.java +++ b/app/src/main/java/org/itech/vmmc/MainActivity.java @@ -12,6 +12,7 @@ import android.location.Location; import android.location.LocationManager; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; @@ -99,6 +100,7 @@ public enum ClientOrigination { */ private NavigationDrawerFragment mNavigationDrawerFragment; private Toolbar mToolbar; + private RuntimePermissionsHelper runtimePermissionsHelper; @Override protected void onCreate(Bundle savedInstanceState) { @@ -122,35 +124,7 @@ protected void onCreate(Bundle savedInstanceState) { //mNavigationDrawerFragment.setUserData("Rayce Rossum", "Rayce.Rossum@gmail.com", BitmapFactory.decodeResource(getResources(), R.drawable.avatar)); //mNavigationDrawerFragment.setUserData("Zimbabwe", "Rayce.Rossum"); - final TelephonyManager tm = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE); - final String tmIMEI, tmSerial, androidId; - tmIMEI = "" + tm.getDeviceId(); - tmSerial = "" + tm.getSimSerialNumber(); - androidId = "" + android.provider.Settings.Secure.getString(this.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID); - - UUID deviceUuid = new UUID(androidId.hashCode(), ((long) tmIMEI.hashCode() << 32) | tmSerial.hashCode()); - MainActivity.deviceId = tmIMEI.toString(); -// Log.d(LOG, "mainActivity:onCreate:deviceId: " + deviceId + ":" + tmIMEI + ":" + tmSerial + ":" + androidId); - Log.d(LOG, "mainActivity:onCreate:tmIMEI: " + tmIMEI ); - Log.d(LOG, "mainActivity:onCreate:DEV_URL:" + MainActivity.DEV_URL + "api/login.php" ); - - - locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); - // Define the criteria how to select the location provider -> use - // default - Criteria criteria = new Criteria(); - provider = locationManager.getBestProvider(criteria, true); - Location location = locationManager.getLastKnownLocation(provider); - - // Initialize the location fields - if (location != null) { - System.out.println("Provider " + provider + " has been selected."); - onLocationChanged(location); - } else { - Log.d(LOG, "location is null"); - //latituteField.setText("Location not available"); - //longitudeField.setText("Location not available"); - } + runtimePermissionsHelper = new RuntimePermissionsHelper(this); } /* Request updates at startup */ @@ -166,6 +140,7 @@ protected void onResume() { } super.onResume(); Log.d(LOG, "mainActivity:onResume: ON " ); + runtimePermissionsHelper.requestPermissions(); //locationManager.requestLocationUpdates(provider, 400, 1, this); } @@ -192,6 +167,43 @@ public void onLocationChanged(Location location) { Log.d(LOG, "mainActivity:lng: " + String.valueOf((lng))); } + public void onPermissionsGranted() { + final TelephonyManager tm = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE); + final String tmIMEI, tmSerial, androidId; + tmIMEI = "" + tm.getDeviceId(); + tmSerial = "" + tm.getSimSerialNumber(); + androidId = "" + android.provider.Settings.Secure.getString(this.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID); + + UUID deviceUuid = new UUID(androidId.hashCode(), ((long) tmIMEI.hashCode() << 32) | tmSerial.hashCode()); + MainActivity.deviceId = tmIMEI.toString(); +// Log.d(LOG, "mainActivity:onCreate:deviceId: " + deviceId + ":" + tmIMEI + ":" + tmSerial + ":" + androidId); + Log.d(LOG, "mainActivity:onCreate:tmIMEI: " + tmIMEI ); + Log.d(LOG, "mainActivity:onCreate:DEV_URL:" + MainActivity.DEV_URL + "api/login.php" ); + + + locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + // Define the criteria how to select the location provider -> use + // default + Criteria criteria = new Criteria(); + provider = locationManager.getBestProvider(criteria, true); + Location location = locationManager.getLastKnownLocation(provider); + + // Initialize the location fields + if (location != null) { + System.out.println("Provider " + provider + " has been selected."); + onLocationChanged(location); + } else { + Log.d(LOG, "location is null"); + //latituteField.setText("Location not available"); + //longitudeField.setText("Location not available"); + } + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + runtimePermissionsHelper.onRequestPermissionsResult(requestCode, permissions, grantResults); + } + @Override public void onNavigationDrawerItemSelected(int position) { // update the main content by replacing fragments diff --git a/app/src/main/java/org/itech/vmmc/RuntimePermissionsHelper.java b/app/src/main/java/org/itech/vmmc/RuntimePermissionsHelper.java new file mode 100644 index 0000000..b35ff20 --- /dev/null +++ b/app/src/main/java/org/itech/vmmc/RuntimePermissionsHelper.java @@ -0,0 +1,75 @@ +package org.itech.vmmc; + +import android.Manifest; +import android.content.pm.PackageManager; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; + +public class RuntimePermissionsHelper { + + private static final int READ_PHONE_STATE_REQUEST_CODE = 28123; + private static final int LOCATION_REQUEST_CODE = 28124; + private static final int EXTERNAL_STORAGE_REQUEST_CODE = 28125; + + private MainActivity activity; + + public RuntimePermissionsHelper(MainActivity activity) { + this.activity = activity; + } + + public void requestPermissions() { + if (ensurePhoneStatePermissions() && ensureLocationPermissions() && ensureStoragePermissions()) { + this.activity.onPermissionsGranted(); + } + } + + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + switch (requestCode) { + case READ_PHONE_STATE_REQUEST_CODE: + case EXTERNAL_STORAGE_REQUEST_CODE: + case LOCATION_REQUEST_CODE: + if (grantResults.length > 0 + && grantResults[0] == PackageManager.PERMISSION_DENIED) { + // Permission denied - close the app + System.exit(0); + } + break; + default: + break; + } + } + + private boolean ensurePhoneStatePermissions() { + if (ContextCompat.checkSelfPermission(this.activity, + Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this.activity, + new String[] {Manifest.permission.READ_PHONE_STATE}, + READ_PHONE_STATE_REQUEST_CODE); + + return false; + } + return true; + } + + private boolean ensureLocationPermissions() { + if (ContextCompat.checkSelfPermission(this.activity, + Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this.activity, + new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, + LOCATION_REQUEST_CODE); + return false; + } + return true; + } + + private boolean ensureStoragePermissions() { + if (ContextCompat.checkSelfPermission(this.activity, + Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this.activity, + new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, + EXTERNAL_STORAGE_REQUEST_CODE); + return false; + } + return true; + } +} From 3d84e7c43c5c4ad15f8e90675cdacd538d6fd03f Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 12:41:54 +0200 Subject: [PATCH 6/8] Remove unnecessary generated files --- .idea/dictionaries/rossumg.xml | 7 ------- .../libraries/android_arch_core_common_1_1_0_jar.xml | 11 ----------- .idea/libraries/android_arch_core_runtime_1_1_0.xml | 12 ------------ .../android_arch_lifecycle_common_1_1_0_jar.xml | 11 ----------- .../android_arch_lifecycle_livedata_core_1_1_0.xml | 12 ------------ .../android_arch_lifecycle_runtime_1_1_0.xml | 12 ------------ .../android_arch_lifecycle_viewmodel_1_1_0.xml | 12 ------------ ...droid_support_animated_vector_drawable_27_1_1.xml | 12 ------------ .../com_android_support_appcompat_v7_27_1_1.xml | 12 ------------ .../com_android_support_recyclerview_v7_27_1_1.xml | 12 ------------ ...ndroid_support_support_annotations_27_1_1_jar.xml | 11 ----------- .../com_android_support_support_compat_27_1_1.xml | 12 ------------ .../com_android_support_support_core_ui_27_1_1.xml | 12 ------------ ...com_android_support_support_core_utils_27_1_1.xml | 12 ------------ .../com_android_support_support_fragment_27_1_1.xml | 12 ------------ ...m_android_support_support_media_compat_27_1_1.xml | 12 ------------ .../com_android_support_support_v13_27_1_1.xml | 12 ------------ .../com_android_support_support_v4_27_1_1.xml | 12 ------------ ...ndroid_support_support_vector_drawable_27_1_1.xml | 12 ------------ 19 files changed, 220 deletions(-) delete mode 100644 .idea/dictionaries/rossumg.xml delete mode 100644 .idea/libraries/android_arch_core_common_1_1_0_jar.xml delete mode 100644 .idea/libraries/android_arch_core_runtime_1_1_0.xml delete mode 100644 .idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml delete mode 100644 .idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml delete mode 100644 .idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml delete mode 100644 .idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml delete mode 100644 .idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_appcompat_v7_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml delete mode 100644 .idea/libraries/com_android_support_support_compat_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_core_ui_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_core_utils_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_fragment_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_media_compat_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_v13_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_v4_27_1_1.xml delete mode 100644 .idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml diff --git a/.idea/dictionaries/rossumg.xml b/.idea/dictionaries/rossumg.xml deleted file mode 100644 index fded8be..0000000 --- a/.idea/dictionaries/rossumg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - karas - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_core_common_1_1_0_jar.xml b/.idea/libraries/android_arch_core_common_1_1_0_jar.xml deleted file mode 100644 index 6bf5068..0000000 --- a/.idea/libraries/android_arch_core_common_1_1_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_core_runtime_1_1_0.xml b/.idea/libraries/android_arch_core_runtime_1_1_0.xml deleted file mode 100644 index 01374cd..0000000 --- a/.idea/libraries/android_arch_core_runtime_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml b/.idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml deleted file mode 100644 index e700771..0000000 --- a/.idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml deleted file mode 100644 index 65f4aba..0000000 --- a/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml deleted file mode 100644 index d727095..0000000 --- a/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml deleted file mode 100644 index 3b686fc..0000000 --- a/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml deleted file mode 100644 index dd6321a..0000000 --- a/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml deleted file mode 100644 index 0a9b0fa..0000000 --- a/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml b/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml deleted file mode 100644 index e122217..0000000 --- a/.idea/libraries/com_android_support_recyclerview_v7_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml b/.idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml deleted file mode 100644 index 6f56f79..0000000 --- a/.idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_compat_27_1_1.xml b/.idea/libraries/com_android_support_support_compat_27_1_1.xml deleted file mode 100644 index 715e411..0000000 --- a/.idea/libraries/com_android_support_support_compat_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml deleted file mode 100644 index e9b99d2..0000000 --- a/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml deleted file mode 100644 index 405f3c0..0000000 --- a/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/com_android_support_support_fragment_27_1_1.xml deleted file mode 100644 index cba8f21..0000000 --- a/.idea/libraries/com_android_support_support_fragment_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml b/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml deleted file mode 100644 index a8108f6..0000000 --- a/.idea/libraries/com_android_support_support_media_compat_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_v13_27_1_1.xml b/.idea/libraries/com_android_support_support_v13_27_1_1.xml deleted file mode 100644 index 7303c3a..0000000 --- a/.idea/libraries/com_android_support_support_v13_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_v4_27_1_1.xml b/.idea/libraries/com_android_support_support_v4_27_1_1.xml deleted file mode 100644 index fdd3b4e..0000000 --- a/.idea/libraries/com_android_support_support_v4_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml deleted file mode 100644 index 5992ac8..0000000 --- a/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From 67832e2aa478e03bbb3357256a617cdf8ddc6276 Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 12:47:46 +0200 Subject: [PATCH 7/8] Bump version code --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8400e1c..18853a1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "org.itech.vmmc" minSdkVersion 19 targetSdkVersion 27 - versionCode 4 - versionName "4.11" + versionCode 5 + versionName "5.11" } buildTypes { release { From 8cd0e2777b3520246413bf4c7d24f513e7db5457 Mon Sep 17 00:00:00 2001 From: Karol Cissewski Date: Thu, 11 Oct 2018 13:19:18 +0200 Subject: [PATCH 8/8] Remove unnecesary files in gitignore file --- .gitignore | 6 +----- app/app.iml | 1 + app/release/output.json | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 app/release/output.json diff --git a/.gitignore b/.gitignore index b924da0..7a3d219 100644 --- a/.gitignore +++ b/.gitignore @@ -72,8 +72,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -/trainSMART-android.iml -/.idea/workspace.xml -.idea/compiler.xml -.idea/workspace.xml -.idea/workspace.xml +/trainSMART-android.iml \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 7a863e0..bfde4f5 100644 --- a/app/app.iml +++ b/app/app.iml @@ -111,6 +111,7 @@ + diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..186da42 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"org.itech.vmmc","split":"","minSdkVersion":"19"}}] \ No newline at end of file