moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 05:15:03 -05:00
Code Issues Releases Wiki Activity

Rename app setting classes for consistency

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-30 10:59:57 +01:00
parent 464f7c6718
commit e651a39279
7 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -33,7 +33,6 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute; import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets; import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
import org.sufficientlysecure.keychain.remote.ui.AppSettingsAllowedKeys;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize; import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
View File

@ -38,9 +38,9 @@ import org.sufficientlysecure.keychain.util.Log;
public class AppSettingsActivity extends BaseActivity { public class AppSettingsActivity extends BaseActivity {
private Uri mAppUri; private Uri mAppUri;
private AppSettingsFragment mSettingsFragment; private AppSettingsHeaderFragment mSettingsFragment;
private AccountsListFragment mAccountsListFragment; private AccountsListFragment mAccountsListFragment;
private AppSettingsAllowedKeys mAllowedKeysFragment; private AppSettingsAllowedKeysListFragment mAllowedKeysFragment;
// model // model
AppSettings mAppSettings; AppSettings mAppSettings;
@ -63,7 +63,7 @@ public class AppSettingsActivity extends BaseActivity {
} }
}); });
mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById( mSettingsFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
R.id.api_app_settings_fragment); R.id.api_app_settings_fragment);
Intent intent = getIntent(); Intent intent = getIntent();
@ -155,7 +155,7 @@ public class AppSettingsActivity extends BaseActivity {
// Create an instance of the fragment // Create an instance of the fragment
mAccountsListFragment = AccountsListFragment.newInstance(accountsUri); mAccountsListFragment = AccountsListFragment.newInstance(accountsUri);
mAllowedKeysFragment = AppSettingsAllowedKeys.newInstance(allowedKeysUri); mAllowedKeysFragment = AppSettingsAllowedKeysListFragment.newInstance(allowedKeysUri);
// Add the fragment to the 'fragment_container' FrameLayout // Add the fragment to the 'fragment_container' FrameLayout
// NOTE: We use commitAllowingStateLoss() to prevent weird crashes! // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeys.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
View File

@ -47,7 +47,7 @@ import java.util.Iterator;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
public class AppSettingsAllowedKeys extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> { public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> {
private static final String ARG_DATA_URI = "uri"; private static final String ARG_DATA_URI = "uri";
private SelectKeyCursorAdapter mAdapter; private SelectKeyCursorAdapter mAdapter;
@ -59,8 +59,8 @@ public class AppSettingsAllowedKeys extends ListFragmentWorkaround implements Lo
/** /**
* Creates new instance of this fragment * Creates new instance of this fragment
*/ */
public static AppSettingsAllowedKeys newInstance(Uri dataUri) { public static AppSettingsAllowedKeysListFragment newInstance(Uri dataUri) {
AppSettingsAllowedKeys frag = new AppSettingsAllowedKeys(); AppSettingsAllowedKeysListFragment frag = new AppSettingsAllowedKeysListFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putParcelable(ARG_DATA_URI, dataUri); args.putParcelable(ARG_DATA_URI, dataUri);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java
View File

@ -38,7 +38,7 @@ import org.sufficientlysecure.keychain.util.Log;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
public class AppSettingsFragment extends Fragment { public class AppSettingsHeaderFragment extends Fragment {
// model // model
private AppSettings mAppSettings; private AppSettings mAppSettings;

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
View File

@ -75,7 +75,7 @@ public class RemoteServiceActivity extends BaseActivity {
public static final String EXTRA_ERROR_MESSAGE = "error_message"; public static final String EXTRA_ERROR_MESSAGE = "error_message";
// register view // register view
private AppSettingsFragment mAppSettingsFragment; private AppSettingsHeaderFragment mAppSettingsHeaderFragment;
// create acc view // create acc view
private AccountSettingsFragment mAccSettingsFragment; private AccountSettingsFragment mAccSettingsFragment;
// select pub keys view // select pub keys view
@ -115,11 +115,11 @@ public class RemoteServiceActivity extends BaseActivity {
setContentView(R.layout.api_remote_register_app); setContentView(R.layout.api_remote_register_app);
initToolbar(); initToolbar();
mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById( mAppSettingsHeaderFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
R.id.api_app_settings_fragment); R.id.api_app_settings_fragment);
AppSettings settings = new AppSettings(packageName, packageSignature); AppSettings settings = new AppSettings(packageName, packageSignature);
mAppSettingsFragment.setAppSettings(settings); mAppSettingsHeaderFragment.setAppSettings(settings);
// Inflate a "Done"/"Cancel" custom action bar view // Inflate a "Done"/"Cancel" custom action bar view
setFullScreenDialogTwoButtons( setFullScreenDialogTwoButtons(
@ -129,7 +129,7 @@ public class RemoteServiceActivity extends BaseActivity {
public void onClick(View v) { public void onClick(View v) {
// Allow // Allow
mProviderHelper.insertApiApp(mAppSettingsFragment.getAppSettings()); mProviderHelper.insertApiApp(mAppSettingsHeaderFragment.getAppSettings());
// give data through for new service call // give data through for new service call
Intent resultData = extras.getParcelable(EXTRA_DATA); Intent resultData = extras.getParcelable(EXTRA_DATA);

2
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View File

@ -28,7 +28,7 @@
<fragment <fragment
android:id="@+id/api_app_settings_fragment" android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" /> tools:layout="@layout/api_app_settings_fragment" />

2
OpenKeychain/src/main/res/layout/api_remote_register_app.xml
View File

@ -30,7 +30,7 @@
<fragment <fragment
android:id="@+id/api_app_settings_fragment" android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" /> tools:layout="@layout/api_app_settings_fragment" />