Skip to content

Commit

Permalink
RaMBLE Location display text localization
Browse files Browse the repository at this point in the history
  • Loading branch information
mh- committed Nov 3, 2020
1 parent 125dd59 commit 988b800
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
Marker marker = new Marker(holder.mMapView);
marker.setPosition(point);
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
marker.setTitle("Point of exposure");
marker.setTitle(this.mContext.getResources().getString(R.string.point_of_exposure));
holder.mMapView.setVisibility(View.VISIBLE);
holder.mMapView.setExpectedCenter(point);
holder.mMapView.getOverlays().add(marker);
Expand Down Expand Up @@ -358,13 +358,13 @@ public int compareTo(InterimDataPoint o) {
// First step: Create a "flat" sorted list from all scan records from all matchEntries
for (Matcher.MatchEntry matchEntry : list) { // process each matchEntry separately
for (ContactRecordsProtos.ScanRecord scanRecord : matchEntry.contactRecords.getRecordList()) {
byte[] aem = xorTwoByteArrays(scanRecord.getAem().toByteArray(), matchEntry.aemXorBytes);
@SuppressWarnings("deprecation") byte[] aem = xorTwoByteArrays(scanRecord.getAem().toByteArray(), matchEntry.aemXorBytes);
if ((aem[0] != 0x40) || (aem[2] != 0x00) || (aem[3] != 0x00)) {
Log.w(TAG, "WARNING: Invalid AEM: " + byteArrayToHexString(aem));
}
byte txPower = aem[1];
//Log.d(TAG, "TXPower: "+txPower+" dBm");
int rssi = scanRecord.getRssi();
@SuppressWarnings("deprecation") int rssi = scanRecord.getRssi();
//Log.d(TAG, "RSSI: "+rssi+" dBm");
int attenuation = txPower - rssi;
//Log.d(TAG, "Attenuation: "+attenuation+" dB");
Expand Down Expand Up @@ -646,6 +646,7 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
public final MapView mMapView;
public DkAndMatchEntries mDkAndMatchEntries;

@SuppressLint("ClickableViewAccessibility")
public ViewHolder(View view, boolean showMap, Context context) {
super(view);
mTextViewMainText = view.findViewById(R.id.textViewMainText);
Expand Down
1 change: 1 addition & 0 deletions corona-warn-companion/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@
<string name="country_ireland">🇮🇪 Irland</string>
<string name="country_italy">🇮🇹 Italien</string>
<string name="countries_one_europe">🇩🇪 Deutschland, 🇮🇪 Irland, 🇮🇹 Italien</string>
<string name="point_of_exposure">Risikobegegnung</string>
</resources>
1 change: 1 addition & 0 deletions corona-warn-companion/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,5 @@
<string name="countries_one_europe">🇩🇪 Germany, 🇮🇪 Ireland, 🇮🇹 Italy</string>
<string name="flags_one_europe" translatable="false">🇩🇪🇮🇪🇮🇹</string>
<string name="toast_download_error">Error during download: %s</string>
<string name="point_of_exposure">Point of exposure</string>
</resources>

0 comments on commit 988b800

Please sign in to comment.