Browse Source

Merge pull request #4473 from nextcloud/dependabot/gradle/androidx.appcompat-appcompat-1.1.0

Bump appcompat from 1.0.2 to 1.1.0
Andy Scherzinger 5 years ago
parent
commit
7c1aae4c25

+ 1 - 1
build.gradle

@@ -262,7 +262,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"

+ 4 - 4
src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt

@@ -49,13 +49,13 @@ class EtmPreferencesFragment : EtmBaseFragment() {
         etm_preferences_text.text = builder
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        inflater?.inflate(R.menu.etm_preferences, menu)
+        inflater.inflate(R.menu.etm_preferences, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
             R.id.etm_preferences_share -> {
                 onClickedShare(); true
             }

+ 1 - 0
src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java

@@ -206,6 +206,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (FIRST_RUN_RESULT_CODE == requestCode && RESULT_OK == resultCode) {
 
             String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);

+ 2 - 0
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -884,6 +884,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */
     @Override
     protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
         Log_OC.d(TAG, "onNewIntent()");
 
         if (intent.getBooleanExtra(FirstRunActivity.EXTRA_EXIT, false)) {
@@ -2041,6 +2042,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_QR_SCAN) {
             if (data == null) {
                 return;

+ 3 - 2
src/main/java/com/owncloud/android/ui/activity/ShareActivity.java

@@ -103,6 +103,7 @@ public class ShareActivity extends FileActivity implements ShareFragmentListener
     @Override
     protected void onNewIntent(Intent intent) {
         // Verify the action and get the query
+        super.onNewIntent(intent);
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
             String query = intent.getStringExtra(SearchManager.QUERY);
             Log_OC.w(TAG, "Ignored Intent requesting to query for " + query);
@@ -120,8 +121,8 @@ public class ShareActivity extends FileActivity implements ShareFragmentListener
             if (!shareeNames.contains(shareWith)) {
 
                 doShareWith(
-                        shareWith,
-                        data.getAuthority()
+                    shareWith,
+                    data.getAuthority()
                 );
             }