소스 검색

Fix nullptr exception

isundil 7 년 전
부모
커밋
3883e8e0ac
3개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      app/build.gradle
  2. 1 1
      app/src/main/java/info/knacki/pass/services/AccessibilityService.java
  3. 1 1
      app/src/main/res/xml/accessibility_service.xml

+ 1 - 1
app/build.gradle

@@ -54,5 +54,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'org.bouncycastle:bcpg-jdk15on:1.60'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
-    compile project(path: ':gitdroid')
+    implementation project(path: ':gitdroid')
 }

+ 1 - 1
app/src/main/java/info/knacki/pass/services/AccessibilityService.java

@@ -47,7 +47,7 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
         }
 
         public boolean IsCancelling(AccessibilityNodeInfo source, boolean clearCancelling) {
-            boolean cancelling = source.getPackageName().toString().equals(lastCancelledPackage) && (new Date().getTime() / 1000) -lastCancelledTime <= CANCEL_DELAY_SEC;
+            boolean cancelling = lastCancelledPackage != null && source.getPackageName().toString().equals(lastCancelledPackage) && (new Date().getTime() / 1000) -lastCancelledTime <= CANCEL_DELAY_SEC;
             if (cancelling && clearCancelling)
                 this.Clear();
             return cancelling;

+ 1 - 1
app/src/main/res/xml/accessibility_service.xml

@@ -6,5 +6,5 @@
     android:accessibilityFlags="flagDefault|flagRetrieveInteractiveWindows|flagReportViewIds"
     android:accessibilityFeedbackType="feedbackGeneric"
     android:canRetrieveWindowContent="true"
-    android:settingsActivity=".services.AccessibilityService"
+    android:settingsActivity=".settings.ui.SettingsActivity"
     />