Skip to content

Commit d1c35bb

Browse files
committed
Remove firebase and analytics
1 parent 8416617 commit d1c35bb

File tree

10 files changed

+5
-113
lines changed

10 files changed

+5
-113
lines changed

app/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.google.gms.google-services'
3-
apply plugin: 'io.fabric'
42

53
android {
64
compileSdkVersion 29
@@ -35,6 +33,8 @@ android {
3533
path "src/main/cpp/CMakeLists.txt"
3634
}
3735
}
36+
37+
ndkVersion "21.1.6352462"
3838
}
3939

4040
configurations {
@@ -47,8 +47,4 @@ dependencies {
4747
implementation 'com.google.android.material:material:1.0.0'
4848
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
4949
implementation 'org.mozilla:rhino:1.7.11'
50-
implementation 'com.google.firebase:firebase-core:17.2.1'
51-
implementation 'com.google.firebase:firebase-ads:18.3.0'
52-
implementation 'com.google.firebase:firebase-analytics:17.2.1'
53-
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
5450
}

app/google-services.json

Lines changed: 0 additions & 49 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@
1515
android:icon="@drawable/ic_launcher"
1616
android:label="@string/app_name">
1717

18-
<meta-data
19-
android:name="com.google.android.gms.ads.APPLICATION_ID"
20-
android:value="ca-app-pub-9097031975646651~9376680322" />
21-
22-
<activity
23-
android:name="com.google.android.gms.ads.AdActivity"
24-
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
25-
android:theme="@android:style/Theme.Translucent" />
26-
2718
<activity
2819
android:name="ProxyDroid"
2920
android:label="@string/app_name">

app/src/main/java/org/proxydroid/AppManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
137137
@Override
138138
protected void onCreate(Bundle savedInstanceState) {
139139
super.onCreate(savedInstanceState);
140-
141-
((ProxyDroidApplication)getApplication())
142-
.firebaseAnalytics.setCurrentScreen(this, "app_manager", null);
143140

144141
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
145142

app/src/main/java/org/proxydroid/FileChooser.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ private void fill(File f) {
5555
@Override
5656
public void onCreate(Bundle savedInstanceState) {
5757
super.onCreate(savedInstanceState);
58-
((ProxyDroidApplication)getApplication())
59-
.firebaseAnalytics.setCurrentScreen(this, "file_chooser", null);
6058
currentDir = new File(Utils.getDataPath(this));
6159
fill(currentDir);
6260
}

app/src/main/java/org/proxydroid/ProxyDroid.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
import android.widget.LinearLayout;
8080
import android.widget.Toast;
8181

82-
import com.google.android.gms.ads.AdRequest;
83-
import com.google.android.gms.ads.AdSize;
84-
import com.google.android.gms.ads.AdView;
85-
import com.google.android.gms.ads.MobileAds;
8682
import com.ksmaze.android.preference.ListPreferenceMultiSelect;
8783

8884
import org.proxydroid.utils.Constraints;
@@ -138,7 +134,6 @@ public void handleMessage(Message msg) {
138134
private CheckBoxPreference isBypassAppsCheck;
139135
private Preference proxyedApps;
140136
private Preference bypassAddrs;
141-
private AdView adView;
142137
private BroadcastReceiver ssidReceiver = new BroadcastReceiver() {
143138
@Override
144139
public void onReceive(Context context, Intent intent) {
@@ -315,28 +310,11 @@ public void onCreate(Bundle savedInstanceState) {
315310
super.onCreate(savedInstanceState);
316311
addPreferencesFromResource(R.xml.proxydroid_preference);
317312

318-
((ProxyDroidApplication)getApplication())
319-
.firebaseAnalytics.setCurrentScreen(this, "home_screen", null);
320-
321-
// Create the adView
322-
adView = new AdView(this);
323-
adView.setAdUnitId("ca-app-pub-9097031975646651/4806879927");
324-
adView.setAdSize(AdSize.SMART_BANNER);
325313
// Lookup your LinearLayout assuming it’s been given
326314
// the attribute android:id="@+id/mainLayout"
327315
ViewParent parent = getListView().getParent();
328316
LinearLayout layout = getLayout(parent);
329317

330-
// disable adds
331-
if (layout != null) {
332-
// Add the adView to it
333-
layout.addView(adView, 0);
334-
adView.loadAd(new AdRequest.Builder()
335-
.addTestDevice("F58907F28184A828DD0DB6F8E38189C6")
336-
.addTestDevice("236666026C17FEFB1B547C4A3B2322CD")
337-
.build());
338-
}
339-
340318
hostText = (EditTextPreference) findPreference("host");
341319
portText = (EditTextPreference) findPreference("port");
342320
userText = (EditTextPreference) findPreference("user");
@@ -430,8 +408,6 @@ public void run() {
430408
@Override
431409
public void onDestroy() {
432410

433-
if (adView != null) adView.destroy();
434-
435411
if (ssidReceiver != null) unregisterReceiver(ssidReceiver);
436412

437413
super.onDestroy();

app/src/main/java/org/proxydroid/ProxyDroidApplication.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,10 @@
4040

4141
import android.app.Application;
4242

43-
import com.google.firebase.analytics.FirebaseAnalytics;
44-
4543
public class ProxyDroidApplication extends Application {
4644

47-
public FirebaseAnalytics firebaseAnalytics;
48-
4945
@Override
5046
public void onCreate() {
51-
// Obtain the FirebaseAnalytics instance.
52-
firebaseAnalytics = FirebaseAnalytics.getInstance(this);
5347
super.onCreate();
5448
}
5549
}

app/src/main/java/org/proxydroid/ProxyDroidService.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,6 @@ public void onCreate() {
366366
@Override
367367
public void onDestroy() {
368368

369-
((ProxyDroidApplication)getApplication())
370-
.firebaseAnalytics.logEvent("service_stop", null);
371-
372369
Utils.setConnecting(true);
373370

374371
notificationManager.cancelAll();
@@ -552,9 +549,6 @@ public void onStart(Intent intent, int startId) {
552549
return;
553550
}
554551

555-
((ProxyDroidApplication)getApplication())
556-
.firebaseAnalytics.logEvent("service_start", null);
557-
558552
Log.d(TAG, "Service Start");
559553

560554
Bundle bundle = intent.getExtras();

build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@ buildscript {
44
repositories {
55
google()
66
jcenter()
7-
maven {
8-
url 'https://maven.fabric.io/public'
9-
}
107

118
}
129
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.5.3'
14-
classpath 'com.google.gms:google-services:4.2.0'
15-
classpath 'io.fabric.tools:gradle:1.31.2'
10+
classpath 'com.android.tools.build:gradle:3.6.3'
1611

1712
// NOTE: Do not place your application dependencies here; they belong
1813
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Dec 25 09:17:58 CST 2019
1+
#Sat May 23 18:58:28 ICT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)