moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-24 07:58:50 -05:00
Code Issues Releases Wiki Activity

Restructure

Browse Source
This commit is contained in:
Dominik Schürmann 2013-07-01 23:23:53 +02:00
parent 202ccc2c36
commit 14350679d1
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -298,10 +298,6 @@
android:name=".ui.PreferencesActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_preferences" />
<activity
android:name=".ui.CryptoConsumersActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_crypto_consumers" />
<activity
android:name=".ui.PreferencesKeyServerActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@ -460,21 +456,25 @@
android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
<!-- Crypto Provider internal intents -->
<!-- Remote API internal intents -->
<activity
android:name=".crypto_provider.ServiceActivity"
android:name="org.sufficientlysecure.keychain.remote_api.ServiceActivity"
android:exported="false"
android:label="TODO crypto activity"
android:process=":crypto" >
<!-- Don't publish intents, they are only used internally! -->
</activity>
<activity
android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_crypto_consumers" />
<!-- Crypto Provider API -->
<!-- Remote API -->
<service
android:name="org.sufficientlysecure.keychain.crypto_provider.CryptoService"
android:name="org.sufficientlysecure.keychain.remote_api.CryptoService"
android:enabled="true"
android:exported="true"
android:process=":crypto" >

2
OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
View File

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

3
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
View File

@ -1,6 +1,7 @@
package org.sufficientlysecure.keychain.ui;
package org.sufficientlysecure.keychain.remote_api;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.MainActivity;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
View File

@ -1,4 +1,4 @@
package org.sufficientlysecure.keychain.ui;
package org.sufficientlysecure.keychain.remote_api;
import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
import org.sufficientlysecure.keychain.util.Log;

3
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.sufficientlysecure.keychain.crypto_provider;
package org.sufficientlysecure.keychain.remote_api;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.util.PausableThreadPoolExecutor;

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.sufficientlysecure.keychain.crypto_provider;
package org.sufficientlysecure.keychain.remote_api;
interface IServiceActivityCallback {

3
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java → OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.sufficientlysecure.keychain.crypto_provider;
package org.sufficientlysecure.keychain.remote_api;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
import org.sufficientlysecure.keychain.helper.PgpMain;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;

1
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
View File

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