Merge pull request #62 from CalyFactory/dev-jspiner

테스트 시나리오에서 나온 버그 수정

Author: JSpiner

app/src/main/AndroidManifest.xml

@@ -59,17 +59,12 @@
 
         <!-- Setting Activity -->
         <activity
-            android:name=".activity.LegacySettingActivity"
+            android:name=".activity.SettingActivity"
             android:screenOrientation="portrait">
 
         </activity>
 
         <!-- Setting Activity -->
-        <activity
-            android:name=".activity.SettingActivity"
-            android:screenOrientation="portrait">
-
-        </activity>
 
         <!-- Signup Activity -->
         <activity

app/src/main/java/io/caly/calyandroid/CalyApplication.java

@@ -1,6 +1,8 @@
 package io.caly.calyandroid;
 
 import android.content.Context;
+
+import io.caly.calyandroid.util.tracker.AnalysisTracker;
 import io.caly.calyandroid.util.Logger;
 
 import com.crashlytics.android.Crashlytics;
@@ -62,6 +64,9 @@ void init(){
                 .setFontAttrId(R.attr.fontPath)
                 .build()
         );
+
+        //init analysis
+        AnalysisTracker.initTracker(this);
     }
 
     synchronized public Tracker getDefaultTracker() {

app/src/main/java/io/caly/calyandroid/activity/AccountAddActivity.java

@@ -76,6 +76,9 @@ public class AccountAddActivity extends BaseAppCompatActivity {
     @Bind(R.id.linear_loading_parent)
     LinearLayout linearLoading;
 
+    @Bind(R.id.tv_progress_title)
+    TextView tvProgressTitle;
+
     AccountAddAdapter recyclerAdapter;
     LinearLayoutManager layoutManager;
 
@@ -214,6 +217,8 @@ public void onLongItemClick(View view, int position) {
                 .enableAutoManage(this , onGoogleConnectionFailedListener)
                 .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
                 .build();
+
+        tvProgressTitle.setText("캘린더를 가져오는 중입니다");
     }
 
 

app/src/main/java/io/caly/calyandroid/activity/DebugActivity.java

@@ -61,10 +61,10 @@ public class DebugActivity extends BaseAppCompatActivity {
             AccountAddActivity.class,
             AccountListActivity.class,
             GuideActivity.class,
-            LegacySettingActivity.class,
+            SettingActivity.class,
             NoticeActivity.class,
             PolicyActivity.class,
-            LegacySettingActivity.class,
+            SettingActivity.class,
             TestActivity.class,
             WebViewActivity.class
     };

app/src/main/java/io/caly/calyandroid/activity/EventListActivity.java

@@ -1,9 +1,7 @@
 package io.caly.calyandroid.activity;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -14,7 +12,6 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -64,10 +61,10 @@
 import io.caly.calyandroid.util.StringFormmater;
 import io.caly.calyandroid.util.Util;
 import io.caly.calyandroid.util.eventListener.RecyclerItemClickListener;
+import io.caly.calyandroid.util.tracker.AnalysisTracker;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import uk.co.chrisjenx.calligraphy.TypefaceUtils;
 
 /**
  * Copyright 2017 JSpiner. All rights reserved.
@@ -147,6 +144,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         init();
 
         Logger.d(TAG, "hashcode : " + EventListActivity.super.hashCode());
+        Logger.d(TAG, "SESSION : " + AnalysisTracker.getAppSession().getSessionKey());
     }
 
     void init(){
@@ -172,13 +170,13 @@ public boolean onMenuItemClick(MenuItem item) {
 
             @Override
             public void onDrawerOpened(View drawerView) {
-                Log.d(TAG, "drawer opened");
+                Logger.d(TAG, "drawer opened");
                 super.onDrawerOpened(drawerView);
             }
 
             @Override
             public void onDrawerClosed(View drawerView) {
-                Log.d(TAG, "drawer closed");
+                Logger.d(TAG, "drawer closed");
                 super.onDrawerClosed(drawerView);
 
             }
@@ -271,6 +269,7 @@ else if(firstVisibleItem < LOADING_THRESHOLD){
                     public void onItemClick(View view, int position) {
                         if(recyclerAdapter.getItemCount()-1 < position) return;
                         EventModel eventModel = recyclerAdapter.getItem(position);
+                        if(eventModel.isHeader) return;
                         // 여기서는 아이템 클릭 이벤트이기 때문에
                         // 추천완료만 처리하고 분석중과 추천불가
                         // EventListAdapter 안에서처리
@@ -697,7 +696,7 @@ public void onFailure(Call<BasicResponse> call, Throwable t) {
 
     void requestSetEventLog (String apikey, String eventHashkey, int category, int label, int action) {
         ApiClient.getService().setEventLog(
-                "세션키 자리야 성민아!!!!!!!",
+                AnalysisTracker.getAppSession().getSessionKey().toString(),
                 apikey,
                 eventHashkey,
                 category,
@@ -956,8 +955,8 @@ void onBannerClick(){
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        Log.d(TAG, "requestCode : " + requestCode);
-        Log.d(TAG, "resultCode : " + resultCode);
+        Logger.d(TAG, "requestCode : " + requestCode);
+        Logger.d(TAG, "resultCode : " + resultCode);
 
         switch (requestCode){
             case 1: //setting activity
@@ -983,7 +982,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
 
             case R.id.menu_eventlist_setting:
-                Intent intent = new Intent(EventListActivity.this, LegacySettingActivity.class);
+                Intent intent = new Intent(EventListActivity.this, SettingActivity.class);
                 startActivityForResult(intent, 1);
                 overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_left);
 

app/src/main/java/io/caly/calyandroid/activity/LegacySettingActivity.java

@@ -50,6 +50,7 @@
 import io.caly.calyandroid.util.BusProvider;
 import io.caly.calyandroid.util.Logger;
 import io.caly.calyandroid.util.Util;
+import io.caly.calyandroid.util.tracker.AnalysisTracker;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -219,15 +220,15 @@ void changeView(){
     }
 
     void checkGPSPermission(){
-        Log.d(TAG, "checkGPSPermission");
+        Logger.d(TAG, "checkGPSPermission");
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
                 == PackageManager.PERMISSION_GRANTED) {
 
             BusProvider.getInstance().post(new MapPermissionGrantedEvent());
 
         }
         else{
-            Log.d(TAG, "request permission");
+            Logger.d(TAG, "request permission");
             ActivityCompat.requestPermissions(
                     this,
                     new String[]{
@@ -365,7 +366,7 @@ void startMapActivity(){
 
     void requestSetRecoLog (String apikey, String eventHashkey, int category, int label, int action, long residenseTime, String recoHashkey){
         ApiClient.getService().setRecoLog(
-                "세션키 자리야 성민아!!!!!!!",
+                AnalysisTracker.getAppSession().getSessionKey().toString(),
                 apikey,
                 eventHashkey,
                 category,