solve bug 0000355

domjos1994 · Oct 10, 2019 · d189f24 · d189f24
1 parent 8d5678c
commit d189f24
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 29 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,7 +72,6 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // google services
-    implementation 'com.google.android.gms:play-services-ads:18.2.0'
     implementation 'com.google.android.material:material:1.0.0'
 
     // external libraries

diff --git a/app/src/main/java/de/domjos/unitrackermobile/activities/MainActivity.java b/app/src/main/java/de/domjos/unitrackermobile/activities/MainActivity.java
@@ -63,7 +63,6 @@
 import de.domjos.unitrackermobile.R;
 import de.domjos.unitrackermobile.custom.AbstractActivity;
 import de.domjos.unitrackermobile.custom.SwipeRefreshDeleteList;
-import de.domjos.unitrackermobile.helper.AdHelper;
 import de.domjos.unitrackermobile.helper.ArrayHelper;
 import de.domjos.unitrackermobile.helper.Helper;
 import de.domjos.unitrackermobile.settings.Globals;
@@ -333,7 +332,6 @@ protected void initControls() {
 
             this.rowNoConnection = this.findViewById(R.id.rowNoConnection);
             this.settings = MainActivity.GLOBALS.getSettings(this.getApplicationContext());
-            MainActivity.GLOBALS.setAdHelper(new AdHelper(this.settings, this));
             this.firstLogIn = this.settings.isFirstLogin(false);
 
             Helper.showPasswordDialog(MainActivity.this, this.firstLogIn, false, this::executeOnSuccess);

diff --git a/app/src/main/java/de/domjos/unitrackermobile/activities/ProjectActivity.java b/app/src/main/java/de/domjos/unitrackermobile/activities/ProjectActivity.java
@@ -78,7 +78,6 @@ public ProjectActivity() {
 
     @Override
     protected void initActions() {
-        MainActivity.GLOBALS.getAdHelper().show();
 
         this.lvProjects.click(new SwipeRefreshDeleteList.ClickListener() {
             @Override

diff --git a/app/src/main/java/de/domjos/unitrackermobile/settings/Globals.java b/app/src/main/java/de/domjos/unitrackermobile/settings/Globals.java
@@ -20,18 +20,15 @@
 
 import android.content.Context;
 
-import de.domjos.unitrackermobile.helper.AdHelper;
 import de.domjos.unitrackermobile.helper.SQLiteGeneral;
 
 public class Globals {
     private SQLiteGeneral sqLiteGeneral;
     private String password;
-    private AdHelper adHelper;
 
     public Globals() {
         this.sqLiteGeneral = null;
         this.password = "";
-        this.adHelper = null;
     }
 
     public SQLiteGeneral getSqLiteGeneral() {
@@ -53,12 +50,4 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
-
-    public void setAdHelper(AdHelper adHelper) {
-        this.adHelper = adHelper;
-    }
-
-    public AdHelper getAdHelper() {
-        return this.adHelper;
-    }
 }
diff --git a/app/src/main/java/de/domjos/unitrackermobile/settings/Settings.java b/app/src/main/java/de/domjos/unitrackermobile/settings/Settings.java
@@ -133,10 +133,6 @@ public boolean showNotifications() {
         return this.userPreferences.getBoolean("swtNotifications", false);
     }
 
-    public boolean showAds() {
-        return this.userPreferences.getBoolean("swtDisableAds", false);
-    }
-
     public boolean isEncryptionEnabled() {
         return this.userPreferences.getBoolean("swtSecurityEnable", true);
     }

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -154,8 +154,6 @@
     <string name="settings_general_list_scroll_summary">Soll ein, für die Breite des Bildschirmes zu langes Listen-Element gescrollt werden?</string>
     <string name="settings_general_tutorial_title">Tutorial erneut anzeigen!</string>
     <string name="settings_general_tutorial_summary">Wollen Sie das Tutorial erneut anzeigen lassen?</string>
-    <string name="settings_general_ads_enabled_title">Deaktiviere die Werbung</string>
-    <string name="settings_general_ads_enabled_summary">Die Werbung deaktivieren</string>
     <string name="settings_bug_tracker">Bug-Tracker</string>
     <string name="settings_bug_tracker_summary">Ändern Sie hier die Bug-Tracker spezifischen Einstellungen!</string>
     <string name="settings_bug_tracker_mantis">MantisBT</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -157,8 +157,6 @@
     <string name="settings_general_list_scroll_summary">Do you want to scroll a list item that is too long for the width of the screen?</string>
     <string name="settings_general_tutorial_title">Show tutorial again</string>
     <string name="settings_general_tutorial_summary">Would you like to show tutorial again?</string>
-    <string name="settings_general_ads_enabled_title">Disable Ads</string>
-    <string name="settings_general_ads_enabled_summary">Disable the ads</string>
     <string name="settings_bug_tracker">Bug-Tracker</string>
     <string name="settings_bug_tracker_summary">Change the bug tracker specific settings here!</string>
     <string name="settings_bug_tracker_mantis">MantisBT</string>

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
@@ -31,12 +31,6 @@
         android:title="@string/settings_general_numberOfItems"
         android:summary="@string/settings_general_numberOfItems_summary" />
 
-    <SwitchPreference
-        android:key="swtDisableAds"
-        android:defaultValue="false"
-        android:title="@string/settings_general_ads_enabled_title"
-        android:summary="@string/settings_general_ads_enabled_summary" />
-
     <EditTextPreference
         android:key="txtFormatDate"
         android:inputType="text"