apply release patches for v1.0

Change-Id: I8c71b22e47bdbe077eb11359e139da5daebdc564
bvibber · Oct 23, 2013 · ed2cec4 · ed2cec4
1 parent 51d2bc7
commit ed2cec4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
@@ -82,14 +82,6 @@
             android:label="@string/title_activity_settings"
             />
         <activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
-        <activity android:name=".campaigns.CampaignActivity" android:label="Campaigns"
-                android:icon="@drawable/ic_launcher"
-                >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
 
         <service android:name=".upload.UploadService" >
         </service>
@@ -105,17 +97,6 @@
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
         </service>
-        <service
-                android:name=".campaigns.CampaignsSyncService"
-                android:exported="true">
-            <intent-filter>
-                <action
-                        android:name="android.content.SyncAdapter" />
-            </intent-filter>
-            <meta-data
-                    android:name="android.content.SyncAdapter"
-                    android:resource="@xml/campaigns_sync_adapter" />
-        </service>
         <service
                 android:name=".contributions.ContributionsSyncService"
                 android:exported="true">
@@ -147,13 +128,6 @@
                 android:authorities="org.wikimedia.commons.contributions.contentprovider"
                 android:exported="false">
         </provider>
-        <provider
-                android:name=".campaigns.CampaignsContentProvider"
-                android:label="@string/provider_campaigns"
-                android:syncable="true"
-                android:authorities="org.wikimedia.commons.campaigns.contentprovider"
-                android:exported="false">
-        </provider>
         <provider
                 android:name=".modifications.ModificationsContentProvider"
                 android:label="@string/provider_modifications"

diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
@@ -55,11 +55,12 @@ public class CommonsApplication extends Application {
 
     private MWApi api;
     private Account currentAccount = null; // Unlike a savings account...
-    public static final String API_URL = "https://test.wikipedia.org/w/api.php";
-    public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/test";
-    public static final String HOME_URL = "https://test.wikipedia.org/wiki/";
+    public static final String API_URL = "https://commons.wikimedia.org/w/api.php";
+    public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons";
+    public static final String HOME_URL = "https://commons.wikimedia.org/wiki/";
+
     public static final String EVENTLOG_URL = "https://bits.wikimedia.org/event.gif";
-    public static final String EVENTLOG_WIKI = "testwiki";
+    public static final String EVENTLOG_WIKI = "commonswiki";
 
     public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5334329L};
     public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L};