This class is used to
* Created by Rohit. */ -public final class UCEDefaultActivity extends Activity { +public final class UCEDefaultActivity extends AppCompatActivity { private File txtFile; private String strCurrentErrorLog; private String TAG = "UCEDefaultActivity"; diff --git a/app/src/main/java/com/rohitss/uceh/UCEHandler.java b/app/src/main/java/com/rohitss/uceh/UCEHandler.java index 9970e55..b63e6a0 100644 --- a/app/src/main/java/com/rohitss/uceh/UCEHandler.java +++ b/app/src/main/java/com/rohitss/uceh/UCEHandler.java @@ -25,6 +25,8 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; +import androidx.appcompat.app.AppCompatActivity; + import java.io.PrintWriter; import java.io.StringWriter; import java.lang.ref.WeakReference; @@ -228,7 +230,7 @@ public final class UCEHandler { return context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE).getLong(SHARED_PREFERENCES_FIELD_TIMESTAMP, -1); } - static void closeApplication(Activity activity) { + static void closeApplication(AppCompatActivity activity) { activity.finish(); killCurrentProcess(); } diff --git a/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java b/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java index 518b018..da99a4a 100644 --- a/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/BLEScanActivity.java @@ -17,6 +17,8 @@ package uk.org.openseizuredetector; */ +import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED; + import android.Manifest; import android.app.Activity; import android.app.ListActivity; @@ -33,8 +35,6 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -47,9 +47,12 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import java.util.ArrayList; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.view.MenuItemCompat; -import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED; +import java.util.ArrayList; /** * Activity for scanning and displaying available Bluetooth LE devices. @@ -116,7 +119,7 @@ public class BLEScanActivity extends ListActivity { if (!mScanning) { menu.findItem(R.id.menu_stop).setVisible(false); menu.findItem(R.id.menu_scan).setVisible(true); - menu.findItem(R.id.menu_refresh).setActionView(null); + MenuItemCompat.setActionView(menu.findItem(R.id.menu_refresh), null); } else { menu.findItem(R.id.menu_stop).setVisible(true); menu.findItem(R.id.menu_scan).setVisible(false); diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 0097c34..e0fa43e 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -25,7 +25,6 @@ package uk.org.openseizuredetector; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -37,25 +36,20 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.preference.PreferenceManager; -import androidx.core.view.MenuCompat; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewConfiguration; import android.view.WindowManager; +import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Button; -import java.lang.reflect.Field; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Timer; -import java.util.TimerTask; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.MenuCompat; -//MPAndroidChart import com.github.mikephil.charting.charts.BarChart; import com.github.mikephil.charting.components.XAxis; import com.github.mikephil.charting.components.YAxis; @@ -65,6 +59,14 @@ import com.github.mikephil.charting.data.BarEntry; import com.github.mikephil.charting.utils.ValueFormatter; import com.rohitss.uceh.UCEHandler; +import java.lang.reflect.Field; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Timer; +import java.util.TimerTask; + +//MPAndroidChart + public class MainActivity extends AppCompatActivity { static final String TAG = "MainActivity"; private int okColour = Color.BLUE; diff --git a/app/src/main/java/uk/org/openseizuredetector/OsdUncaughtExceptionHandler.java b/app/src/main/java/uk/org/openseizuredetector/OsdUncaughtExceptionHandler.java index 1a5f866..7d4cfed 100644 --- a/app/src/main/java/uk/org/openseizuredetector/OsdUncaughtExceptionHandler.java +++ b/app/src/main/java/uk/org/openseizuredetector/OsdUncaughtExceptionHandler.java @@ -1,6 +1,5 @@ package uk.org.openseizuredetector; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; @@ -11,7 +10,8 @@ import android.os.Environment; import android.os.Looper; import android.os.StatFs; import android.util.Log; -import android.view.WindowManager; + +import androidx.appcompat.app.AlertDialog; import java.io.File; import java.io.PrintWriter; diff --git a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java index ddbe0b8..bcbb120 100644 --- a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java +++ b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java @@ -45,12 +45,14 @@ import android.os.Build; import android.os.Environment; import android.os.Handler; import android.preference.PreferenceManager; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; import android.text.format.Time; import android.util.Log; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + import org.apache.http.conn.util.InetAddressUtils; import java.io.File; @@ -488,7 +490,7 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac } - public void requestPermissions(Activity activity) { + public void requestPermissions(AppCompatActivity activity) { if (mPermissionsRequested) { Log.i(TAG, "requestPermissions() - request already sent - not doing anything"); } else { diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java index 256209e..dcf8d91 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java @@ -26,11 +26,7 @@ package uk.org.openseizuredetector; -import java.text.DecimalFormat; -import java.text.NumberFormat; - import android.app.ActivityManager; -import android.app.AlertDialog; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -49,24 +45,21 @@ import android.media.ToneGenerator; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; +import android.os.Binder; import android.os.Build; import android.os.CountDownTimer; import android.os.Handler; import android.os.HandlerThread; -import android.os.Binder; import android.os.IBinder; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.preference.PreferenceManager; -import androidx.core.app.NotificationCompat; import android.telephony.SmsManager; +import android.text.format.Time; import android.util.Log; -import java.util.Timer; -import java.io.*; -import java.util.*; - -import android.text.format.Time; +import androidx.appcompat.app.AlertDialog; +import androidx.core.app.NotificationCompat; import com.rohitss.uceh.UCEHandler; @@ -74,6 +67,12 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.io.IOException; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.List; +import java.util.Timer; + /** * Based on example at: * http://stackoverflow.com/questions/14309256/using-nanohttpd-in-android diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java index 4cdb192..733d3cf 100644 --- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java @@ -24,8 +24,6 @@ */ package uk.org.openseizuredetector; -import android.app.Activity; -import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -46,6 +44,9 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + import com.rohitss.uceh.UCEHandler; import java.util.Timer; @@ -56,7 +57,7 @@ import java.util.TimerTask; * for it to start and to receive data and settings from the seizure detector before exiting and * starting the main activity. */ -public class StartupActivity extends Activity { +public class StartupActivity extends AppCompatActivity { private static String TAG = "StartupActivity"; private int okColour = Color.BLUE; private int warnColour = Color.MAGENTA; diff --git a/app/src/main/res/layout/activity_authenticate.xml b/app/src/main/res/layout/activity_authenticate.xml index 9be9ddd..fc0f4dd 100644 --- a/app/src/main/res/layout/activity_authenticate.xml +++ b/app/src/main/res/layout/activity_authenticate.xml @@ -1,5 +1,6 @@