Skip to content

Commit 7f3820e

Browse files
committed
feat: handle deprecations and other compiler warnings
1 parent 4d4c412 commit 7f3820e

File tree

7 files changed

+30
-6
lines changed

7 files changed

+30
-6
lines changed

Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,6 +2593,7 @@ private void readAttributionI(Context context) {
25932593
}
25942594
}
25952595

2596+
@SuppressWarnings("unchecked")
25962597
private void readSessionCallbackParametersI(Context context) {
25972598
try {
25982599
sessionParameters.callbackParameters = Util.readObject(context,
@@ -2605,6 +2606,7 @@ private void readSessionCallbackParametersI(Context context) {
26052606
}
26062607
}
26072608

2609+
@SuppressWarnings("unchecked")
26082610
private void readSessionPartnerParametersI(Context context) {
26092611
try {
26102612
sessionParameters.partnerParameters = Util.readObject(context,

Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityPackage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
public class ActivityPackage implements Serializable {
2424
private static final long serialVersionUID = -35935556512024097L;
2525

26+
@SuppressWarnings("unchecked")
2627
private static final ObjectStreamField[] serialPersistentFields = {
2728
new ObjectStreamField("path", String.class),
2829
new ObjectStreamField("clientSdk", String.class),

Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityState.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class ActivityState implements Serializable, Cloneable {
2222
private static final long serialVersionUID = 9039439291143138148L;
2323
private static final int ORDER_ID_MAXCOUNT = 10;
2424
private transient ILogger logger;
25+
@SuppressWarnings("unchecked")
2526
private static final ObjectStreamField[] serialPersistentFields = {
2627
new ObjectStreamField("uuid", String.class),
2728
new ObjectStreamField("enabled", boolean.class),

Adjust/sdk-core/src/main/java/com/adjust/sdk/DeviceInfo.java

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import android.content.pm.PackageInfo;
77
import android.content.pm.PackageManager;
88
import android.content.pm.Signature;
9+
import android.content.pm.SigningInfo;
910
import android.content.res.Configuration;
1011
import android.content.res.Resources;
1112
import android.database.Cursor;
1213
import android.net.ConnectivityManager;
1314
import android.net.Network;
1415
import android.net.NetworkCapabilities;
15-
import android.net.NetworkInfo;
1616
import android.net.Uri;
1717
import android.os.Build;
1818
import android.provider.Settings;
@@ -408,12 +408,24 @@ private String getClientSdk(String sdkPrefix) {
408408
}
409409
}
410410

411+
@SuppressWarnings("deprecation")
411412
private String getFacebookAttributionId(final Context context) {
412413
try {
413414
@SuppressLint("PackageManagerGetSignatures")
414-
Signature[] signatures = context.getPackageManager().getPackageInfo(
415-
"com.facebook.katana",
416-
PackageManager.GET_SIGNATURES).signatures;
415+
Signature[] signatures = null;
416+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
417+
SigningInfo signingInfo = context.getPackageManager().getPackageInfo(
418+
"com.facebook.katana",
419+
PackageManager.GET_SIGNING_CERTIFICATES).signingInfo;
420+
if (signingInfo != null) {
421+
signatures = signingInfo.getApkContentsSigners();
422+
}
423+
} else {
424+
signatures = context.getPackageManager().getPackageInfo(
425+
"com.facebook.katana",
426+
PackageManager.GET_SIGNATURES).signatures;
427+
}
428+
417429
if (signatures == null || signatures.length != 1) {
418430
// Unable to find the correct signatures for this APK
419431
return null;
@@ -528,6 +540,7 @@ private static Boolean getFireTrackingEnabled(final ContentResolver contentResol
528540
}
529541
return null;
530542
}
543+
@SuppressWarnings("deprecation")
531544
private static int getConnectivityType(final Context context, final ILogger logger) {
532545
try {
533546
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -538,7 +551,7 @@ private static int getConnectivityType(final Context context, final ILogger logg
538551

539552
// for api 22 or lower, still need to get raw type
540553
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
541-
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
554+
android.net.NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
542555
return activeNetwork.getType();
543556
}
544557

Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ private void flushI() {
321321
writePackageQueueI();
322322
}
323323

324+
@SuppressWarnings("unchecked")
324325
private void readPackageQueueI() {
325326
try {
326327
packageQueue = Util.readObject(context,

Adjust/sdk-core/src/main/java/com/adjust/sdk/Reflection.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public static Object getAdvertisingInfoObject(Context context) throws Exception
1313
return invokeStaticMethod("com.google.android.gms.ads.identifier.AdvertisingIdClient", "getAdvertisingIdInfo", new Class[]{Context.class}, context);
1414
}
1515

16+
@SuppressWarnings("unchecked")
1617
static Map<String, String> getImeiParameters(Context context, ILogger logger) {
1718
Object nonPlayParameters = null;
1819
try {
@@ -26,6 +27,7 @@ static Map<String, String> getImeiParameters(Context context, ILogger logger) {
2627
return null;
2728
}
2829

30+
@SuppressWarnings("unchecked")
2931
static Map<String, String> getOaidParameters(Context context, ILogger logger) {
3032
Object oaidParameters = null;
3133
try {
@@ -140,9 +142,10 @@ public static Object createDefaultInstance(String className) {
140142
return instance;
141143
}
142144

145+
@SuppressWarnings("unchecked")
143146
public static Object createDefaultInstance(Class classObject) {
144147
try {
145-
Object instance = classObject.newInstance();
148+
Object instance = classObject.getDeclaredConstructor().newInstance();
146149
return instance;
147150
} catch (Throwable t) {
148151
return null;

Adjust/sdk-core/src/main/java/com/adjust/sdk/Util.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ public static String readStringField(ObjectInputStream.GetField fields, String n
283283
return readObjectField(fields, name, defaultValue);
284284
}
285285

286+
@SuppressWarnings("unchecked")
286287
public static <T> T readObjectField(ObjectInputStream.GetField fields, String name, T defaultValue) {
287288
try {
288289
return (T) fields.get(name, defaultValue);
@@ -425,6 +426,7 @@ public static String[] getSupportedAbis() {
425426
return null;
426427
}
427428

429+
@SuppressWarnings("deprecation")
428430
public static String getCpuAbi() {
429431
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
430432
return Build.CPU_ABI;
@@ -510,6 +512,7 @@ public static Map<String, String> mergeParameters(Map<String, String> target,
510512
return mergedParameters;
511513
}
512514

515+
@SuppressWarnings("deprecation")
513516
public static Locale getLocale(Configuration configuration) {
514517
// Configuration.getLocales() added as of API 24.
515518
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

0 commit comments

Comments
 (0)