From e01b249b93d80455e0f30160fd45724595b8de7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= <dennis.thiessen@riskahead.de>
Date: Fri, 27 Nov 2015 15:50:28 +0100
Subject: [PATCH] =?UTF-8?q?DT=20@27.11.2015:=20Ad-Werbung=20wird=20jetzt?=
 =?UTF-8?q?=20nur=20beim=20Verlassen=20der=20Map,=20beim=20Hinzuf=C3=BCgen?=
 =?UTF-8?q?=20eines=20Reports=20und=20nach=20einem=20Vote=20angezeigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.iml                                   |  1 +
 app/src/main/AndroidManifest.xml              |  1 +
 .../org/deke/risk/riskahead/MapsActivity.java |  6 +++
 .../deke/risk/riskahead/ReportActivity.java   |  1 +
 .../risk/riskahead/ViewReportActivity.java    |  1 +
 .../risk/riskahead/helper/BaseActivity.java   | 37 +++----------------
 6 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 4dbcd7c..6d8405c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -102,6 +102,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd746cf..c9f2f16 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
     <uses-permission android:name="org.deke.risk.riskahead.permission.MAPS_RECEIVE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
         android:name=".helper.AppController"
diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
index b2ad7e7..abc998a 100644
--- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
@@ -355,4 +355,10 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
     public void onClusterItemInfoWindowClick(AppClusterItem appClusterItem) {
         gotoViewReportActivity(appClusterItem.getID());
     }
+
+    @Override
+    protected void onPause(){
+        super.onPause();
+        showAd();
+    }
 }
diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java
index 8cfd7d8..395e76e 100644
--- a/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/ReportActivity.java
@@ -313,6 +313,7 @@ public class ReportActivity extends BaseActivity {
                                 gotoMapActivity();
                             }
                         });
+                        showAd();
                         gotoMapActivity(latitude+":"+longitude);
                     } else {
                         String errorMsg = jObj.getString("error_msg");
diff --git a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
index d7c85bb..f016807 100644
--- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
@@ -357,6 +357,7 @@ public class ViewReportActivity extends BaseActivity {
                         showMessage("Voted! Score updated.");
                         BootstrapLabel scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
                         scorelabel.setText(jObj.getString("points"));
+                        showAd();
 
                     } else {
                         String errorMsg = jObj.getString("error_msg");
diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
index c78cf1e..5d32cc7 100644
--- a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
@@ -67,6 +67,8 @@ public abstract class BaseActivity extends AppCompatActivity {
         isNetworkAvailable();
     }
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -84,8 +86,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         requestNewInterstitial();
 
-
-
         overridePendingTransition(R.anim.fade_in_anim, R.anim.fade_out_anim);
 
         pDialog = new ProgressDialog(this);
@@ -125,37 +125,10 @@ public abstract class BaseActivity extends AppCompatActivity {
         mInterstitialAd.loadAd(adRequest);
     }
 
-    @Override
-    protected void onPause(){
-        super.onPause();
-        stopRepeatingTask();
-    }
-
-    @Override
-    protected void onResume(){
-        super.onResume();
-        startRepeatingTask();
-    }
-
-    Runnable mHandlerTask = new Runnable()
-    {
-        @Override
-        public void run() {
-            if (mInterstitialAd.isLoaded()) {
-                mInterstitialAd.show();
-            }
-            mHandler.postDelayed(mHandlerTask, INTERVAL);
+    public void showAd(){
+        if (mInterstitialAd.isLoaded()) {
+            mInterstitialAd.show();
         }
-    };
-
-    void startRepeatingTask()
-    {
-        mHandlerTask.run();
-    }
-
-    void stopRepeatingTask()
-    {
-        mHandler.removeCallbacks(mHandlerTask);
     }
 
     public void isNetworkAvailable() {