version 3.3.2'

suragch · Oct 27, 2023 · b468f12 · b468f12
1 parent 076b3e9
commit b468f12
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 143 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/libraries/Gradle__com_github_suragch_mongol_library_2_1_0_aar.xml b/.idea/libraries/Gradle__com_github_suragch_mongol_library_2_1_0_aar.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,5 +27,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'net.studymongolian:mongol-library:2.1.0'
+    implementation 'com.github.suragch:mongol-library:2.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -38,7 +38,8 @@
         <activity android:name=".CodeConverterDetailsActivity" />
         <activity
             android:name=".ReaderActivity"
-            android:noHistory="true">
+            android:noHistory="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -66,7 +67,8 @@
         <service
             android:name=".ChimeeInputMethodService"
             android:label="@string/keyboard_name"
-            android:permission="android.permission.BIND_INPUT_METHOD">
+            android:permission="android.permission.BIND_INPUT_METHOD"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>

diff --git a/app/src/main/java/net/studymongolian/chimee/AddEditFavoritesActivity.java b/app/src/main/java/net/studymongolian/chimee/AddEditFavoritesActivity.java
@@ -109,6 +109,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         handleUserFinishing();
     }
 

diff --git a/app/src/main/java/net/studymongolian/chimee/SaveActivity.java b/app/src/main/java/net/studymongolian/chimee/SaveActivity.java
@@ -172,6 +172,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         handleUserFinishing();
     }
 

diff --git a/app/src/main/java/net/studymongolian/chimee/UserDictionary.java b/app/src/main/java/net/studymongolian/chimee/UserDictionary.java
@@ -1,5 +1,6 @@
 package net.studymongolian.chimee;
 
+import android.annotation.SuppressLint;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -280,6 +281,7 @@ static int importWordAndFollowingList(Context context, ArrayList<CharSequence> t
          * @param word          the word whose following list needs updating
          * @param followingWord the following word to add
          */
+        @SuppressLint("Range")
         static void addFollowing(Context context, String word, String followingWord) {
 
             // do error checking on input params
@@ -294,16 +296,16 @@ static void addFollowing(Context context, String word, String followingWord) {
             String[] projection = new String[]{_ID, FOLLOWING};
             String selection = WORD + "=?";
             String[] selectionArgs = {word};
-            try (Cursor cursor = resolver.query(CONTENT_URI, projection, selection,
-                    selectionArgs, null)) {
-                if (cursor != null && cursor.moveToNext()) {
-                    wordId = cursor.getLong(cursor.getColumnIndex(_ID));
-                    followingString = cursor.getString(cursor
-                            .getColumnIndex(FOLLOWING));
+                try (Cursor cursor = resolver.query(CONTENT_URI, projection, selection,
+                        selectionArgs, null)) {
+                    if (cursor != null && cursor.moveToNext()) {
+                        wordId = cursor.getLong(cursor.getColumnIndex(_ID));
+                        followingString = cursor.getString(cursor
+                                .getColumnIndex(FOLLOWING));
+                    }
+                } catch (Exception e) {
+                    Log.e("UserDictionary", e.toString());
                 }
-            } catch (Exception e) {
-                Log.e("UserDictionary", e.toString());
-            }
             if (wordId == -1) {
                 return;
             }
@@ -366,8 +368,8 @@ static int incrementFrequency(Context context, String word) {
                 return -1;
             }
 
-            long id = cursor.getLong(cursor.getColumnIndex(UserDictionary.Words._ID));
-            int frequency = cursor.getInt(cursor.getColumnIndex(UserDictionary.Words.FREQUENCY));
+            @SuppressLint("Range") long id = cursor.getLong(cursor.getColumnIndex(UserDictionary.Words._ID));
+            @SuppressLint("Range") int frequency = cursor.getInt(cursor.getColumnIndex(UserDictionary.Words.FREQUENCY));
             cursor.close();
 
             frequency++;
@@ -415,7 +417,7 @@ static void deleteFollowingWord(Context context, String word, String followingWo
                 return;
             }
 
-            String followingString = cursor.getString(cursor.getColumnIndex(Words.FOLLOWING));
+            @SuppressLint("Range") String followingString = cursor.getString(cursor.getColumnIndex(Words.FOLLOWING));
             cursor.close();
 
             followingString = removeWordFromFollowingString(followingString, followingWord);

diff --git a/build.gradle b/build.gradle
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }