unify naming of api package and process

This commit is contained in:
Dominik Schürmann 2013-09-13 10:05:43 +02:00
parent 86c84ddbb3
commit ca8f8e3ff7
14 changed files with 20 additions and 20 deletions

View File

@ -383,29 +383,29 @@
<!-- OpenPGP Remote Service API internal -->
<activity
android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpServiceActivity"
android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpServiceActivity"
android:exported="false"
android:label="@string/app_name"
android:launchMode="singleTop"
android:process=":crypto"
android:taskAffinity=":crypto" />
android:process=":openpgp_api"
android:taskAffinity=":openpgp_api" />
<activity
android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity"
android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:exported="false"
android:label="@string/title_api_registered_apps" />
<activity
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsActivity"
android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:exported="false" />
<!-- OpenPGP Remote Service API -->
<service
android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpService"
android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpService"
android:enabled="true"
android:exported="true"
android:process=":crypto" >
android:process=":openpgp_api" >
<intent-filter>
<action android:name="org.openintents.crypto.ICryptoService" />
</intent-filter>

View File

@ -16,7 +16,7 @@
<fragment
android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" />

View File

@ -8,7 +8,7 @@
<fragment
android:id="@+id/api_app_settings_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/api_app_settings_fragment" />

View File

@ -5,7 +5,7 @@
<fragment
android:id="@+id/crypto_consumers_list_fragment"
android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListFragment"
android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import org.spongycastle.bcpg.HashAlgorithmTags;
import org.spongycastle.openpgp.PGPEncryptedData;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import java.util.HashMap;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import java.util.ArrayList;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.MainActivity;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.remote_api;
package org.sufficientlysecure.keychain.openpgp_api;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract;

View File

@ -32,12 +32,12 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
import org.sufficientlysecure.keychain.helper.PgpHelper;
import org.sufficientlysecure.keychain.helper.PgpMain;
import org.sufficientlysecure.keychain.openpgp_api.AppSettings;
import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
import org.sufficientlysecure.keychain.remote_api.AppSettings;
import org.sufficientlysecure.keychain.util.IterableIterator;
import org.sufficientlysecure.keychain.util.Log;

View File

@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity;
import org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockActivity;