Manual Merge master in foregroundService
base master Several bug still present - No notification - No Upload - Need more test
This commit is contained in:
		
							
								
								
									
										14
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										14
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							@ -1,5 +1,14 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<project version="4">
 | 
			
		||||
  <component name="DesignSurface">
 | 
			
		||||
    <option name="filePathToZoomLevelMap">
 | 
			
		||||
      <map>
 | 
			
		||||
        <entry key="app/src/main/res/layout/file_info.xml" value="0.24479166666666666" />
 | 
			
		||||
        <entry key="app/src/main/res/layout/layout.xml" value="0.35989583333333336" />
 | 
			
		||||
        <entry key="app/src/main/res/xml/network_security_config.xml" value="0.35989583333333336" />
 | 
			
		||||
      </map>
 | 
			
		||||
    </option>
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="NullableNotNullManager">
 | 
			
		||||
    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
 | 
			
		||||
    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
 | 
			
		||||
@ -25,7 +34,7 @@
 | 
			
		||||
    </option>
 | 
			
		||||
    <option name="myNotNulls">
 | 
			
		||||
      <value>
 | 
			
		||||
        <list size="13">
 | 
			
		||||
        <list size="14">
 | 
			
		||||
          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
 | 
			
		||||
          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
 | 
			
		||||
          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
 | 
			
		||||
@ -39,11 +48,12 @@
 | 
			
		||||
          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
 | 
			
		||||
          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
 | 
			
		||||
          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
 | 
			
		||||
          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
 | 
			
		||||
        </list>
 | 
			
		||||
      </value>
 | 
			
		||||
    </option>
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 | 
			
		||||
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 | 
			
		||||
    <output url="file://$PROJECT_DIR$/build/classes" />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="ProjectType">
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user