Merge branch '1-counter-falls-back'

Author: gtaEPIC

.idea/gradle.xml

@@ -1,22 +1,14 @@
 package com.example.stickbug.Main;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.NotificationCompat;
 
 import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.media.MediaPlayer;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.example.stickbug.Background.Background;
 import com.example.stickbug.R;
@@ -30,8 +22,6 @@ public class MainActivity extends AppCompatActivity {
     boolean appOpen = false;
     TextView textView;
     Savedata savedata;
-    MediaPlayer mediaPlayer;
-    Background background;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,7 +30,10 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
 
-
+    private void refresh() {
+        savedata = new Savedata(new File(this.getFilesDir(), "yes.prop"));
+        repeats = savedata.getRepeats();
+    }
 
 
     private BroadcastReceiver receiver = new BroadcastReceiver() {
@@ -50,9 +43,11 @@ public void onReceive(Context context, Intent intent) {
             Bundle bundle = intent.getExtras();
             if (bundle != null) {
                 String check = bundle.getString(Background.REQUEST);
-                int Repeats = bundle.getInt(Background.REPEATS);
+                int Repeats = bundle.getInt(Background.REPEATS, -1);
                 repeats = Repeats;
-                savedata.saveRepeats(repeats);
+                if (Repeats != -1) {
+                    savedata.saveRepeats(repeats);
+                }
                 if (appOpen) {
                     textView.setText("x" + repeats);
                 }
@@ -67,6 +62,7 @@ public void onReceive(Context context, Intent intent) {
     protected void onResume() {
         super.onResume();
         appOpen = true;
+        refresh();
         textView.setText("x" + repeats);
     }
     @Override
@@ -84,8 +80,7 @@ protected void onStart() {
         super.onStart();
         appOpen = true;
         registerReceiver(receiver, new IntentFilter(Background.PACKAGE));
-        savedata = new Savedata(new File(this.getFilesDir(), "yes.prop"));
-        repeats = savedata.getRepeats();
+        refresh();
         textView = findViewById(R.id.times);
         textView.setText("x" + repeats);
         Intent intent = new Intent(this, Background.class);

.idea/vcs.xml

@@ -12,12 +12,14 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
-import android.widget.Toast;
 
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.example.stickbug.R;
+import com.example.stickbug.Savedata.Savedata;
+
+import java.io.File;
 
 
 public class Background extends Service {
@@ -28,15 +30,17 @@ public class Background extends Service {
     public static final String REPEATS = "Repeats";
     public static final String TOTAL_REPEATS = "Total Repeats";
     public static final String APP_STATE = "App State";
-    public static final String APP_CLOSED = "Closed";
     public static final String APP_OPENED = "Opened";
     public static final String STOPPLZ = "Stop";
 
     private int repeats;
     private boolean playing = false;
     NotificationManagerCompat managerCompat;
 
-
+    private void refresh() {
+        Savedata savedata = new com.example.stickbug.Savedata.Savedata(new File(this.getFilesDir(), "yes.prop"));
+        savedata.saveRepeats(repeats);
+    }
 
     @Override
     public void onCreate() {
@@ -73,7 +77,7 @@ public Notification createNotification() {
         PendingIntent stopPending = PendingIntent.getForegroundService(this, 0, stopIntent, 0);
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this, "yes")
-                .setSmallIcon(R.drawable.stickbug)
+                .setSmallIcon(R.drawable.sb)
                 .setContentTitle("You are being Stick Bugged")
                 .setContentText("Song has played a total of x" + repeats)
                 .setContentIntent(pendingIntent)
@@ -92,13 +96,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         String request = "";
         String appState = "";
         try {
+            assert incoming != null;
             request = incoming.getString(REQUEST);
             appState = incoming.getString(APP_STATE);
 
         }catch (NullPointerException e) {
             e.printStackTrace();
         }
         try {
+            assert request != null;
             if (request.equals(REPEATS)) {
                 returnCounter();
             }
@@ -110,12 +116,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 //System.exit(0);
                 stopSelf();
             }
+            assert appState != null;
             if (appState.equals(APP_OPENED)) {
                 managerCompat.cancel(0);
             }
-            if (appState.equals(APP_CLOSED)) {
-                //managerCompat.notify(0, createNotification());
-            }
+            //managerCompat.notify(0, createNotification());
         }catch (NullPointerException e) {
             e.printStackTrace();
             Log.i("Error", "Error was sort of expected.");
@@ -152,6 +157,7 @@ public void onCompletion(MediaPlayer mediaPlayer) {
     }
 
     private void returnCounter() {
+        refresh();
         Intent intent = new Intent(PACKAGE);
         intent.putExtra(REPEATS, repeats);
         sendBroadcast(intent);