- Fix gapps install button not appearing on main fragment
- Bump version number
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16dec2c..137abe6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.fairphone.updater"
- android:versionCode="25"
- android:versionName="25 (FP 1.8.3)" >
+ android:versionCode="26"
+ android:versionName="26 (FP 1.8.3)" >
<uses-sdk
android:minSdkVersion="17"
diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index d07a8f6..e67037e 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -701,7 +701,7 @@
clearSelectedVersion(versionNumber, versionImageType);
mSelectedVersion = UpdaterData.getInstance().getVersion(versionImageType, versionNumber);
- clearSelectedStore(0);
+ clearSelectedStore(-1);
}
public void clearSelectedItems()
@@ -722,7 +722,7 @@
public void setSelectedStore(Store selectedStore)
{
- int storeNumber = selectedStore != null ? selectedStore.getNumber() : 0;
+ int storeNumber = selectedStore != null ? selectedStore.getNumber() : -1;
clearSelectedStore(storeNumber);
@@ -880,7 +880,7 @@
public Fragment startGappsInstall()
{
- mSelectedStore = UpdaterData.getInstance().getStore(0);
+ mSelectedStore = Utils.getGappsStore();
VersionDetailFragment fragment = new VersionDetailFragment(false);
diff --git a/src/com/fairphone/updater/fragments/MainFragment.java b/src/com/fairphone/updater/fragments/MainFragment.java
index 45923ca..9ea0b7c 100644
--- a/src/com/fairphone/updater/fragments/MainFragment.java
+++ b/src/com/fairphone/updater/fragments/MainFragment.java
@@ -28,6 +28,7 @@
import com.fairphone.updater.data.Version;
import com.fairphone.updater.fragments.VersionDetailFragment.DetailLayoutType;
import com.fairphone.updater.gappsinstaller.GappsInstallerHelper;
+import com.fairphone.updater.tools.Utils;
public class MainFragment extends BaseFragment
{
@@ -126,14 +127,9 @@
{
boolean showGappsGroup = mSharedPreferences.getBoolean(SHARED_PREFERENCES_ENABLE_GAPPS, true);
boolean gappsNotInstalled = !GappsInstallerHelper.areGappsInstalled();
- boolean hasStoreInfo = getSelectedStoreFromSharedPreferences() != null;
+ boolean hasStoreInfo = Utils.getGappsStore() != null;
return showGappsGroup && gappsNotInstalled && hasStoreInfo;
}
-
- Store getSelectedStoreFromSharedPreferences()
- {
- return UpdaterData.getInstance().getStore(mSharedPreferences.getInt(FairphoneUpdater.PREFERENCE_SELECTED_STORE_NUMBER, 0));
- }
private void disableGappsInstalationButton()
{
diff --git a/src/com/fairphone/updater/tools/Utils.java b/src/com/fairphone/updater/tools/Utils.java
index f0edad9..55e51a8 100644
--- a/src/com/fairphone/updater/tools/Utils.java
+++ b/src/com/fairphone/updater/tools/Utils.java
@@ -41,6 +41,7 @@
import com.fairphone.updater.UpdaterService;
import com.fairphone.updater.data.DownloadableItem;
import com.fairphone.updater.data.Store;
+import com.fairphone.updater.data.UpdaterData;
import com.fairphone.updater.data.Version;
import com.fairphone.updater.data.VersionParserHelper;
import com.stericson.RootTools.RootTools;
@@ -81,6 +82,7 @@
private static final double PERCENT_100 = 100d;
private static final char CHAR_SPACE = ' ';
private static final char CHAR_ZERO = '0';
+ public static final int GAPPS_STORE_NUMBER = 0;
private static double getPartitionSizeInGBytes(File path)
{
@@ -731,4 +733,9 @@
return manager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnectedOrConnecting();
}
+
+ public static Store getGappsStore()
+ {
+ return UpdaterData.getInstance().getStore(GAPPS_STORE_NUMBER);
+ }
}