Add appUpdater & dont start service if battery is not connected

Signed-off-by: GauthamAsir <[email protected]>
GauthamAsir · Jun 12, 2020 · a3ae29f · a3ae29f
1 parent f3a056e
commit a3ae29f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 27 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,6 +39,9 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.10.1'
 
     // Material Themes
-    implementation 'com.google.android.material:material:1.2.0-beta01'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
+
+    //App-Updater
+    implementation project(path: ':library')
 
 }
diff --git a/app/src/main/java/a/gautham/jiofistatus/MainActivity.java b/app/src/main/java/a/gautham/jiofistatus/MainActivity.java
@@ -25,6 +25,8 @@
 import java.util.TimerTask;
 
 import a.gautham.jiofistatus.service.BackgroundService;
+import a.gautham.library.AppUpdater;
+import a.gautham.library.helper.Display;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -36,6 +38,8 @@ public class MainActivity extends AppCompatActivity {
     private ProgressBar progress_circular;
     private MaterialCardView tools_layout;
 
+    private boolean startNotification = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -55,6 +59,11 @@ protected void onCreate(Bundle savedInstanceState) {
         error_tv.setVisibility(View.GONE);
         tools_layout.setVisibility(View.GONE);
 
+        AppUpdater appUpdater = new AppUpdater(this);
+        appUpdater.setDisplay(Display.DIALOG);
+        appUpdater.setUpGithub("GauthamAsir", "JioFiStatus");
+        appUpdater.start();
+
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
@@ -64,6 +73,18 @@ public void run() {
 
     }
 
+    @Override
+    protected void onResume() {
+        if (startNotification) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                startForegroundService(new Intent(getApplicationContext(), BackgroundService.class));
+            } else {
+                startService(new Intent(getApplicationContext(), BackgroundService.class));
+            }
+        }
+        super.onResume();
+    }
+
     @SuppressLint("StaticFieldLeak")
     class GetData extends AsyncTask<Object, Object, Object> {
 
@@ -75,6 +96,8 @@ protected Object doInBackground(Object... objects) {
 
             try {
                 Document document = Jsoup.connect("http://jiofi.local.html/").get();
+                System.out.println(document);
+
                 batteryLevel = document.getElementById("batterylevel").val();
                 network_signal = document.getElementById("signalstrength").val();
                 upSpeed = document.getElementById("ulCurrentDataRate").val();
@@ -95,7 +118,7 @@ protected void onPostExecute(Object o) {
 
             progress_circular.setVisibility(View.GONE);
 
-            if (o==null) {
+            if (o == null) {
                 error_tv.setText(error);
                 error_tv.setVisibility(View.VISIBLE);
                 return;
@@ -104,21 +127,27 @@ protected void onPostExecute(Object o) {
             tools_layout.setVisibility(View.VISIBLE);
 
             textView.setText(o.toString());
-            int progress = Integer.parseInt(o.toString().replace("%",""));
-            ObjectAnimator.ofInt(progressBar, "progress", progress)
-                    .setDuration(300)
-                    .start();
-
-            if (progress<=20){
-                progressBar.setProgressTintList(ColorStateList.valueOf(Color.RED));
-            }else if (progress<=40){
-                progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#FFA500")));
-            } else if (progress <= 60) {
-                progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#CCCC00")));
-            } else if (progress <= 80) {
-                progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#198021")));
-            } else {
-                progressBar.setProgressTintList(ColorStateList.valueOf(Color.GREEN));
+
+            if (!o.toString().equals("No Battery")) {
+
+                startNotification = true;
+
+                int progress = Integer.parseInt(o.toString().replace("%", ""));
+                ObjectAnimator.ofInt(progressBar, "progress", progress)
+                        .setDuration(300)
+                        .start();
+
+                if (progress <= 20) {
+                    progressBar.setProgressTintList(ColorStateList.valueOf(Color.RED));
+                } else if (progress <= 40) {
+                    progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#FFA500")));
+                } else if (progress <= 60) {
+                    progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#CCCC00")));
+                } else if (progress <= 80) {
+                    progressBar.setProgressTintList(ColorStateList.valueOf(Color.parseColor("#198021")));
+                } else {
+                    progressBar.setProgressTintList(ColorStateList.valueOf(Color.GREEN));
+                }
             }
 
             signal_strength_value.setText(network_signal);
@@ -156,16 +185,6 @@ protected void onPostExecute(Object o) {
         }
     }
 
-    @Override
-    protected void onResume() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForegroundService(new Intent(getApplicationContext(), BackgroundService.class));
-        } else {
-            startService(new Intent(getApplicationContext(), BackgroundService.class));
-        }
-        super.onResume();
-    }
-
     @Override
     protected void onDestroy() {
         timer.cancel();

diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,9 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.0"

diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,3 @@
+include ':library'
 include ':app'
 rootProject.name = "JioFiStatus"