Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(android): remove aps-analytics.jar and titanium-verify.jar #14147

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore(android): remove aps-analytics.jar and titanium-verify.jar #14147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b83418
chore(android): remove aps-analytics.jar
m1ga Nov 24, 2024
4b49715
remove titanium-verify.jar
m1ga Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions android/modules/analytics/src/java/ti/modules/titanium/analytics/AnalyticsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/
package ti.modules.titanium.analytics;

import com.appcelerator.aps.APSAnalytics;

import org.appcelerator.titanium.util.APSAnalytics;
import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.annotations.Kroll;
Expand Down
2 changes: 1 addition & 1 deletion android/modules/app/src/java/ti/modules/titanium/app/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;

import com.appcelerator.aps.APSAnalytics;
import org.appcelerator.titanium.util.APSAnalytics;

@Kroll.module
public class AppModule extends KrollModule implements SensorEventListener
Expand Down
2 changes: 1 addition & 1 deletion android/modules/geolocation/src/java/ti/modules/titanium/geolocation/TiLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import android.location.Location;
import android.location.LocationManager;

import com.appcelerator.aps.APSAnalytics;
import org.appcelerator.titanium.util.APSAnalytics;

public class TiLocation
{
Expand Down
4 changes: 2 additions & 2 deletions android/modules/platform/src/java/ti/modules/titanium/platform/PlatformModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
import android.os.ParcelFileDescriptor;
import android.os.SystemClock;

import com.appcelerator.aps.APSAnalytics;
import com.appcelerator.aps.APSAnalyticsMeta;
import org.appcelerator.titanium.util.APSAnalytics;
import org.appcelerator.titanium.util.APSAnalyticsMeta;

import java.io.BufferedReader;
import java.io.File;
Expand Down
Binary file removed android/titanium/lib/aps-analytics.jar
View file
Open in desktop
Binary file not shown.
Binary file removed android/titanium/lib/titanium-verify.jar
View file
Open in desktop
Binary file not shown.
9 changes: 2 additions & 7 deletions android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@

import androidx.annotation.NonNull;

import com.appcelerator.aps.APSAnalytics;
import com.appcelerator.aps.APSAnalyticsMeta;

import org.appcelerator.kroll.KrollApplication;
import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.KrollProxy;
Expand All @@ -36,6 +33,8 @@
import org.appcelerator.kroll.common.TiDeployData;
import org.appcelerator.kroll.common.TiMessenger;
import org.appcelerator.kroll.util.KrollAssetHelper;
import org.appcelerator.titanium.util.APSAnalytics;
import org.appcelerator.titanium.util.APSAnalyticsMeta;
import org.appcelerator.titanium.util.TiBlobLruCache;
import org.appcelerator.titanium.util.TiFileHelper;
import org.appcelerator.titanium.util.TiImageCache;
Expand Down Expand Up @@ -452,10 +451,6 @@ public void postAppInfo()
}

String buildType = this.appInfo.getBuildType();
if (buildType != null && !buildType.equals("")) {
APSAnalyticsMeta.setBuildType(buildType);
}

APSAnalyticsMeta.setAppId(this.appInfo.getId());
APSAnalyticsMeta.setAppName(this.appInfo.getName());
APSAnalyticsMeta.setAppVersion(this.appInfo.getVersion());
Expand Down
119 changes: 119 additions & 0 deletions android/titanium/src/java/org/appcelerator/titanium/util/APSAnalytics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package org.appcelerator.titanium.util;

import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.provider.Settings.Secure;
import android.util.Log;

import androidx.annotation.NonNull;

import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;

public final class APSAnalytics
{
private static final APSAnalytics INSTANCE = new APSAnalytics();
private static final Set<String> BAD_IDENTIFIERS =
new HashSet(Arrays.asList("9774d56d682e549c", "1234567890ABCDEF"));
private final AtomicReference<String> sessionId = new AtomicReference();
private SharedPreferences preferences;
private String app;
private String machineId;

private APSAnalytics()
{
}

public static APSAnalytics getInstance()
{
return INSTANCE;
}

public void initialize(@NonNull String app, @NonNull Context ctx)
{
Log.d("APSAnalytics", "Initialization started...");
synchronized (this)
{
try {
String packageName = ctx.getPackageName();
PackageManager packageManager = ctx.getPackageManager();
ApplicationInfo ai = packageManager.getApplicationInfo(packageName, 128);
PackageInfo pi = packageManager.getPackageInfo(packageName, 0);
if (ai != null && ai.metaData != null) {
String urlString = ai.metaData.getString("APSAnalyticsBaseURL");
if (urlString != null) {
APSAnalyticsMeta.setAnalyticsUrl(new URL(urlString));
}
}

if (pi != null && APSAnalyticsMeta.getAppVersion() == null) {
APSAnalyticsMeta.setAppVersion(pi.versionName);
}
} catch (PackageManager.NameNotFoundException | MalformedURLException var10) {
Exception e = var10;
Log.w("APSAnalytics", "Could not validate analytics URL:", e);
return;
}

this.app = app;
this.preferences = ctx.getSharedPreferences("titanium", 0);
if (this.machineId == null) {
this.setMachineId(ctx);
}

}
}

public boolean isInitialized()
{
return false;
}

public String getCurrentSessionId()
{
return this.sessionId.get();
}

public String getMachineId()
{
return this.machineId;
}

public void setMachineId(@NonNull Context ctx)
{
ContentResolver resolver = ctx.getContentResolver();
this.machineId = Secure.getString(resolver, "android_id");
if (this.machineId == null || BAD_IDENTIFIERS.contains(this.machineId)) {
this.machineId = UUID.randomUUID().toString();
}
}

public boolean isOptedOut()
{
return this.preferences.getBoolean("_APS_isOptedOut", false);
}

public void setOptedOut(boolean value)
{
this.preferences.edit().putBoolean("_APS_isOptedOut", value).apply();
}

public int getCacheSize()
{
return this.preferences.getInt("_APS_cacheSize", 28000);
}

public void setCacheSize(int value)
{
this.preferences.edit().putInt("_APS_cacheSize", value).apply();
}
}
Loading
Loading