Fix onAttach deprecation

This commit is contained in:
Dominik Schürmann
2016-11-29 22:24:27 +01:00
parent c23139a3fe
commit 2e6d0fb05c
11 changed files with 45 additions and 38 deletions

View File

@@ -18,6 +18,7 @@
package org.sufficientlysecure.keychain.ui; package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -80,8 +81,8 @@ public class CreateKeyNameFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -164,8 +164,8 @@ public class CreateKeyPassphraseFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -18,6 +18,7 @@
package org.sufficientlysecure.keychain.ui; package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@@ -130,8 +131,8 @@ public class CreateKeyStartFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -18,6 +18,7 @@
package org.sufficientlysecure.keychain.ui; package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -75,8 +76,8 @@ public class CreateSecurityTokenBlankFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@@ -195,8 +196,8 @@ public class CreateSecurityTokenImportResetFragment
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -167,8 +167,8 @@ public class CreateSecurityTokenPinFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); mCreateKeyActivity = (CreateKeyActivity) getActivity();
} }

View File

@@ -125,10 +125,11 @@ public class EncryptFilesFragment
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
if ( ! (activity instanceof EncryptActivity) ) {
throw new AssertionError(activity + " must inherit from EncryptionActivity"); if ( ! (context instanceof EncryptActivity) ) {
throw new AssertionError(context + " must inherit from EncryptionActivity");
} }
} }

View File

@@ -82,10 +82,11 @@ public class EncryptTextFragment
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
if ( ! (activity instanceof EncryptActivity) ) {
throw new AssertionError(activity + " must inherit from EncryptionActivity"); if ( ! (context instanceof EncryptActivity) ) {
throw new AssertionError(context + " must inherit from EncryptionActivity");
} }
} }

View File

@@ -107,17 +107,17 @@ public class ImportKeysCloudFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mActivity = activity;
try { try {
mCallback = (ImportKeysListener) activity; mCallback = (ImportKeysListener) context;
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new ClassCastException(activity.toString() throw new ClassCastException(context.toString()
+ " must implement ImportKeysListener"); + " must implement ImportKeysListener");
} }
mActivity = (Activity) context;
} }
@Override @Override

View File

@@ -18,6 +18,7 @@
package org.sufficientlysecure.keychain.ui; package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@@ -72,17 +73,17 @@ public class ImportKeysFileFragment extends Fragment {
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
mActivity = activity;
try { try {
mCallback = (ImportKeysListener) activity; mCallback = (ImportKeysListener) context;
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new ClassCastException(activity.toString() throw new ClassCastException(context.toString()
+ " must implement ImportKeysListener"); + " must implement ImportKeysListener");
} }
mActivity = (Activity) context;
} }
@Override @Override

View File

@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.databinding.DataBindingUtil; import android.databinding.DataBindingUtil;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@@ -157,8 +158,7 @@ public class ImportKeysListFragment extends Fragment implements
if (dataUri != null || bytes != null) { if (dataUri != null || bytes != null) {
loadState(new BytesLoaderState(bytes, dataUri)); loadState(new BytesLoaderState(bytes, dataUri));
} else if (query != null) { } else if (query != null) {
CloudSearchPrefs cloudSearchPrefs CloudSearchPrefs cloudSearchPrefs = args.getParcelable(ARG_CLOUD_SEARCH_PREFS);
= args.getParcelable(ARG_CLOUD_SEARCH_PREFS);
if (cloudSearchPrefs == null) { if (cloudSearchPrefs == null) {
cloudSearchPrefs = Preferences.getPreferences(mActivity).getCloudSearchPrefs(); cloudSearchPrefs = Preferences.getPreferences(mActivity).getCloudSearchPrefs();
} }
@@ -183,13 +183,13 @@ public class ImportKeysListFragment extends Fragment implements
} }
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Context context) {
super.onAttach(activity); super.onAttach(context);
try { try {
mListener = (ImportKeysListener) activity; mListener = (ImportKeysListener) context;
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new ClassCastException(activity.toString() throw new ClassCastException(context.toString()
+ " must implement ImportKeysListener"); + " must implement ImportKeysListener");
} }
} }