Fix several code inspection warnings.

indic-dict · Sep 28, 2017 · 253b4df · 253b4df
1 parent 97cb83d
commit 253b4df
Show file tree

Hide file tree

Showing 21 changed files with 176 additions and 203 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -105,52 +105,79 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jack-api-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
-    <orderEntry type="library" exported="" name="lint-api-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="httpcore-4.1" level="project" />
-    <orderEntry type="library" exported="" name="ddmlib-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
-    <orderEntry type="library" exported="" name="builder-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="juniversalchardet-1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="lint-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="jopt-simple-4.9" level="project" />
+    <orderEntry type="library" exported="" name="asm-5.0.4" level="project" />
+    <orderEntry type="library" exported="" name="gradle-api-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="builder-model-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="asm-commons-5.0.4" level="project" />
     <orderEntry type="library" exported="" name="httpmime-4.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="asm-analysis-4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="proguard-gradle-5.1" level="project" />
-    <orderEntry type="library" exported="" name="lint-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="lint-checks-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="sdklib-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="ecj-4.2.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="repository-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="shared-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="guava-20.0" level="project" />
+    <orderEntry type="library" exported="" name="sdk-common-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="asm-tree-5.0.4" level="project" />
+    <orderEntry type="library" exported="" name="transform-api-2.0.0-deprecated-use-gradle-api" level="project" />
+    <orderEntry type="library" exported="" name="lint-api-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="jill-api-0.10.0" level="project" />
+    <orderEntry type="library" exported="" name="proguard-gradle-5.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="lombok-ast-0.2.2" level="project" />
+    <orderEntry type="library" exported="" name="asm-debug-all-5.0.1" level="project" />
+    <orderEntry type="library" exported="" name="gradle-core-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="tracker-25.2.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
-    <orderEntry type="library" exported="" name="builder-test-api-1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="proguard-base-5.1" level="project" />
-    <orderEntry type="library" exported="" name="sdk-common-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="gradle-1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="common-24.0.0" level="project" />
+    <orderEntry type="library" exported="" name="manifest-merger-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="org.jacoco.core-0.7.5.201505241946" level="project" />
+    <orderEntry type="library" exported="" name="annotations-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="sdklib-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="annotations-12.0" level="project" />
+    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.48" level="project" />
+    <orderEntry type="library" exported="" name="antlr-3.5.2" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="protobuf-java-2.5.0" level="project" />
+    <orderEntry type="library" exported="" name="protos-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
+    <orderEntry type="library" exported="" name="layoutlib-api-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="ddmlib-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="org.jacoco.report-0.7.5.201505241946" level="project" />
+    <orderEntry type="library" exported="" name="httpcore-4.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="baseLibrary-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
+    <orderEntry type="library" exported="" name="builder-test-api-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="ecj-4.5.1" level="project" />
+    <orderEntry type="library" exported="" name="antlr4-4.5.3" level="project" />
+    <orderEntry type="library" exported="" name="builder-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="uast-145.597.3" level="project" />
+    <orderEntry type="library" exported="" name="lombok-ast-0.2.3" level="project" />
+    <orderEntry type="library" exported="" name="gradle-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="bcprov-jdk15on-1.48" level="project" />
-    <orderEntry type="library" exported="" name="asm-4.0" level="project" />
-    <orderEntry type="library" exported="" name="guava-17.0" level="project" />
-    <orderEntry type="library" exported="" name="layoutlib-api-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="dvlib-24.0.0" level="project" />
     <orderEntry type="library" exported="" name="commons-compress-1.8.1" level="project" />
-    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.48" level="project" />
     <orderEntry type="library" exported="" name="kxml2-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="jimfs-1.1" level="project" />
+    <orderEntry type="library" exported="" name="lint-checks-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="asm-analysis-5.0.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="manifest-merger-24.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
+    <orderEntry type="library" exported="" name="compilerCommon-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="proguard-base-5.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="dvlib-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.5" level="project" />
-    <orderEntry type="library" exported="" name="asm-tree-4.0" level="project" />
-    <orderEntry type="library" exported="" name="builder-model-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="common-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.2'
 //    useLibrary 'org.apache.http.legacy'
     defaultConfig {
         applicationId "sanskritcode.sanskritdictionaryupdater"
@@ -42,22 +42,22 @@ android {
 }
 
 dependencies {
-    compile 'com.android.tools.build:gradle:1.0.0'
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.android.support:support-v4:25.0.0'
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.tools.build:gradle:2.2.0'
+    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.loopj.android:android-async-http:1.4.5'
 
     // Warning:WARNING: Dependency commons-logging:commons-logging:1.2 is ignored for release as it may be conflicting with the internal version provided by Android.
     compile 'org.apache.commons:commons-io:1.3.2'
     compile 'org.apache.commons:commons-compress:1.2'
 
-    compile 'com.google.guava:guava:11.0.2'
+    compile 'com.google.guava:guava:20.0'
 
     // Required for local unit tests (JUnit 4 framework)
     testCompile 'junit:junit:4.12'
 
     // Required for instrumented tests
-    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support:support-annotations:25.3.1'
     androidTestCompile 'com.android.support.test:runner:0.5'
 }
diff --git a/app/src/androidTest/java/sanskritcode/sanskritdictionaryupdater/ApplicationTest.java b/app/src/androidTest/java/sanskritcode/sanskritdictionaryupdater/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,8 @@
         android:allowBackup="true"
         android:icon="@drawable/stardict_updater_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.Light" >
+        android:theme="@style/Theme.AppCompat.Light"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >

diff --git a/app/src/main/java/sanskritcode/sanskritdictionaryupdater/ErrorHandler.java b/app/src/main/java/sanskritcode/sanskritdictionaryupdater/ErrorHandler.java
@@ -13,7 +13,7 @@
 import java.io.File;
 import java.io.IOException;
 
-public class ErrorHandler {
+class ErrorHandler {
     public static void sendLoagcatMail(Activity baseActivity){
         if (ContextCompat.checkSelfPermission(baseActivity, Manifest.permission.READ_LOGS) == PackageManager.PERMISSION_GRANTED) {
             Log.d(baseActivity.getLocalClassName(), "Got READ_LOGS permissions");