99import android .app .ActivityManager ;
1010import android .bluetooth .BluetoothAdapter ;
1111import android .bluetooth .BluetoothDevice ;
12- import android .content .ComponentName ;
1312import android .content .Context ;
1413import android .content .Intent ;
1514import android .content .SharedPreferences ;
16- import android .os .IBinder ;
15+ import android .os .Handler ;
16+ import android .os .Looper ;
1717import android .util .Log ;
1818
19- import android .content .ServiceConnection ;
2019import androidx .lifecycle .LifecycleService ;
20+ import androidx .lifecycle .Observer ;
2121import androidx .preference .PreferenceManager ;
2222
2323import java .io .ByteArrayOutputStream ;
3434import cc .calliope .mini .ProgressCollector ;
3535import cc .calliope .mini .ProgressListener ;
3636import cc .calliope .mini .R ;
37- import cc .calliope .mini .pf .Test ;
3837import cc .calliope .mini .core .state .ApplicationStateHandler ;
38+ import cc .calliope .mini .core .state .Notification ;
3939import cc .calliope .mini .core .state .State ;
4040import cc .calliope .mini .utils .FileUtils ;
4141import cc .calliope .mini .utils .Preference ;
@@ -57,26 +57,46 @@ public class FlashingService extends LifecycleService implements ProgressListene
5757 private int currentVersion ;
5858 private String currentPath ;
5959 private int progress = -10 ;
60- private Test testService ;
61- private boolean isBound = false ;
60+
61+ private static final int CONNECTION_TIMEOUT = 10000 ; // 10 seconds
62+ private Handler handler ;
63+ private Runnable timeoutRunnable ;
6264
6365 private record HexToDfu (String path , int size ) {
6466 }
6567
68+ private final Observer <State > stateObserver = new Observer <>() {
69+ @ Override
70+ public void onChanged (State state ) {
71+ if (state == null ) {
72+ return ;
73+ }
74+
75+ int type = state .getType ();
76+
77+ if (type == State .STATE_READY ||
78+ type == State .STATE_FLASHING ||
79+ type == State .STATE_ERROR ||
80+ type == State .STATE_IDLE ) {
81+ handler .removeCallbacks (timeoutRunnable ); // Remove the timeout callback
82+ }
83+ }
84+ };
85+
6686 @ Override
6787 public void onCreate () {
6888 super .onCreate ();
6989
90+ ApplicationStateHandler .getStateLiveData ().observe (this , stateObserver );
91+
7092 ProgressCollector progressCollector = new ProgressCollector (this );
7193 getLifecycle ().addObserver (progressCollector );
72-
73- //bindToTestService();
7494 }
7595
7696 @ Override
7797 public void onDestroy () {
78- //unbindFromTestService();
7998 super .onDestroy ();
99+ ApplicationStateHandler .getStateLiveData ().removeObserver (stateObserver );
80100 }
81101
82102 @ Override
@@ -136,6 +156,7 @@ public void onBluetoothBondingStateChanged(BluetoothDevice device, int bondState
136156 }
137157
138158
159+ @ SuppressWarnings ("MissingPermission" )
139160 @ Override
140161 public void onError (int code , String message ) {
141162 if (code == 4110 ) {
@@ -172,8 +193,7 @@ private boolean isServiceRunning() {
172193 ActivityManager activityManager = (ActivityManager ) getSystemService (Context .ACTIVITY_SERVICE );
173194 for (ActivityManager .RunningServiceInfo service : activityManager .getRunningServices (Integer .MAX_VALUE )) {
174195 if (LegacyDfuService .class .getName ().equals (service .service .getClassName ()) ||
175- DfuService .class .getName ().equals (service .service .getClassName ()) ||
176- PartialFlashingService .class .getName ().equals (service .service .getClassName ())) {
196+ DfuService .class .getName ().equals (service .service .getClassName ())) {
177197 Utils .log (Log .ERROR , TAG , service .service .getClassName () + " is already running." );
178198 return true ;
179199 }
@@ -224,8 +244,25 @@ private void initFlashing(){
224244 return ;
225245 }
226246
247+ // Initialize the handler and timeout runnable
248+ handler = new Handler (Looper .getMainLooper ());
249+ timeoutRunnable = new Runnable () {
250+ @ Override
251+ public void run () {
252+ if (currentVersion == MINI_V1 ) {
253+ ApplicationStateHandler .updateNotification (Notification .WARNING , getString (R .string .flashing_timeout_v1 ));
254+ } else {
255+ ApplicationStateHandler .updateNotification (Notification .WARNING , getString (R .string .flashing_timeout_v2 ));
256+ }
257+ }
258+ };
259+
260+ // Start the 10 second timeout countdown
261+ handler .postDelayed (timeoutRunnable , CONNECTION_TIMEOUT );
262+
263+
227264 if (Settings .isPartialFlashingEnable (this )) {
228- startPartialFlashing ();
265+ // TODO: Implement partial flashing
229266 } else {
230267 if (currentVersion == MINI_V1 ) {
231268 startDfuControlService ();
@@ -235,56 +272,8 @@ private void initFlashing(){
235272 }
236273 }
237274
238- private void startPartialFlashing () {
239- Utils .log (TAG , "Starting PartialFlashing Service..." );
240-
241- Intent service = new Intent (this , Test .class );
242- service .putExtra ("deviceAddress" , currentAddress );
243- service .putExtra ("filePath" , currentPath ); // a path or URI must be provided.
244- service .putExtra ("hardwareType" , currentVersion );
245- startService (service );
246- }
247-
248- private final ServiceConnection connection = new ServiceConnection () {
249- @ Override
250- public void onServiceConnected (ComponentName className , IBinder service ) {
251- Test .LocalBinder binder = (Test .LocalBinder ) service ;
252- testService = binder .getService ();
253- isBound = true ;
254-
255- testService .getProgressData ().observeForever (progress -> {
256- Utils .log (Log .ASSERT , TAG , "Progress: " + progress );
257- });
258-
259- testService .getServiceState ().observeForever (state -> {
260- Utils .log (Log .ASSERT , TAG , "State: " + state );
261- });
262- }
263-
264- @ Override
265- public void onServiceDisconnected (ComponentName arg0 ) {
266- isBound = false ;
267- }
268- };
269-
270- public void bindToTestService () {
271- Intent intent = new Intent (this , Test .class );
272- bindService (intent , connection , Context .BIND_AUTO_CREATE );
273- }
274-
275- public void unbindFromTestService () {
276- if (isBound ) {
277- unbindService (connection );
278- isBound = false ;
279- }
280- }
281-
282275 private void startDfuControlService () {
283276 Utils .log (TAG , "Starting DfuControl Service..." );
284-
285- // Intent service = new Intent(this, DfuControlService.class);
286- // service.putExtra(StaticExtras.CURRENT_DEVICE_ADDRESS, currentAddress);
287- // startService(service);
288277 Intent service = new Intent (this , LegacyDfuService .class );
289278 service .putExtra (Constants .CURRENT_DEVICE_ADDRESS , currentAddress );
290279 startService (service );
0 commit comments