MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

huawei: Remove unnecessary RuntimeException throws 

* move ui message to translatable string resource
This commit is contained in:
Vitaliy Tomin 2024-04-22 11:38:11 +08:00
parent 57f5658739
commit cb82d0c245
4 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiInstallHandler.java
View File

@ -76,8 +76,8 @@ public class HuaweiInstallHandler implements InstallHandler {
if (!this.valid) {
LOG.error("Watchface cannot be installed");
installActivity.setInfoText("Watchface resolution doesnt match device screen. Watchface is "
+ resolution.screenByThemeVersion(description.screen) + " device screen is " + deviceScreen);
installActivity.setInfoText(context.getString(R.string.watchface_resolution_doesnt_match,
resolution.screenByThemeVersion(description.screen), deviceScreen));
installActivity.setInstallEnabled(false);
return;
}

73
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Watchface.java
View File

@ -33,19 +33,15 @@ public class Watchface {
// bit 7 - kaleidoskop
public byte expandedtype = 0;
public InstalledWatchfaceInfo(HuaweiTLV tlv) {
try {
if(tlv.contains(0x03))
this.fileName = tlv.getString(0x03);
if(tlv.contains(0x04))
this.version = tlv.getString(0x04);
if(tlv.contains(0x05))
this.type = tlv.getByte(0x05);
if(tlv.contains(0x07))
this.expandedtype = tlv.getByte(0x07);
} catch (HuaweiPacket.MissingTagException e) {
throw new RuntimeException(e);
}
public InstalledWatchfaceInfo(HuaweiTLV tlv) throws HuaweiPacket.MissingTagException {
if(tlv.contains(0x03))
this.fileName = tlv.getString(0x03);
if(tlv.contains(0x04))
this.version = tlv.getString(0x04);
if(tlv.contains(0x05))
this.type = tlv.getByte(0x05);
if(tlv.contains(0x07))
this.expandedtype = tlv.getByte(0x07);
}
public boolean isCurrent() {
@ -113,22 +109,18 @@ public class Watchface {
@Override
public void parseTlv() throws ParseException {
try {
if(this.tlv.contains(0x01))
this.params.maxVersion = this.tlv.getString(0x01);
if(this.tlv.contains(0x02))
this.params.width = this.tlv.getShort(0x02);
if(this.tlv.contains(0x03))
this.params.height = this.tlv.getShort(0x03);
if(this.tlv.contains(0x04))
this.params.supportFileType = this.tlv.getByte(0x04);
if(this.tlv.contains(0x05))
this.params.sort = this.tlv.getByte(0x05);
if(this.tlv.contains(0x06))
this.params.otherWatchfaceVersions = this.tlv.getString(0x06);
} catch (MissingTagException e) {
throw new RuntimeException(e);
}
if(this.tlv.contains(0x01))
this.params.maxVersion = this.tlv.getString(0x01);
if(this.tlv.contains(0x02))
this.params.width = this.tlv.getShort(0x02);
if(this.tlv.contains(0x03))
this.params.height = this.tlv.getShort(0x03);
if(this.tlv.contains(0x04))
this.params.supportFileType = this.tlv.getByte(0x04);
if(this.tlv.contains(0x05))
this.params.sort = this.tlv.getByte(0x05);
if(this.tlv.contains(0x06))
this.params.otherWatchfaceVersions = this.tlv.getString(0x06);
}
}
@ -159,15 +151,10 @@ public class Watchface {
@Override
public void parseTlv() throws HuaweiPacket.ParseException {
watchfaceInfoList = new ArrayList<>();
try {
if(this.tlv.contains(0x81)) {
for (HuaweiTLV subTlv : this.tlv.getObject(0x81).getObjects(0x82)) {
watchfaceInfoList.add(new Watchface.InstalledWatchfaceInfo(subTlv));
}
if(this.tlv.contains(0x81)) {
for (HuaweiTLV subTlv : this.tlv.getObject(0x81).getObjects(0x82)) {
watchfaceInfoList.add(new Watchface.InstalledWatchfaceInfo(subTlv));
}
} catch (HuaweiPacket.MissingTagException e) {
throw new RuntimeException(e);
}
}
@ -269,16 +256,10 @@ public class Watchface {
@Override
public void parseTlv() throws HuaweiPacket.ParseException {
try {
if(this.tlv.contains(0x82)) {
for (HuaweiTLV subTlv : this.tlv.getObject(0x82).getObjects(0x83)) {
watchFaceNames.put(subTlv.getString(0x04), subTlv.getString(0x05));
}
if(this.tlv.contains(0x82)) {
for (HuaweiTLV subTlv : this.tlv.getObject(0x82).getObjects(0x83)) {
watchFaceNames.put(subTlv.getString(0x04), subTlv.getString(0x05));
}
} catch (HuaweiPacket.MissingTagException e) {
throw new RuntimeException(e);
}
}

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWatchfaceManager.java
View File

@ -200,7 +200,7 @@ public class HuaweiWatchfaceManager
getWatchfacesNames.setFinalizeReq(finalizeReq);
getWatchfacesNames.doPerform();
} catch (IOException e) {
throw new RuntimeException(e);
LOG.error("Could not get watchface names", e);
}
}
@ -249,7 +249,7 @@ public class HuaweiWatchfaceManager
sendWatchfaceOperation.setFinalizeReq(finalizeReq);
sendWatchfaceOperation.doPerform();
} catch (IOException e) {
throw new RuntimeException(e);
LOG.error("Could not set watchface ", getFullFileName(uuid), e );
}
@ -275,7 +275,7 @@ public class HuaweiWatchfaceManager
sendWatchfaceOperation.setFinalizeReq(finalizeReq);
sendWatchfaceOperation.doPerform();
} catch (IOException e) {
throw new RuntimeException(e);
LOG.error("Could not delete watchface", getFullFileName(uuid), e);
}
}

1
app/src/main/res/values/strings.xml
View File

@ -2815,4 +2815,5 @@
<string name="pref_sleepasandroid_feat_spo2">SPO2</string>
<string name="pref_title_huawei_account">Huawei Account</string>
<string name="pref_summary_huawei_account">Huawei account used in pairing process. Setting it allows to pair without factory reset.</string>
<string name="watchface_resolution_doesnt_match">Watchface resolution doesnt match device screen. Watchface is %1$s device screen is %2$s</string>
</resources>