ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2024-07-12 00:14:09 +02:00
Code Issues Projects Releases Wiki Activity

Use StandardCharsets

Browse Source
This commit is contained in:
TacoTheDank 2020-08-31 19:20:37 -04:00
parent 3c3e2eda8b
commit ed0ace49a3
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java
View File

@ -25,8 +25,8 @@ import org.microg.safeparcel.SafeParceled;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
public class LogEventParcelable extends AutoSafeParcelable { public class LogEventParcelable extends AutoSafeParcelable {
@ -92,7 +92,7 @@ public class LogEventParcelable extends AutoSafeParcelable {
private String getBytesAsString() { private String getBytesAsString() {
if (bytes == null) return "null"; if (bytes == null) return "null";
try { try {
CharsetDecoder d = Charset.forName("US-ASCII").newDecoder(); CharsetDecoder d = StandardCharsets.US_ASCII.newDecoder();
CharBuffer r = d.decode(ByteBuffer.wrap(bytes)); CharBuffer r = d.decode(ByteBuffer.wrap(bytes));
return r.toString(); return r.toString();
} catch (Exception e) { } catch (Exception e) {

30
play-services-core/src/main/java/org/microg/gms/cast/CastMediaRouteProvider.java
View File

@ -19,12 +19,9 @@ package org.microg.gms.cast;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.net.Uri;
import android.net.nsd.NsdManager; import android.net.nsd.NsdManager;
import android.net.nsd.NsdServiceInfo; import android.net.nsd.NsdServiceInfo;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.AsyncTask;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
@ -35,22 +32,15 @@ import androidx.mediarouter.media.MediaRouteProvider;
import androidx.mediarouter.media.MediaRouteProviderDescriptor; import androidx.mediarouter.media.MediaRouteProviderDescriptor;
import androidx.mediarouter.media.MediaRouter; import androidx.mediarouter.media.MediaRouter;
import com.google.android.gms.common.images.WebImage;
import com.google.android.gms.cast.CastDevice; import com.google.android.gms.cast.CastDevice;
import com.google.android.gms.cast.CastMediaControlIntent; import com.google.android.gms.cast.CastMediaControlIntent;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets;
import java.net.Inet4Address;
import java.net.UnknownHostException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.Thread;
import java.lang.Runnable;
import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class CastMediaRouteProvider extends MediaRouteProvider { public class CastMediaRouteProvider extends MediaRouteProvider {
private static final String TAG = CastMediaRouteProvider.class.getSimpleName(); private static final String TAG = CastMediaRouteProvider.class.getSimpleName();
@ -215,15 +205,15 @@ public class CastMediaRouteProvider extends MediaRouteProvider {
return; return;
} }
try { try {
String id = new String(attributes.get("id"), "UTF-8"); String id = new String(attributes.get("id"), StandardCharsets.UTF_8);
String deviceVersion = new String(attributes.get("ve"), "UTF-8"); String deviceVersion = new String(attributes.get("ve"), StandardCharsets.UTF_8);
String friendlyName = new String(attributes.get("fn"), "UTF-8"); String friendlyName = new String(attributes.get("fn"), StandardCharsets.UTF_8);
String modelName = new String(attributes.get("md"), "UTF-8"); String modelName = new String(attributes.get("md"), StandardCharsets.UTF_8);
String iconPath = new String(attributes.get("ic"), "UTF-8"); String iconPath = new String(attributes.get("ic"), StandardCharsets.UTF_8);
int status = Integer.parseInt(new String(attributes.get("st"), "UTF-8")); int status = Integer.parseInt(new String(attributes.get("st"), StandardCharsets.UTF_8));
onChromeCastDiscovered(id, name, host, port, deviceVersion, friendlyName, modelName, iconPath, status); onChromeCastDiscovered(id, name, host, port, deviceVersion, friendlyName, modelName, iconPath, status);
} catch (UnsupportedEncodingException | NullPointerException ex) { } catch (NullPointerException ex) {
Log.e(TAG, "Error getting cast details from DNS-SD response", ex); Log.e(TAG, "Error getting cast details from DNS-SD response", ex);
return; return;
} }