MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-16 12:26:47 +01:00
Code Releases Wiki Activity

Fix crash when finding phone and configuring QHybrid buttons

Browse Source
This commit is contained in:
José Rebelo 2024-07-11 17:56:43 +01:00
parent 2e7b7b3287
commit 9f2d525c0d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java
View File

@ -33,6 +33,7 @@ import android.os.Vibrator;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -92,9 +93,9 @@ public class FindPhoneActivity extends AbstractGBActivity {
filter.addAction(ACTION_VIBRATE); filter.addAction(ACTION_VIBRATE);
filter.addAction(ACTION_RING); filter.addAction(ACTION_RING);
LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter); LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
registerReceiver(mReceiver, filter); // for ACTION_FOUND ContextCompat.registerReceiver(this, mReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED); // for ACTION_FOUND
Button foundButton = (Button) findViewById(R.id.foundbutton); Button foundButton = findViewById(R.id.foundbutton);
foundButton.setOnClickListener(new View.OnClickListener() { foundButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -111,10 +112,10 @@ public class FindPhoneActivity extends AbstractGBActivity {
GBApplication.deviceService().onFindPhone(true); GBApplication.deviceService().onFindPhone(true);
} }
private void vibrate(){ private void vibrate() {
mVibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE); mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
long[] vibrationPattern = new long[]{ 1000, 1000 }; long[] vibrationPattern = new long[]{1000, 1000};
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
VibrationEffect vibrationEffect = VibrationEffect.createWaveform(vibrationPattern, 0); VibrationEffect vibrationEffect = VibrationEffect.createWaveform(vibrationPattern, 0);
@ -126,7 +127,7 @@ public class FindPhoneActivity extends AbstractGBActivity {
} }
private void playRingtone() { private void playRingtone() {
mAudioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
if (mAudioManager != null) { if (mAudioManager != null) {
userVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM); userVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM);
} }
@ -153,7 +154,7 @@ public class FindPhoneActivity extends AbstractGBActivity {
/** /**
* Attempt to play the configured ringtone. This fails to get the default ringtone on some ROMs * Attempt to play the configured ringtone. This fails to get the default ringtone on some ROMs
* (https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2697) * (<a href="https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2697">#2697</a>)
* *
* @return whether playing the configured ringtone was successful or not. * @return whether playing the configured ringtone was successful or not.
*/ */

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConfigActivity.java
View File

@ -57,6 +57,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@ -530,7 +531,7 @@ public class QHybridConfigActivity extends AbstractGBActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
refreshList(); refreshList();
registerReceiver(buttonReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_BUTTON_PRESS)); ContextCompat.registerReceiver(this, buttonReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_BUTTON_PRESS), ContextCompat.RECEIVER_NOT_EXPORTED);
LocalBroadcastManager.getInstance(this).registerReceiver(settingsReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_SETTINGS_UPDATED)); LocalBroadcastManager.getInstance(this).registerReceiver(settingsReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_SETTINGS_UPDATED));
LocalBroadcastManager.getInstance(this).registerReceiver(fileReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_FILE_UPLOADED)); LocalBroadcastManager.getInstance(this).registerReceiver(fileReceiver, new IntentFilter(QHybridSupport.QHYBRID_EVENT_FILE_UPLOADED));
} }