Browse Source

#2019-07-08 13:54
- 리스티클 이미지 하단 딤영역 이미지 변경
- Crashlytics 오류 수정

yeongyun 6 years ago
parent
commit
35d6f5990d

+ 2 - 1
app/build.gradle

@@ -178,7 +178,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
     implementation 'com.kakao.sdk:kakaolink:1.14.0'
-    implementation 'com.facebook.android:facebook-share:4.38.1'
+//    implementation 'com.facebook.android:facebook-share:4.38.1'
     implementation 'com.githang:status-bar-compat:0.7'
     implementation 'com.wefika:flowlayout:0.4.1'
     implementation 'me.everything:overscroll-decor-android:1.0.4'
@@ -191,6 +191,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-analytics:16.0.8'
     implementation 'com.kakao.sdk:usermgmt:1.14.0'
     implementation 'com.kakao.sdk:kakaotalk:1.14.0'
+    implementation 'com.facebook.android:facebook-android-sdk:[5,6)'
 
     // Naver login sdk
     implementation files('libs/3rdparty_login_library_android_4.1.4.jar')

+ 32 - 30
app/src/main/java/kr/co/zumo/app/lifeplus/helper/MockHackingHelper.java

@@ -134,41 +134,43 @@ public class MockHackingHelper {
      * @return
      */
     private boolean antiFrida(Context applicationContext) {
-        ActivityManager am = (ActivityManager) applicationContext.getSystemService(Context.ACTIVITY_SERVICE);
-        List<ActivityManager.RunningAppProcessInfo> appList = am.getRunningAppProcesses();
-
-        if (appList != null) {
-            for (ActivityManager.RunningAppProcessInfo runningAppProcessInfo : appList) {
-                if (runningAppProcessInfo != null) {
-                    int pid = runningAppProcessInfo.pid;    //실행중인 프로세스의 pid
-
-                    String maps = "/proc/" + pid + "/maps"; //실행중인 프로세스의 메모리 맵 열람
-                    File file = new File(maps);
-                    FileReader mapContent = null;
-                    try {
-                        mapContent = new FileReader(file);
-                        BufferedReader br = new BufferedReader(mapContent);
-                        String line;
-                        StringBuilder sb = new StringBuilder();
+        if(applicationContext != null) {
+            ActivityManager am = (ActivityManager) applicationContext.getSystemService(Context.ACTIVITY_SERVICE);
+            List<ActivityManager.RunningAppProcessInfo> appList = am.getRunningAppProcesses();
+
+            if (appList != null) {
+                for (ActivityManager.RunningAppProcessInfo runningAppProcessInfo : appList) {
+                    if (runningAppProcessInfo != null) {
+                        int pid = runningAppProcessInfo.pid;    //실행중인 프로세스의 pid
+
+                        String maps = "/proc/" + pid + "/maps"; //실행중인 프로세스의 메모리 맵 열람
+                        File file = new File(maps);
+                        FileReader mapContent = null;
                         try {
-                            while ((line = br.readLine()) != null) {
-                                sb.append(line);    //메모리 맵 내용
-                            }
-                            String str = sb.toString().toLowerCase();
-                            int index = str.indexOf("frida-agent");  //실행중인 메모리가 프리다에 의해 제어 받고 있는지 확인
-                            if (index >= 0) {
-                                googleAnalyticsHelper.sendGA(TAG, "antiFrida", runningAppProcessInfo.processName);
-                                return false;
+                            mapContent = new FileReader(file);
+                            BufferedReader br = new BufferedReader(mapContent);
+                            String line;
+                            StringBuilder sb = new StringBuilder();
+                            try {
+                                while ((line = br.readLine()) != null) {
+                                    sb.append(line);    //메모리 맵 내용
+                                }
+                                String str = sb.toString().toLowerCase();
+                                int index = str.indexOf("frida-agent");  //실행중인 메모리가 프리다에 의해 제어 받고 있는지 확인
+                                if (index >= 0) {
+                                    googleAnalyticsHelper.sendGA(TAG, "antiFrida", runningAppProcessInfo.processName);
+                                    return false;
+                                }
+                            } catch (IOException e) {
+                                if (BuildConfig.DEBUG) {
+                                    LogHelper.w(getClass().getSimpleName(), "antiFrida: IOException");
+                                }
                             }
-                        } catch (IOException e) {
+                        } catch (FileNotFoundException e) {
                             if (BuildConfig.DEBUG) {
-                                LogHelper.w(getClass().getSimpleName(), "antiFrida: IOException");
+                                LogHelper.w(getClass().getSimpleName(), "antiFrida: FileNotFoundException");
                             }
                         }
-                    } catch (FileNotFoundException e) {
-                        if (BuildConfig.DEBUG) {
-                            LogHelper.w(getClass().getSimpleName(), "antiFrida: FileNotFoundException");
-                        }
                     }
                 }
             }

+ 5 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/command/ScreenCommand.java

@@ -40,9 +40,11 @@ public class ScreenCommand extends Command {
     @Override
     public void execute(Model model, IView view, Presenter presenter) {
         ScreenManagerHelper helper = view.getHelper(ScreenManagerHelper.class);
-        helper.setModel(model);
-        helper.setPresenter(presenter);
-        helper.setView(view);
+        if(helper != null) {
+            helper.setModel(model);
+            helper.setPresenter(presenter);
+            helper.setView(view);
+        }
 
         new ScreenManager(helper, id, direction, method).change();
     }

+ 11 - 9
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchWithResultPresenter.java

@@ -171,15 +171,17 @@ public class SearchWithResultPresenter extends Presenter<SearchWithResultModel,
             case Event.CLICK:
                 integer = event.getInteger();
                 index = event.getIndex();
-                if (integer == Event.TAG_LATEST) {
-                    // 최근 검색 태그
-                    tag = model.getLatestTagBeans().get(index).getTagName();
-                } else if (integer == Event.TAG_POPULAR) {
-                    // 인기 태그
-                    tag = model.getPopularTagBeans().get(index).getTagName();
-                } else if (integer == Event.TAG_AUTO_COMPLETION) {
-                    // 자동 완성
-                    tag = model.getAutoCompletionBeans().get(index).getTagName();
+                if(model != null) {
+                    if (integer == Event.TAG_LATEST && model.getLatestTagBeans() != null && model.getLatestTagBeans().size() > index) {
+                        // 최근 검색 태그
+                        tag = model.getLatestTagBeans().get(index).getTagName();
+                    } else if (integer == Event.TAG_POPULAR && model.getPopularTagBeans() != null && model.getPopularTagBeans().size() > index) {
+                        // 인기 태그
+                        tag = model.getPopularTagBeans().get(index).getTagName();
+                    } else if (integer == Event.TAG_AUTO_COMPLETION && model.getAutoCompletionBeans() != null && model.getAutoCompletionBeans().size() > index) {
+                        // 자동 완성
+                        tag = model.getAutoCompletionBeans().get(index).getTagName();
+                    }
                 }
                 if (StringUtil.isFull(tag)) {
                     // 키워드를 텍스트필드에 넣을 때 이벤트 발생을 막기위해 리스너 제거/재등록

BIN
app/src/main/res/drawable-xxxhdpi/dim_02_bottom.png