Merge branch 'master' of https://bdgit.educoder.net/puf7qhzog/note

维护了一点新功能

src/Notes-master2/app/build.gradle

@@ -8,7 +8,7 @@ android {
     defaultConfig {
         applicationId "net.micode.notes"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 
     buildTypes {

src/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Fri Apr 14 09:10:42 CST 2023
+#Thu May 11 23:02:37 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Notes-master2\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Notes-master2\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master2\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat

src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu May 11 22:45:40 CST 2023
+#Fri May 12 00:03:05 CST 2023
 base.0=D\:\\Notes-master2\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,273 +1,271 @@
 1<?xml version="1.0" encoding="utf-8"?>
-2<!--
+2<!-- 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 athttp://www.apache.org/licenses/LICENSE-2.0Unless required by applicable law or agreed to in writing, softwaredistributed 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 andlimitations under the License. -->
-3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+3<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-4
+4    package="net.micode.notes"
-5     Licensed under the Apache License, Version 2.0 (the "License");
+5    android:versionCode="1"
-6     you may not use this file except in compliance with the License.
+6    android:versionName="0.1" >
-7     You may obtain a copy of the License at
+7
-8
+8    <uses-sdk
-9          http://www.apache.org/licenses/LICENSE-2.0
+8-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:7:5-43
-10
+9        android:minSdkVersion="14"
-11     Unless required by applicable law or agreed to in writing, software
+9-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:7:15-41
-12     distributed under the License is distributed on an "AS IS" BASIS,
+10        android:targetSdkVersion="30" />
-13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+10-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:7:5-43
-14     See the License for the specific language governing permissions and
+11
-15     limitations under the License.
+12    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-16-->
+12-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:9:5-80
-17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+12-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:9:22-78
-18    package="net.micode.notes"
+13    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-19    android:versionCode="1"
+13-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:11:5-87
-20    android:versionName="0.1" >
+13-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:11:22-85
-21
+14    <uses-permission android:name="android.permission.INTERNET" />
-22    <uses-sdk
+14-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:13:5-66
-22-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+14-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:13:22-64
-23        android:minSdkVersion="14"
+15    <uses-permission android:name="android.permission.READ_CONTACTS" />
-23-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41
+15-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:15:5-71
-24        android:targetSdkVersion="29" />
+15-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:15:22-69
-24-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+16    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-25
+16-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:17:5-73
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+16-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:17:22-71
-26-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81
+17    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-26-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78
+17-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:19:5-79
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+17-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:19:22-77
-27-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88
+18    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-27-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85
+18-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:21:5-70
-28    <uses-permission android:name="android.permission.INTERNET" />
+18-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:21:22-68
-28-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67
+19    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-28-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64
+19-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:23:5-73
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
+19-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:23:22-71
-29-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72
+20    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-29-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69
+20-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:25:5-80
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+20-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78
-30-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74
+21    -
-30-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71
+22    <application
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+22-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:28:6-146:15
-31-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80
+23        android:debuggable="true"
-31-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77
+24        android:icon="@drawable/icon_app"
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+24-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:28:52-85
-32-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71
+25        android:label="@string/app_name"
-32-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68
+25-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:28:19-51
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+26        android:testOnly="true" >
-33-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74
+27    -
-33-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71
+28        <activity
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+28-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:6-42:12
-34-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81
+29            android:name="net.micode.notes.ui.NotesListActivity"
-34-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78
+29-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:16-52
-35
+30            android:configChanges="keyboardHidden|orientation|screenSize"
-36    <application
+30-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:235-296
-36-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19
+31            android:label="@string/app_name"
-37        android:debuggable="true"
+31-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:53-85
-38        android:icon="@drawable/icon_app"
+32            android:launchMode="singleTop"
-38-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42
+32-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:204-234
-39        android:label="@string/app_name"
+33            android:theme="@style/NoteTheme"
-39-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41
+33-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:171-203
-40        android:testOnly="true" >
+34            android:uiOptions="splitActionBarWhenNarrow"
-41        <activity
+34-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:126-170
-41-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20
+35            android:windowSoftInputMode="adjustPan" >
-42            android:name="net.micode.notes.ui.NotesListActivity"
+35-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:31:86-125
-42-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49
+36    -
-43            android:configChanges="keyboardHidden|orientation|screenSize"
+37            <intent-filter>
-43-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74
+37-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:34:6-40:17
-44            android:label="@string/app_name"
+38                <action android:name="android.intent.action.MAIN" />
-44-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45
+38-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:36:5-56
-45            android:launchMode="singleTop"
+38-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:36:13-54
-45-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43
+39
-46            android:theme="@style/NoteTheme"
+40                <category android:name="android.intent.category.LAUNCHER" />
-46-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45
+40-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:38:5-64
-47            android:uiOptions="splitActionBarWhenNarrow"
+40-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:38:15-62
-47-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57
+41            </intent-filter>
-48            android:windowSoftInputMode="adjustPan" >
+42        </activity>
-48-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52
+43    -
-49            <intent-filter>
+44        <activity
-49-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29
+44-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:6-84:12
-50                <action android:name="android.intent.action.MAIN" />
+45            android:name="net.micode.notes.ui.NoteEditActivity"
-50-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69
+45-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:16-51
-50-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66
+46            android:configChanges="keyboardHidden|orientation|screenSize"
-51
+46-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:116-177
-52                <category android:name="android.intent.category.LAUNCHER" />
+47            android:launchMode="singleTop"
-52-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77
+47-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:85-115
-52-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74
+48            android:theme="@style/NoteTheme" >
-53            </intent-filter>
+48-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:45:52-84
-54        </activity>
+49    -
-55        <activity
+50            <intent-filter android:scheme="http" >
-55-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20
+50-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:48:6-58:17
-56            android:name="net.micode.notes.ui.NoteEditActivity"
+50-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:48:52-73
-56-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48
+51                <action android:name="android.intent.action.VIEW" />
-57            android:configChanges="keyboardHidden|orientation|screenSize"
+51-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:50:5-56
-57-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74
+51-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:50:13-54
-58            android:launchMode="singleTop"
+52
-58-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43
+53                <category android:name="android.intent.category.DEFAULT" />
-59            android:theme="@style/NoteTheme" >
+53-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:5-63
-59-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45
+53-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:15-61
-60            <intent-filter>
+54
-60-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29
+55                <data android:mimeType="vnd.android.cursor.item/text_note" />
-61                <action android:name="android.intent.action.VIEW" />
+55-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:5-65
-61-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69
+55-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:11-63
-61-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66
+56                <data android:mimeType="vnd.android.cursor.item/call_note" />
-62
+56-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:5-65
-63                <category android:name="android.intent.category.DEFAULT" />
+56-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:11-63
-63-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
+57            </intent-filter>
-63-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
+58    -
-64
+59            <intent-filter>
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
+59-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:6-71:17
-65-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
+60                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-65-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
+60-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:63:5-66
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
+60-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:63:13-64
-66-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
+61
-66-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
+62                <category android:name="android.intent.category.DEFAULT" />
-67            </intent-filter>
+62-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:5-63
+62-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:15-61
+63
+64                <data android:mimeType="vnd.android.cursor.item/text_note" />
+64-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:5-65
+64-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:11-63
+65                <data android:mimeType="vnd.android.cursor.item/call_note" />
+65-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:5-65
+65-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:54:11-63
+66            </intent-filter>
+67    -
 68            <intent-filter>
-68-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29
+68-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:74:6-80:17
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+69                <action android:name="android.intent.action.SEARCH" />
-69-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79
+69-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:76:5-58
-69-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76
+69-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:76:13-56
 70
 71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
+71-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:5-63
-71-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
+71-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:52:15-61
-72
+72            </intent-filter>
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
+73
-73-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
+74            <meta-data
-73-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
+74-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:82:5-90
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
+75                android:name="android.app.searchable"
-74-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
+75-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:82:16-53
-74-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
+76                android:resource="@xml/searchable" />
-75            </intent-filter>
+76-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:82:54-88
-76            <intent-filter>
+77        </activity>
-76-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71
-77-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68
 78
-79                <category android:name="android.intent.category.DEFAULT" />
+79        <provider
-79-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
+79-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:86:5-130
-79-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
+80            android:name="net.micode.notes.data.NotesProvider"
-80            </intent-filter>
+80-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:86:15-65
-81
+81            android:authorities="micode_notes"
-82            <meta-data
+81-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:86:94-128
-82-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54
+82            android:multiprocess="true" />
-83                android:name="android.app.searchable"
+82-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:86:66-93
-83-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54
+83    -
-84                android:resource="@xml/searchable" />
+84        <receiver
-84-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51
+84-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:89:6-104:12
-85        </activity>
+85            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-86
+85-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:89:16-60
-87        <provider
+86            android:label="@string/app_widget2x2" >
-87-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43
+86-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:89:61-98
-88            android:name="net.micode.notes.data.NotesProvider"
+87    -
-88-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63
+88            <intent-filter>
-89            android:authorities="micode_notes"
+88-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:6-100:17
-89-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47
+89                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-90            android:multiprocess="true" />
+89-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:5-71
-90-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40
+89-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:13-69
-91
+90                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-92        <receiver
+90-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:96:5-72
-92-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20
+90-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:96:13-70
-93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+91                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-93-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57
+91-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:5-72
-94            android:label="@string/app_widget2x2" >
+91-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:13-70
-94-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50
+92            </intent-filter>
-95            <intent-filter>
+93
-95-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29
+94            <meta-data
-96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+94-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:5-98
-96-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84
+95                android:name="android.appwidget.provider"
-96-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81
+95-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:16-57
-97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+96                android:resource="@xml/widget_2x_info" />
-97-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85
+96-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:58-96
-97-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82
+97        </receiver>
-98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+98    -
-98-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85
+99        <receiver
-98-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82
+99-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:107:6-122:12
-99            </intent-filter>
+100            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-100
+100-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:107:16-60
-101            <meta-data
+101            android:label="@string/app_widget4x4" >
-101-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58
+101-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:107:61-98
-102                android:name="android.appwidget.provider"
+102    -
-102-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58
+103            <intent-filter>
-103                android:resource="@xml/widget_2x_info" />
+103-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:6-100:17
-103-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55
+104                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-104        </receiver>
+104-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:5-71
-105        <receiver
+104-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:13-69
-105-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20
+105                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+105-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:96:5-72
-106-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57
+105-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:96:13-70
-107            android:label="@string/app_widget4x4" >
+106                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-107-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50
+106-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:5-72
-108            <intent-filter>
+106-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:13-70
-108-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29
+107            </intent-filter>
-109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+108
-109-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84
+109            <meta-data
-109-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81
+109-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:5-98
-110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+110                android:name="android.appwidget.provider"
-110-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85
+110-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:16-57
-110-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82
+111                android:resource="@xml/widget_4x_info" />
-111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+111-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:102:58-96
-111-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85
+112        </receiver>
-111-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82
+113    -
-112            </intent-filter>
+114        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-113
+114-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:125:6-134:12
-114            <meta-data
+114-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:125:16-52
-114-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58
+115    -
-115                android:name="android.appwidget.provider"
+116            <intent-filter>
-115-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58
+116-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:128:6-132:17
-116                android:resource="@xml/widget_4x_info" />
+117                <action android:name="android.intent.action.BOOT_COMPLETED" />
-116-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55
+117-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:130:5-66
-117        </receiver>
+117-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:130:13-64
-118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+118            </intent-filter>
-118-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20
+119        </receiver>
-118-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55
+120        <receiver
-119            <intent-filter>
+120-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:136:5-102
-119-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29
+121            android:name="net.micode.notes.ui.AlarmReceiver"
-120                <action android:name="android.intent.action.BOOT_COMPLETED" />
+121-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:136:15-63
-120-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79
+122            android:process=":remote" >
-120-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76
+122-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:136:64-89
-121            </intent-filter>
+123        </receiver>
-122        </receiver>
+124
-123        <receiver
+125        <activity
-123-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20
+125-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:5-197
-124            android:name="net.micode.notes.ui.AlarmReceiver"
+126            android:name="net.micode.notes.ui.AlarmAlertActivity"
-124-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61
+126-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:15-52
-125            android:process=":remote" >
+127            android:label="@string/app_name"
-125-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38
+127-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:53-85
-126        </receiver>
+128            android:launchMode="singleInstance"
-127
+128-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:149-184
-128        <activity
+129            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-128-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20
+129-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:86-148
-129            android:name="net.micode.notes.ui.AlarmAlertActivity"
+130        </activity>
-129-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50
+131        <activity
-130            android:label="@string/app_name"
+131-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:140:5-207
-130-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45
+132            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-131            android:launchMode="singleInstance"
+132-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:140:15-73
-131-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48
+133            android:label="@string/preferences_title"
-132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+133-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:140:74-115
-132-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75
+134            android:launchMode="singleTop"
-133        </activity>
+134-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:140:164-194
-134        <activity
+135            android:theme="@android:style/Theme.Holo.Light" >
-134-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20
+135-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:140:116-163
-135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+136        </activity>
-135-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71
+137
-136            android:label="@string/preferences_title"
+138        <service
-136-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54
+138-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:142:5-112
-137            android:launchMode="singleTop"
+139            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-137-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43
+139-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:142:14-75
-138            android:theme="@android:style/Theme.Holo.Light" >
+140            android:exported="false" >
-138-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60
+140-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:142:76-100
-139        </activity>
+141        </service>
-140
+142
-141        <service
+143        <meta-data
-141-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19
+143-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:144:5-100
-142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+144            android:name="android.app.default_searchable"
-142-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74
+144-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:144:16-61
-143            android:exported="false" >
+145            android:value=".ui.NoteEditActivity" />
-143-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37
+145-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:144:62-98
-144        </service>
+146    </application>
-145
+147
-146        <meta-data
+148</manifest>
-146-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52
-147            android:name="android.app.default_searchable"
-147-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58
-148            android:value=".ui.NoteEditActivity" />
-148-->D:\Notes-master2\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49
-149    </application>
-150
-151</manifest>

src/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- 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 athttp://www.apache.org/licenses/LICENSE-2.0Unless required by applicable law or agreed to in writing, softwaredistributed 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 andlimitations under the License. -->
- 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.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
@@ -21,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="29" />
+        android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -32,12 +18,13 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
+    -
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
+    -
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -46,18 +33,21 @@
             android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+    -
         <activity
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+    -
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -65,6 +55,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
 
@@ -73,6 +64,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
 
@@ -88,10 +80,11 @@
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
             android:multiprocess="true" />
-
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
             android:label="@string/app_widget2x2" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -102,9 +95,11 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_2x_info" />
         </receiver>
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
             android:label="@string/app_widget4x4" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -115,7 +110,9 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_4x_info" />
         </receiver>
+    -
         <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>

src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- 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 athttp://www.apache.org/licenses/LICENSE-2.0Unless required by applicable law or agreed to in writing, softwaredistributed 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 andlimitations under the License. -->
- 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.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
@@ -21,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="29" />
+        android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -32,12 +18,13 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
+    -
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
+    -
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -46,18 +33,21 @@
             android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+    -
         <activity
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+    -
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -65,6 +55,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
 
@@ -73,6 +64,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
 
@@ -88,10 +80,11 @@
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
             android:multiprocess="true" />
-
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
             android:label="@string/app_widget2x2" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -102,9 +95,11 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_2x_info" />
         </receiver>
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
             android:label="@string/app_widget4x4" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -115,7 +110,9 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_4x_info" />
         </receiver>
+    -
         <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>

src/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- 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 athttp://www.apache.org/licenses/LICENSE-2.0Unless required by applicable law or agreed to in writing, softwaredistributed 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 andlimitations under the License. -->
- 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.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
@@ -21,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="29" />
+        android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -32,12 +18,13 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
+    -
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
+    -
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -46,18 +33,21 @@
             android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+    -
         <activity
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+    -
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -65,6 +55,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
 
@@ -73,6 +64,7 @@
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
+    -
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
 
@@ -88,10 +80,11 @@
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
             android:multiprocess="true" />
-
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
             android:label="@string/app_widget2x2" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -102,9 +95,11 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_2x_info" />
         </receiver>
+    -
         <receiver
             android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
             android:label="@string/app_widget4x4" >
+    -
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -115,7 +110,9 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_4x_info" />
         </receiver>
+    -
         <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+    -
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>