Extra cleaning up.

Author: Emre Demir

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDCallback.java

@@ -35,7 +35,6 @@ public class GDad {
     private FrameLayout rootview;
     private RelativeLayout relativeLayoutContainer;
     private boolean bannerActive = false;
-    private String deviceID = null;
     private boolean isCordovaPlugin = false;
 
     public void init(Activity mContext) {
@@ -90,9 +89,6 @@ private void requestBanner(String size, String alignment, String position) {
         PublisherAdRequest.Builder builder = new PublisherAdRequest.Builder();
         builder.addNetworkExtrasBundle(AdMobAdapter.class, cust_params);
 
-        if (this.deviceID != null) {
-            builder.addTestDevice(this.deviceID);
-        }
         adRequest = builder.build();
         handleBannerParams(size, alignment, position);
 
@@ -177,9 +173,6 @@ private void requestInterstitial() {
         PublisherAdRequest.Builder builder = new PublisherAdRequest.Builder();
         builder.addNetworkExtrasBundle(AdMobAdapter.class, cust_params);
 
-        if (this.deviceID != null) {
-            builder.addTestDevice(this.deviceID);
-        }
         adRequest = builder.build();
 
         if (this.isCordovaPlugin) {
@@ -326,39 +319,6 @@ public void showBanner(String args) {
 
     }
 
-    public String getDeviceID() {
-        String android_id = Settings.Secure.getString(getmContext().getContentResolver(), Settings.Secure.ANDROID_ID);
-
-        if (android_id != null && android_id.length() > 0) {
-            return md5(android_id).toUpperCase();
-        } else {
-            return md5("emulator").toUpperCase();
-        }
-    }
-
-    public void setDeviceID(String deviceID) {
-        this.deviceID = deviceID;
-    }
-
-    public String md5(String s) {
-        try {
-            // Create MD5 Hash
-            MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
-            digest.update(s.getBytes());
-            byte messageDigest[] = digest.digest();
-
-            // Create Hex String
-            StringBuffer hexString = new StringBuffer();
-            for (int i = 0; i < messageDigest.length; i++)
-                hexString.append(Integer.toHexString(0xFF & messageDigest[i]));
-            return hexString.toString();
-
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
     public void destroyBanner() {
         if (publisherAdView != null && bannerActive) {
             publisherAdView.destroy();

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDad.java

@@ -21,7 +21,6 @@ class GDbanner {
     protected static void init() {
 
         if(GDstatic.enable) {
-
             GDHttpRequest.sendHttpRequest(GDlogger.mContext, GDstatic.GAME_API_URL, Request.Method.GET, null, new GDHttpCallback() {
                 @Override
                 public void onSuccess(JSONObject data) {
@@ -51,14 +50,11 @@ public void onError(VolleyError error) {
                     GDutils.log("Something went wrong fetching json game data.");
                 }
             });
-
-
         }
     }
 
     protected static void ShowBanner(String args) {
 
-
         Gson gson = new Gson();
         final GDshowObj gDshowObj;
         gDshowObj = gson.fromJson(args, GDshowObj.class);

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDbanner.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;
@@ -129,18 +130,6 @@ public static void setAdListener(GDadListener gDadListener) {
             gDad.setAdListener(gDadListener);
     }
 
-    public static void addTestDevice(String deviceID) {
-        if (gDad != null)
-            gDad.setDeviceID(deviceID);
-    }
-
-    public static String getTestDevice() {
-        if (gDad != null)
-            return gDad.getDeviceID();
-        else
-            return null;
-    }
-
     /**
      * GDlogger hides banner
      */
@@ -170,8 +159,4 @@ public static boolean checkPlayServices(Activity activity) {
 
     }
 
-    public static boolean isInternetAvailable() {
-        return GDutils.internetConnectionAvailable();
-    }
-
 }

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDlogger.java

@@ -2,16 +2,14 @@
 
 class GDstatic {
 
-    protected static final float apiVersion = (float) 1.0;
-    protected static final String version = "v1.0";
-    protected static final String PREFS_NAME = "GDPrefsFile";
     protected static final String GAME_API_URL = "https://game.api.gamedistribution.com/game/get";
+    protected static final String TUNNL_TAG_URL = "https://ana.tunnl.com"; // /at?id={{game-id}}&pageurl={{bundle-name}}
+    protected static final String version = "v1.0";
     protected static Boolean enable = false;
     protected static Boolean debug = false;
     protected static String serverId;
     protected static String regId;
     protected static String gameId;
-    protected static String sVersion = "v1";
     protected static boolean reqBannerEnabled = true;
     protected static boolean reqInterstitialEnabled = true;
     protected static String adUnit;

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDstatic.java

@@ -4,31 +4,12 @@
 import android.app.ActivityManager.RunningTaskInfo;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences.Editor;
-import android.net.Uri;
 import android.util.Log;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.URLEncoder;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 final class GDutils {
     private static final String LOG_TAG = "GD";
-    private static String OpenedURL = "";
 
     public GDutils() {
         // TODO Auto-generated constructor stub
@@ -39,86 +20,6 @@ protected static void log(String msg) {
         if (GDstatic.debug) Log.i(LOG_TAG, msg);
     }
 
-    protected static String sessionId() {
-        String text = new String("");
-        String possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-        int index = 0;
-        for (int i = 0; i < 32; i++) {
-            index = (int) Math.floor(Math.random() * possible.length());
-            text = text.concat(possible.substring(index, index + 1));
-        }
-        return text.trim();
-    }
-
-    protected static void compareVersions(float andver) {
-        if (GDstatic.apiVersion < andver) {
-            log("Your GDApi (version: " + GDstatic.apiVersion + ") is out of date. We strongly recommend you to use the newest version (" + andver + ") to access all features of GDApi.\nhttps://github.com/GameDistribution/GD-Android-Java");
-        }
-    }
-
-    protected static int getCookie(String key) {
-        try {
-            return GDlogger.appSharedPrefs.getInt(key, 0);
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-
-    protected static void setCookie(String key, int value) {
-        // TODO Auto-generated method stub
-        Editor prefsEditor = GDlogger.appSharedPrefs.edit();
-        prefsEditor.putInt(key, value);
-        prefsEditor.commit();
-    }
-
-    protected static String[] removeElement(String[] input, String deleteMe) {
-        if (input != null) {
-            List<String> list = new ArrayList<String>(Arrays.asList(input));
-            for (int i = 0; i < list.size(); i++) {
-                if (list.get(i).equals(deleteMe)) {
-                    list.remove(i);
-                }
-            }
-            return list.toArray(new String[0]);
-        } else {
-            return new String[0];
-        }
-    }
-
-    protected static String[] removeElementAt(String[] input, int index) {
-        if (input != null) {
-            List<String> list = new ArrayList<String>(Arrays.asList(input));
-            list.remove(index);
-            return list.toArray(new String[0]);
-        } else {
-            return new String[0];
-        }
-    }
-
-
-    protected static int OpenURL(String _url, String _target, Boolean _reopen) throws ExecutionException {
-        int res = 1500;
-        if (GDstatic.enable) {
-            if (_reopen) {
-                OpenedURL = "";
-                res = 1501;
-            } else if (OpenedURL != _url) {
-                if (!_url.startsWith("http://") && !_url.startsWith("https://")) {
-                    _url = "http://" + _url;
-                }
-
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(_url));
-                GDlogger.mContext.startActivity(browserIntent);
-
-                OpenedURL = _url;
-                res = 1502;
-            }
-            return res;
-        } else {
-            return res;
-        }
-    }
 
     protected static boolean isApplicationBroughtToBackground() {
         try {
@@ -136,39 +37,4 @@ protected static boolean isApplicationBroughtToBackground() {
         return false;
     }
 
-    static <T> boolean typeOf(T value) {
-        if (value instanceof Integer) {
-            return true;
-        } else if (value instanceof String) {
-            return true;
-        } else if (value instanceof Boolean) {
-            return true;
-        } else
-            return false;
-    }
-
-    static boolean internetConnectionAvailable() {
-        int timeOut = 2000;
-
-        InetAddress inetAddress = null;
-        try {
-            Future<InetAddress> future = Executors.newSingleThreadExecutor().submit(new Callable<InetAddress>() {
-                @Override
-                public InetAddress call() {
-                    try {
-                        return InetAddress.getByName("google.com");
-                    } catch (UnknownHostException e) {
-                        return null;
-                    }
-                }
-            });
-            inetAddress = future.get(timeOut, TimeUnit.MILLISECONDS);
-            future.cancel(true);
-        } catch (InterruptedException e) {
-        } catch (ExecutionException e) {
-        } catch (TimeoutException e) {
-        }
-        return inetAddress != null && !inetAddress.equals("");
-    }
-
 }