From 61484a44d4f1aa93db29e14e91cf761aac697a89 Mon Sep 17 00:00:00 2001
From: Adrian Tiberius <adrian.tiberius@gmail.com>
Date: Tue, 25 Aug 2015 08:27:19 +0200
Subject: [PATCH] Display addresses instead of public keys in profile. Fix
 getColor deprecated method for older apis.

---
 app/src/main/java/io/syng/activity/BaseActivity.java   |  3 ++-
 app/src/main/java/io/syng/activity/LoginActivity.java  |  4 +---
 app/src/main/java/io/syng/entity/Profile.java          | 10 ++++++++++
 .../io/syng/fragment/profile/ProfileKeysFragment.java  |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java
index e3571a9..0865d86 100644
--- a/app/src/main/java/io/syng/activity/BaseActivity.java
+++ b/app/src/main/java/io/syng/activity/BaseActivity.java
@@ -7,6 +7,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -95,7 +96,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
 
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-            mDrawerLayout.setStatusBarBackgroundColor(getColor(android.R.color.black));
+            mDrawerLayout.setStatusBarBackgroundColor(ContextCompat.getColor(this, android.R.color.black));
         }
 
         mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar,
diff --git a/app/src/main/java/io/syng/activity/LoginActivity.java b/app/src/main/java/io/syng/activity/LoginActivity.java
index 8c10b79..1eb8a1f 100644
--- a/app/src/main/java/io/syng/activity/LoginActivity.java
+++ b/app/src/main/java/io/syng/activity/LoginActivity.java
@@ -19,9 +19,7 @@ import java.util.List;
 
 import io.syng.R;
 import io.syng.entity.Profile;
-import io.syng.util.GeneralUtil;
-import io.syng.util.PrefsUtil;
-import io.syng.util.ProfileManager;
+import io.syng.util.*;
 
 import static org.ethereum.config.SystemProperties.CONFIG;
 
diff --git a/app/src/main/java/io/syng/entity/Profile.java b/app/src/main/java/io/syng/entity/Profile.java
index 5df10c6..0c6d03c 100644
--- a/app/src/main/java/io/syng/entity/Profile.java
+++ b/app/src/main/java/io/syng/entity/Profile.java
@@ -75,6 +75,16 @@ public class Profile implements Serializable {
         return privateKeys;
     }
 
+    public List<String> getAddresses() {
+
+        List<String> addresses = new ArrayList<>();
+        for (String privateKey: privateKeys) {
+            ECKey key = ECKey.fromPrivate(Hex.decode(privateKey));
+            addresses.add(Hex.toHexString(key.getAddress()));
+        }
+        return addresses;
+    }
+
     public void setPrivateKeys(List<String> privateKeys) {
         this.privateKeys = privateKeys;
     }
diff --git a/app/src/main/java/io/syng/fragment/profile/ProfileKeysFragment.java b/app/src/main/java/io/syng/fragment/profile/ProfileKeysFragment.java
index add9850..f41605f 100644
--- a/app/src/main/java/io/syng/fragment/profile/ProfileKeysFragment.java
+++ b/app/src/main/java/io/syng/fragment/profile/ProfileKeysFragment.java
@@ -50,7 +50,7 @@ public class ProfileKeysFragment extends Fragment {
         mRecyclerView = (RecyclerView) view.findViewById(R.id.rv_profile_keys);
         RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getActivity());
         mRecyclerView.setLayoutManager(layoutManager);
-        mProfileDrawerAdapter = new ProfileKeyAdapter(profile.getPrivateKeys());
+        mProfileDrawerAdapter = new ProfileKeyAdapter(profile.getAddresses());
         mRecyclerView.setAdapter(mProfileDrawerAdapter);
 
         return view;