From 2fac08c4da6789028fd87c2710a132fa71269acf Mon Sep 17 00:00:00 2001 From: p7zpvj468 <862917881@qq.com> Date: Mon, 22 Jan 2024 22:11:26 +0800 Subject: [PATCH 1/4] Update Contact.java --- .../java/net/micode/notes/data/Contact.java | 152 ++++++++---------- 1 file changed, 68 insertions(+), 84 deletions(-) diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java index 6083afa..af9e28b 100644 --- a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java @@ -1,85 +1,69 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - package net.micode.notes.data; +package net.micode.notes.data; - import android.content.Context; - - import android.database.Cursor; - import android.provider.ContactsContract.CommonDataKinds.Phone; - import android.provider.ContactsContract.Data; - import android.telephony.PhoneNumberUtils; - import android.util.Log; - - import java.util.HashMap; - //change - public class Contact { //联系人 - private static HashMap sContactCache; - private static final String TAG = "Contact"; - - // 定义字符串CALLER_ID_SELECTION - private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" - - + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " - + "(SELECT raw_contact_id " - + " FROM phone_lookup" - + " WHERE min_match = '+')"; - - // 获取联系人 - public static String getContact(Context context, String phoneNumber) { - if(sContactCache == null) { - sContactCache = new HashMap(); - } - - // 查找HashMap中是否已有phoneNumber信息 - if(sContactCache.containsKey(phoneNumber)) { - return sContactCache.get(phoneNumber); - } - - String selection = CALLER_ID_SELECTION.replace("+", - PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); - // 查找数据库中phoneNumber的信息 - Cursor cursor = context.getContentResolver().query( - Data.CONTENT_URI, - new String [] { Phone.DISPLAY_NAME }, - selection, - new String[] { phoneNumber }, - null); - - // 判定查询结果 - // moveToFirst()返回第一条 - if (cursor != null && cursor.moveToFirst()) { - try { - // 找到相关信息 - String name = cursor.getString(0); - sContactCache.put(phoneNumber, name); - return name; - // 异常 - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, " Cursor get string error " + e.toString()); - return null; - } finally { - cursor.close(); - } - // 未找到相关信息 - } else { - Log.d(TAG, "No contact matched with number:" + phoneNumber); - return null; - } - } - } \ No newline at end of file +import android.content.Context; + +import android.database.Cursor; +import android.provider.ContactsContract.CommonDataKinds.Phone; +import android.provider.ContactsContract.Data; +import android.telephony.PhoneNumberUtils; +import android.util.Log; + +import java.util.HashMap; +//change +public class Contact { //联系人 + private static HashMap sContactCache; + private static final String TAG = "Contact"; + + // 定义字符串CALLER_ID_SELECTION + private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + ++ Phone.NUMBER + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + + "(SELECT raw_contact_id " + + " FROM phone_lookup" + + " WHERE min_match = '+')"; + + // 获取联系人 + public static String getContact(Context context, String phoneNumber) { + if(sContactCache == null) { + sContactCache = new HashMap(); + } + + // 查找HashMap中是否已有phoneNumber信息 + if(sContactCache.containsKey(phoneNumber)) { + return sContactCache.get(phoneNumber); + } + + String selection = CALLER_ID_SELECTION.replace("+", + PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + // 查找数据库中phoneNumber的信息 + Cursor cursor = context.getContentResolver().query( + Data.CONTENT_URI, + new String [] { Phone.DISPLAY_NAME }, + selection, + new String[] { phoneNumber }, + null); + + // 判定查询结果 + // moveToFirst()返回第一条 + if (cursor != null && cursor.moveToFirst()) { + try { + // 找到相关信息 + String name = cursor.getString(0); + sContactCache.put(phoneNumber, name); + return name; + // 异常 + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, " Cursor get string error " + e.toString()); + return null; + } finally { + cursor.close(); + } + // 未找到相关信息 + } else { + Log.d(TAG, "No contact matched with number:" + phoneNumber); + return null; + } + } +} \ No newline at end of file -- 2.34.1 From 572dff23e70e198efa2f5bd98de5f9495d048711 Mon Sep 17 00:00:00 2001 From: p7zpvj468 <862917881@qq.com> Date: Mon, 22 Jan 2024 22:12:16 +0800 Subject: [PATCH 2/4] Update Notes.java --- .../main/java/net/micode/notes/data/Notes.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java index 1cdfe5e..6a486f9 100644 --- a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/Notes.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; import android.content.ContentUris; -- 2.34.1 From d37413fc899c491f33065da96d0aef4118a0e8fc Mon Sep 17 00:00:00 2001 From: p7zpvj468 <862917881@qq.com> Date: Mon, 22 Jan 2024 22:17:30 +0800 Subject: [PATCH 3/4] Update NotesDatabaseHelper.java --- .../notes/data/NotesDatabaseHelper.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 531e473..1179875 100644 --- a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。 @@ -361,5 +345,5 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); - }//更新到V4版本 -} + }//更新到V4版本,但是不知道V2、V3、V4是什么意思 +} \ No newline at end of file -- 2.34.1 From 2703523101d2b45c12c10fab9d6474757db278e7 Mon Sep 17 00:00:00 2001 From: p7zpvj468 <862917881@qq.com> Date: Mon, 22 Jan 2024 22:18:09 +0800 Subject: [PATCH 4/4] Update NotesProvider.java --- .../net/micode/notes/data/NotesProvider.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java index 1ed1bd8..8764365 100644 --- a/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; import android.app.SearchManager; -- 2.34.1