[~] Небольшие изменения прошлой версии

Author: plumsoftware

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "ru.plumsoftware.notebook"
         minSdk 22
         targetSdk 34
-        versionCode 19
-        versionName "1.5.1"
+        versionCode 21
+        versionName "1.5.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -27,6 +27,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     namespace 'ru.plumsoftware.notebook'
+
+    android {
+        lintOptions {
+            disable 'MobileAdsSdkOutdatedVersion'
+        }
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -5,9 +5,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission
-        android:name="com.google.android.gms.permission.AD_ID"
-        tools:node="remove" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -61,6 +59,14 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".services.MyFirebaseMessagingService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".services.NotificationReceiver"
             android:enabled="true"
@@ -70,13 +76,9 @@
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
 
-        <service
-            android:name=".services.MyFirebaseMessagingService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
+        <meta-data
+            android:name="com.yandex.mobile.ads.AUTOMATIC_SDK_INITIALIZATION"
+            android:value="false" />
     </application>
 
 </manifest>

app/src/main/java/ru/plumsoftware/notebook/activities/AddNoteActivity.java

@@ -112,6 +112,11 @@ protected void onCreate(Bundle savedInstanceState) {
         Note note = getIntent().getParcelableExtra("note");
         boolean isUpdate = getIntent().getBooleanExtra("update", false);
 
+        Intent intent = new Intent(AddNoteActivity.this, MainActivity.class);
+        if (!getIntent().getBooleanExtra("isLoadAppOpenAd", false)){
+            intent.putExtra("isLoadAppOpenAd", false);
+        }
+
         if (isUpdate) {
             toolbar.setTitle("Редактировать заметку");
             toolbar.setSubtitle(new SimpleDateFormat("dd.MM.yyyy HH.mm", Locale.getDefault()).format(new Date(note.getAddNoteTime())));
@@ -155,14 +160,14 @@ public void onAdFailedToShow(@NonNull AdError adError) {
 
                         @Override
                         public void onAdDismissed() {
-                            startActivity(new Intent(AddNoteActivity.this, MainActivity.class));
+                            startActivity(intent);
                             overridePendingTransition(0, 0);
                             finish();
                         }
 
                         @Override
                         public void onAdClicked() {
-                            startActivity(new Intent(AddNoteActivity.this, MainActivity.class));
+                            startActivity(intent);
                             overridePendingTransition(0, 0);
                             finish();
                         }
@@ -179,7 +184,7 @@ public void onAdImpression(@Nullable ImpressionData impressionData) {
             @Override
             public void onAdFailedToLoad(@NonNull final AdRequestError adRequestError) {
                 Toast.makeText(AddNoteActivity.this, adRequestError.getDescription(), Toast.LENGTH_SHORT).show();
-                startActivity(new Intent(AddNoteActivity.this, MainActivity.class));
+                startActivity(intent);
                 overridePendingTransition(0, 0);
                 finish();
             }