Merge pull request #6 from EbenezerGH/apikey_singleton

add apikey singleton with small error handling

Author: EbenezerGH

app/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jfyg.etherscan.helloetherescan">
+          package="jfyg.etherscan.helloetherescan">
 
     <application
+        android:name=".HelloEtherscanApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -14,13 +15,13 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
 </manifest>

app/src/main/java/jfyg/etherscan/helloetherescan/ApiKey.kt

@@ -0,0 +1,28 @@
+package jfyg.etherscan.helloetherescan
+
+import android.util.Log
+
+class ApiKey private constructor() {
+    private object Holder {
+        val TakeOff = ApiKey()
+    }
+
+    companion object {
+        val takeOff: ApiKey by lazy { Holder.TakeOff }
+    }
+
+    private var apiKey: String? = null
+
+    fun callApiKey(): String? {
+        if (apiKey == null) {
+            Log.w("", "No api key seems to be added.  No record of your queries will be kept in your " +
+                    "https://etherscan.io/ console")
+        }
+        return ApiKey.takeOff.apiKey
+    }
+
+    fun setApiKey(apiKey: String) {
+        this.apiKey = apiKey
+    }
+
+}

app/src/main/java/jfyg/etherscan/helloetherescan/HelloEtherscanApplication.kt

@@ -0,0 +1,10 @@
+package jfyg.etherscan.helloetherescan
+
+import android.app.Application
+
+class HelloEtherscanApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        ApiKey.takeOff.setApiKey("1I7CRNU2QIU253UBPFVB5UV2C2PBDURAIYZ")
+    }
+}

app/src/main/java/jfyg/etherscan/helloetherescan/MainActivity.kt

@@ -3,8 +3,6 @@ package jfyg.etherscan.helloetherescan
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import jfyg.etherscan.helloetherescan.ethereum.EthereumStat
@@ -13,6 +11,7 @@ import jfyg.etherscan.helloetherescan.network.responses.MainResponse
 import jfyg.etherscan.helloetherescan.network.RestClient
 
 import kotlinx.android.synthetic.main.activity_main.*
+
 //TODO: clean up and write tests
 class MainActivity : AppCompatActivity() {
     private val TAG = javaClass.name!!
@@ -24,21 +23,22 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
+        //~~~ For Testing
+        /*
         var testing = EthereumStat()
-
         fab.setOnClickListener {
             //testing.getTotalSupply()
             //testing.getTotalSupplyInWei()
             testing.getLastPriceInUsd()
             testing.getLastPriceInBtc()
             //queryStats("stats", "ethPrice")
         }
+        */
     }
 
     fun queryStats(module: String, action: String) {
-        //pass apikey that will save in preferences or singleton or something.. or application class
         RestClient().getQuery()
-                .getEtherStats(module, action, "1I7CRNU2QIU253UBPFVB5UV2C2PBDURAIYZ")
+                .getEtherStats(module, action, ApiKey.takeOff.callApiKey())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeOn(Schedulers.io())
                 .subscribe(this::handleResponse, this::handleError)
@@ -57,20 +57,4 @@ class MainActivity : AppCompatActivity() {
         Log.d(TAG, "The error " + error.message)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.menu_main, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        return when (item.itemId) {
-            R.id.action_settings -> true
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
 }

app/src/main/java/jfyg/etherscan/helloetherescan/network/NetworkService.kt

@@ -13,5 +13,5 @@ interface NetworkService {
     @GET("api")
     fun getEtherStats(@Query("module") module: String,
                       @Query("action") action: String,
-                      @Query("apikey") apikey: String): Single<MainResponse>
+                      @Query("apikey") apikey: String?): Single<MainResponse>
 }